Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp3157900ybl; Fri, 20 Dec 2019 04:56:25 -0800 (PST) X-Google-Smtp-Source: APXvYqwMxCsOWDXplxGuQR9mDUsiPtUj0YLFARCiTsJ7DFT1gnIzZ2L2JJGV/v8ILNDuWU/MuD5T X-Received: by 2002:a9d:2028:: with SMTP id n37mr15453383ota.127.1576846585560; Fri, 20 Dec 2019 04:56:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576846585; cv=none; d=google.com; s=arc-20160816; b=VyH94QyLxPo+HVFia/ow/KuPlJNjqtTyZlZcQOrAX3rE1ruXHf7/c9CN+OwL+eaDwZ 9gvuch2Eg8kUAvSAoiMMPCmK+rth2nQZcR9J7TO0whqFKo9JBOOpd6wp57kDkkXVmcpu Cc1oiYuxXVR5ORmpHoZRjAAEN+BRYm0kEwO3Le6MnCBpsgnp7gqPn3a+m7hMPZTb/tEA RL3nwA1nOZLGl65uYvQUSYHzb1net4dx6weoZHU55bcQU4MHm7FqvSdTti+acMx1qY2a cd52vSEm5IQ8Fh7Amk7op6hXrlLcPj0zOrzfZS7czG4p+i0uhFEXihlYVT6bawKD05Qr Q1VA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=47U1otsxYlinLNAscqJD75X6EAli96RR6XYpuDRuenk=; b=aEwthQ88LpAZMqw+Q8Q11+aRRTczyGPf+1LZJ53rcbK096iSfTFTeOSXxuUityRpxu YElxPcYQBcpL2GBH2JLQic1ZVlAM17GW1f2TMaSeSDa+34PuqSm+Xj1lLVfFeF5h8A9+ 9RxVcR8tw1CQ/TH6BDYRoZFqPGx1yoj4VaT1COBwk4tu9VJy47AWRlqHekOE7bwXxWJE 5gTJCnra/UhuOVzNyxXNRE7CXIudSw7ZBvEsTGUfn7OljBd6R0HI+dZ/RA3qUKG2q6WA M086QxELTuWxZO8LTC9Xd6UitK7cQz39Gg18C+NxoUiR+1NXgFwhvwGHWyDH9sOFD2Jk 410w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=BYTTQMKl; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e20si4702383oig.199.2019.12.20.04.56.13; Fri, 20 Dec 2019 04:56:25 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=BYTTQMKl; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727364AbfLTMz3 (ORCPT + 99 others); Fri, 20 Dec 2019 07:55:29 -0500 Received: from mail-wm1-f46.google.com ([209.85.128.46]:52999 "EHLO mail-wm1-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727344AbfLTMz3 (ORCPT ); Fri, 20 Dec 2019 07:55:29 -0500 Received: by mail-wm1-f46.google.com with SMTP id p9so8845033wmc.2; Fri, 20 Dec 2019 04:55:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=47U1otsxYlinLNAscqJD75X6EAli96RR6XYpuDRuenk=; b=BYTTQMKllgycraKHarnwqJf8SP4/xmLzv9sqBRHH5Jlky2jdi7TsjV0FpyLasstZXX Gnz3BQ23iT6rF2wjm8aR/p2cANBU5xasgeSZacD8RBsWIOq+FzDUv4aX3n0gqaDQZSum 0bv0gkqK2DxGD83GZfUu3FCfcCg4GCvwM7HfxIMewlav5ZsxG80YBOic1rrgmF6LbfdP 2/JEsjMRO+HLj3QEzUSrSWYCnOFYmB9rnwpUQ26KXVdU+1otPKfeJEF8+av//+18iQfd FU6qDpqC/QcHo+mezj/JB4lnKNSZNeRmWCsmSt+2mhAYAsCOmN/QVffUnH/Di1JHXZSE UxeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=47U1otsxYlinLNAscqJD75X6EAli96RR6XYpuDRuenk=; b=MPLy/JTcMUbfTy/m9JqXoaUHHt+e83aIz03ymQl7bOrXt5LhmSHTdbzDYe6iPajiRo 4kUsL+ssjNlSr+VxIllI76bdMfts8Eaw+HjqrnulvAt/fFM2RO42tMY67tZHIrsG9OKW ZUNbUqP7eFZKZR78AXYvKFhcW8tYOOVjh8O+VbNeOn79LLQQGDc+15vZnDeU2mXwMO9j zkJ9QPGV3o9vAkKdTK8PHK3T9p4e8xaP1EJ5vOtNVJboBG5LQ8ajo0TismImFGfiC0DI NyzgfdNEM+mf0qGJpyVehEGfZWhOTb6AxurxwBIx180IdQbm8W5NaqunKWjpL3j1aq5w 8kKg== X-Gm-Message-State: APjAAAUuz0+aiBV7w7tsgUiAlxhv0lFMINKgPeWpgvQOTwPrOG1jxVUc DFEwxY4My7jTg2aaz64Et6RR2BE7 X-Received: by 2002:a7b:c1d8:: with SMTP id a24mr16446761wmj.130.1576846526989; Fri, 20 Dec 2019 04:55:26 -0800 (PST) Received: from debian.home (ip51ccf9cd.speed.planet.nl. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id k16sm10148078wru.0.2019.12.20.04.55.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Dec 2019 04:55:26 -0800 (PST) From: Johan Jonker To: heiko@sntech.de Cc: robh+dt@kernel.org, mark.rutland@arm.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] arm64: dts: rockchip: rk3368-lion-haikou: remove identical &uart0 node Date: Fri, 20 Dec 2019 13:55:20 +0100 Message-Id: <20191220125520.29871-1-jbx6244@gmail.com> X-Mailer: git-send-email 2.11.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove identical &uart0 node. Sort nodes in alphabetical order. Signed-off-by: Johan Jonker --- .../arm64/boot/dts/rockchip/rk3368-lion-haikou.dts | 76 ++++++++++------------ 1 file changed, 35 insertions(+), 41 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts index 8251f3c0d..93601fe05 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts +++ b/arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts @@ -64,47 +64,6 @@ }; }; -&sdmmc { - bus-width = <4>; - cap-mmc-highspeed; - cap-sd-highspeed; - cd-gpios = <&gpio2 RK_PB3 GPIO_ACTIVE_LOW>; - disable-wp; - max-frequency = <25000000>; - pinctrl-names = "default"; - pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_bus4>; - rockchip,default-sample-phase = <90>; - vmmc-supply = <&vcc3v3_baseboard>; - status = "okay"; -}; - -&spi2 { - cs-gpios = <0>, <&gpio2 RK_PC3 GPIO_ACTIVE_LOW>; - status = "okay"; -}; - -&uart0 { - pinctrl-names = "default"; - pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>; - status = "okay"; -}; - -&usb_otg { - dr_mode = "otg"; - status = "okay"; -}; - -&uart0 { - pinctrl-names = "default"; - pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>; - status = "okay"; -}; - -&uart1 { - /* alternate function of GPIO5/6 */ - status = "disabled"; -}; - &pinctrl { pinctrl-names = "default"; pinctrl-0 = <&haikou_pin_hog>; @@ -144,3 +103,38 @@ }; }; }; + +&sdmmc { + bus-width = <4>; + cap-mmc-highspeed; + cap-sd-highspeed; + cd-gpios = <&gpio2 RK_PB3 GPIO_ACTIVE_LOW>; + disable-wp; + max-frequency = <25000000>; + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_bus4>; + rockchip,default-sample-phase = <90>; + vmmc-supply = <&vcc3v3_baseboard>; + status = "okay"; +}; + +&spi2 { + cs-gpios = <0>, <&gpio2 RK_PC3 GPIO_ACTIVE_LOW>; + status = "okay"; +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>; + status = "okay"; +}; + +&uart1 { + /* alternate function of GPIO5/6 */ + status = "disabled"; +}; + +&usb_otg { + dr_mode = "otg"; + status = "okay"; +}; -- 2.11.0