arm64: dts: rockchip: rk3368-lion-haikou: remove identical &uart0 node
Subsystems (2)
PATCH 1/1 arm64: dts: rockchip: rk3368-lion-haikou: remove identical &uart0 node
Remove identical &uart0 node.
Sort nodes in alphabetical order.
Signed-off-by Johan Jonker <[email protected]>
--- .../arm64/boot/dts/rockchip/rk3368-lion-haikou.dts | 76 ++++++++++------------ 1 file changed, 35 insertions(+), 41 deletions(-)
arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts +35 -41
@@ -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"; +};
Signature · 1 line
2.11.0
PATCH v2 1/1 arm64: dts: rockchip: rk3368-lion-haikou: remove identical &uart0 node
There are two identical &uart0 nodes in this dts file, so remove one of them.
Signed-off-by Johan Jonker <[email protected]>
--- arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts | 6 ------ 1 file changed, 6 deletions(-)
arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts +0 -6
@@ -83,12 +83,6 @@ status = "okay"; }; -&uart0 { - pinctrl-names = "default"; - pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>; - status = "okay"; -}; - &usb_otg { dr_mode = "otg"; status = "okay";
Signature · 1 line
2.11.0
Heiko Stuebner
maintainerHi Johan,
Am Samstag, 28. Dezember 2019, 08:47:57 CET schrieb Johan Jonker:
Quoted 4 lines
There are two identical &uart0 nodes in this dts file, so remove one of them.
Signed-off-by Johan Jonker <[email protected]>
thanks for separating the duplicate-removal from the other changes and I've applied the patch for 5.6 now.
Thanks
Heiko