[U-Boot] [PATCH 1/5] ARM: dts: omap36xx-u-boot.dtsi

Adam Ford aford173 at gmail.com
Sun Sep 9 20:24:01 UTC 2018


Make omap36xx-u-boot.dtsi include omap3-u-boot.dtsi until the
new omap serial driver is available.  This allows higher level functions
to include those and not replicate contents at higher levels.

Signed-off-by: Adam Ford <aford173 at 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..96ad636755 100644
--- a/arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi
+++ b/arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi
@@ -3,9 +3,10 @@
  * Copyright (C) 2017
  * Logic PD - http://www.logicpd.com
  */
+#include "omap36xx-u-boot.dtsi"
 
 / {
-	model = "LogicPD Zoom OMAP3 Development Kit";
+	model = "LogicPD Zoom DM37 Torpedo Development Kit";
 
 	chosen {
 		stdout-path = &uart1;
@@ -26,17 +27,4 @@
 
 &mmc3 {
       status = "disabled";
-};
-
-&uart1 {
-	reg-shift = <2>;
-};
-
-&uart2 {
-	reg-shift = <2>;
-};
-
-&uart3 {
-	reg-shift = <2>;
-};
-
+};
\ No newline at end of file
diff --git a/arch/arm/dts/omap36xx-u-boot.dtsi b/arch/arm/dts/omap36xx-u-boot.dtsi
index 374499dcb2..0b4b909e87 100644
--- a/arch/arm/dts/omap36xx-u-boot.dtsi
+++ b/arch/arm/dts/omap36xx-u-boot.dtsi
@@ -3,6 +3,7 @@
  * Copyright (C) 2017
  * Logic PD - http://www.logicpd.com
  */
+#include "omap3-u-boot.dtsi"
 
 &uart4 {
 	reg-shift = <2>;
-- 
2.17.1



More information about the U-Boot mailing list