Merge https://gitlab.denx.de/u-boot/custodians/u-boot-clk

[oweals/u-boot.git] / arch / arm / dts / logicpd-torpedo-37xx-devkit-u-boot.dtsi

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 4028fe7642cce9581061f377c8ee158e972d4998..976330f89716a740c82474a8dfed0159434bc440 100644 (file)
--- a/arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi
+++ b/arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi
@@ -4,11 +4,12 @@
  * Logic PD - http://www.logicpd.com
  */
 
-/ {
-       model = "LogicPD Zoom OMAP3 Development Kit";
+#include "omap3-u-boot.dtsi"
 
-       chosen {
-               stdout-path = &uart1;
+/ {
+       aliases {
+               /delete-property/ serial1;
+               /delete-property/ serial2;
        };
 };
 
@@ -20,27 +21,8 @@
        clock-frequency = <400000>;
 };
 
-&mmc1 {
-       cd-inverted;
-};
-
-&mmc2 {
-      status = "disabled";
-};
-
-&mmc3 {
-      status = "disabled";
-};
-
-&uart1 {
-       reg-shift = <2>;
-};
-
-&uart2 {
-       reg-shift = <2>;
-};
-
-&uart3 {
-       reg-shift = <2>;
-};
+/delete-node/ &uart2;
+/delete-node/ &uart3;
+/delete-node/ &mmc2;
+/delete-node/ &mmc3;