| Message ID | 20191228074757.2075-1-jbx6244@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | ba790c16a8b0a26b0a4ebfd26bf059ff3a0f9ff8 |
| Headers | show |
| Series | [v2] arm64: dts: rockchip: rk3368-lion-haikou: remove identical &uart0 node | expand |
Hi Johan, Am Samstag, 28. Dezember 2019, 08:47:57 CET schrieb Johan Jonker: > There are two identical &uart0 nodes in this dts file, > so remove one of them. > > Signed-off-by: Johan Jonker <jbx6244@gmail.com> thanks for separating the duplicate-removal from the other changes and I've applied the patch for 5.6 now. Thanks Heiko
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts index 8251f3c0d..cbde279ae 100644 --- a/arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts +++ b/arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts @@ -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";
There are two identical &uart0 nodes in this dts file, so remove one of them. Signed-off-by: Johan Jonker <jbx6244@gmail.com> --- arch/arm64/boot/dts/rockchip/rk3368-lion-haikou.dts | 6 ------ 1 file changed, 6 deletions(-)