diff mbox series

[U-Boot,2/5] ARM: DTS: Remove unnecessary u-boot.dtsi options from omap3/36xx

Message ID 20180929191019.12614-2-aford173@gmail.com
State Accepted
Commit c981cb8dda0eb5bd182e8efc5f25a5e311212ba6
Delegated to: Tom Rini
Headers show
Series [U-Boot,1/5] ARM: DTS: LogicPD-SOM-LV & Torpedo: Resync DTS with Kernel | expand

Commit Message

Adam Ford Sept. 29, 2018, 7:10 p.m. UTC
With the introduction of the omap serial driver, the need for some
of these U-Boot specific modifications is gone.  This cleans up
this unnneeded stuff.

Signed-off-by: Adam Ford <aford173@gmail.com>

Comments

Tom Rini Oct. 7, 2018, 12:29 a.m. UTC | #1
On Sat, Sep 29, 2018 at 02:10:16PM -0500, Adam Ford wrote:

> With the introduction of the omap serial driver, the need for some
> of these U-Boot specific modifications is gone.  This cleans up
> this unnneeded stuff.
> 
> Signed-off-by: Adam Ford <aford173@gmail.com>
> 
> diff --git a/arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi b/arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi
> index d584b4a9ab..41ed5d7e17 100644

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi b/arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi
index d584b4a9ab..41ed5d7e17 100644
--- a/arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi
+++ b/arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi
@@ -4,14 +4,6 @@ 
  * Logic PD - http://www.logicpd.com
  */
 
-/ {
-	model = "LogicPD Zoom OMAP3 Development Kit";
-
-	chosen {
-		stdout-path = &uart1;
-	};
-};
-
 &i2c1 {
 	clock-frequency = <400000>;
 };
@@ -28,15 +20,3 @@ 
       status = "disabled";
 };
 
-&uart1 {
-	reg-shift = <2>;
-};
-
-&uart2 {
-	reg-shift = <2>;
-};
-
-&uart3 {
-	reg-shift = <2>;
-};
-
diff --git a/arch/arm/dts/omap3-u-boot.dtsi b/arch/arm/dts/omap3-u-boot.dtsi
deleted file mode 100644
index 633153a41e..0000000000
--- a/arch/arm/dts/omap3-u-boot.dtsi
+++ /dev/null
@@ -1,18 +0,0 @@ 
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2017
- * Logic PD - http://www.logicpd.com
- */
-
-&uart1 {
-	reg-shift = <2>;
-};
-
-&uart2 {
-	reg-shift = <2>;
-};
-
-&uart3 {
-	reg-shift = <2>;
-};
-
diff --git a/arch/arm/dts/omap36xx-u-boot.dtsi b/arch/arm/dts/omap36xx-u-boot.dtsi
deleted file mode 100644
index 374499dcb2..0000000000
--- a/arch/arm/dts/omap36xx-u-boot.dtsi
+++ /dev/null
@@ -1,9 +0,0 @@ 
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright (C) 2017
- * Logic PD - http://www.logicpd.com
- */
-
-&uart4 {
-	reg-shift = <2>;
-};