ARM: dts: omap3/omap35 Torpedo and SOM-LV: Unify and shrink SPL dtb

None of these boards boot, but the solution appears to be the same.
All the boards have SPL that is too large.  With a few defconfig
options removed, these corresponding options can be removed from
their respective SPL dtb files.

This patch unifies the DM37/OMAP35 boards' -u-boot.dtsi files
to remove gpio's, i2c, bandgap, thermal zones, unneeded uarts, and
unneeded MMC nodes.

Signed-off-by: Adam Ford <aford173@gmail.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>

diff --git a/arch/arm/dts/logicpd-som-lv-35xx-devkit-u-boot.dtsi b/arch/arm/dts/logicpd-som-lv-35xx-devkit-u-boot.dtsi
index 1abd9a38870333f4f3665785bf68aae0b785cee6..173b492cd997e1d7e4af151a0f9cdf85fb30d20b 100644 (file)
--- a/arch/arm/dts/logicpd-som-lv-35xx-devkit-u-boot.dtsi
+++ b/arch/arm/dts/logicpd-som-lv-35xx-devkit-u-boot.dtsi
@@ -17,16 +17,44 @@
        };
 };
 
+&gpio1 {
+       /delete-property/ u-boot,dm-spl;
+};
+
+&gpio2 {
+       /delete-property/ u-boot,dm-spl;
+};
+
+&gpio3 {
+       /delete-property/ u-boot,dm-spl;
+};
+
+&gpio4 {
+       /delete-property/ u-boot,dm-spl;
+};
+
+&gpio5 {
+       /delete-property/ u-boot,dm-spl;
+};
+
+&gpio6 {
+       /delete-property/ u-boot,dm-spl;
+};
+
 &i2c1 {
        clock-frequency = <400000>;
+       /delete-property/ u-boot,dm-spl;
 };
 
 &i2c2 {
        clock-frequency = <400000>;
+       /delete-property/ u-boot,dm-spl;
 };
 
+/delete-node/ &bandgap;
 /delete-node/ &uart2;
 /delete-node/ &uart3;
 /delete-node/ &mmc2;
 /delete-node/ &mmc3;
+/delete-node/ &thermal_zones;
 

diff --git a/arch/arm/dts/logicpd-som-lv-37xx-devkit-u-boot.dtsi b/arch/arm/dts/logicpd-som-lv-37xx-devkit-u-boot.dtsi
index e5d9e4f1b1d7b4d56a20afc7dfc7155d224d9aa6..173b492cd997e1d7e4af151a0f9cdf85fb30d20b 100644 (file)
--- a/arch/arm/dts/logicpd-som-lv-37xx-devkit-u-boot.dtsi
+++ b/arch/arm/dts/logicpd-som-lv-37xx-devkit-u-boot.dtsi
@@ -29,6 +29,10 @@
        /delete-property/ u-boot,dm-spl;
 };
 
+&gpio4 {
+       /delete-property/ u-boot,dm-spl;
+};
+
 &gpio5 {
        /delete-property/ u-boot,dm-spl;
 };
@@ -39,14 +43,18 @@
 
 &i2c1 {
        clock-frequency = <400000>;
+       /delete-property/ u-boot,dm-spl;
 };
 
 &i2c2 {
        clock-frequency = <400000>;
+       /delete-property/ u-boot,dm-spl;
 };
 
+/delete-node/ &bandgap;
 /delete-node/ &uart2;
 /delete-node/ &uart3;
 /delete-node/ &mmc2;
 /delete-node/ &mmc3;
+/delete-node/ &thermal_zones;
 

diff --git a/arch/arm/dts/logicpd-torpedo-35xx-devkit-u-boot.dtsi b/arch/arm/dts/logicpd-torpedo-35xx-devkit-u-boot.dtsi
index 1635e42b55a0b7742981e19ec935bdbc99bbcaf3..581247def08292fa149131b50483d307e10f6b3b 100644 (file)
--- a/arch/arm/dts/logicpd-torpedo-35xx-devkit-u-boot.dtsi
+++ b/arch/arm/dts/logicpd-torpedo-35xx-devkit-u-boot.dtsi
@@ -7,21 +7,53 @@
 #include "omap3-u-boot.dtsi"
 
 / {
+       chosen {
+               stdout-path = &uart1;
+       };
+
        aliases {
                /delete-property/ serial1;
                /delete-property/ serial2;
        };
 };
 
+&gpio1 {
+       /delete-property/ u-boot,dm-spl;
+};
+
+&gpio2 {
+       /delete-property/ u-boot,dm-spl;
+};
+
+&gpio3 {
+       /delete-property/ u-boot,dm-spl;
+};
+
+&gpio4 {
+       /delete-property/ u-boot,dm-spl;
+};
+
+&gpio5 {
+       /delete-property/ u-boot,dm-spl;
+};
+
+&gpio6 {
+       /delete-property/ u-boot,dm-spl;
+};
+
 &i2c1 {
        clock-frequency = <400000>;
+       /delete-property/ u-boot,dm-spl;
 };
 
 &i2c2 {
        clock-frequency = <400000>;
+       /delete-property/ u-boot,dm-spl;
 };
 
+/delete-node/ &bandgap;
 /delete-node/ &uart2;
 /delete-node/ &uart3;
 /delete-node/ &mmc2;
 /delete-node/ &mmc3;
+/delete-node/ &thermal_zones;

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 76f74326ae888e729320e181534b3b1222336d4d..9b709c147c8c23c8395b05c321097052ae5767fd 100644 (file)
--- a/arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi
+++ b/arch/arm/dts/logicpd-torpedo-37xx-devkit-u-boot.dtsi
@@ -15,6 +15,7 @@
 
 &i2c1 {
        clock-frequency = <400000>;
+       /delete-property/ u-boot,dm-spl;
 };
 
 &i2c2 {
@@ -33,6 +34,10 @@
        /delete-property/ u-boot,dm-spl;
 };
 
+&gpio4 {
+       /delete-property/ u-boot,dm-spl;
+};
+
 &gpio5 {
        /delete-property/ u-boot,dm-spl;
 };
@@ -41,8 +46,9 @@
        /delete-property/ u-boot,dm-spl;
 };
 
+/delete-node/ &bandgap;
 /delete-node/ &uart2;
 /delete-node/ &uart3;
 /delete-node/ &mmc2;
 /delete-node/ &mmc3;
-
+/delete-node/ &thermal_zones;