ipq806x: move further common nodes to the DTSI files

The moves a few additional common nodes to the common DTSI files
for qcom-ipq8064-v2.0 and qcom-ipq8065 devices.

Remove a few redundant definitions on the way.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
index a23f3da469abcfeaefc2caf77cd7ff6508060f22..a28927cde7b30c5e12ee00d7357fe488401a2afd 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
@@ -28,13 +28,6 @@
        status = "okay";
 };
 
-/*
-* The i2c device on gsbi4 should not be enabled.
-* On ipq806x designs gsbi4 i2c is meant for exclusive
-* RPM usage. Turning this on in kernel manifests as
-* i2c failure for the RPM.
-*/
-
 &flash {
        partitions {
                compatible = "qcom,smem";

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts
index 59c06dbcccb0ffd23898b96e1d76e983b6f26caa..f86f61f5caaf7bb00de91e7aa0fcc3df651e25cd 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts
@@ -36,13 +36,6 @@
        };
 };
 
-/*
-* The i2c device on gsbi4 should not be enabled.
-* On ipq806x designs gsbi4 i2c is meant for exclusive
-* RPM usage. Turning this on in kernel manifests as
-* i2c failure for the RPM.
-*/
-
 &flash {
        partitions {
                compatible = "qcom,smem";

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts
index c6d7da39174309d47cf22e92c00112213567a17b..1f2cd247b671d73aec8e2a56c08f214e6559e502 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts
@@ -11,16 +11,6 @@
                device_type = "memory";
        };
 
-       reserved-memory {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               ranges;
-               rsvd@41200000 {
-                       reg = <0x41200000 0x300000>;
-                       no-map;
-               };
-       };
-
        aliases {
                mdio-gpio0 = &mdio0;
 
@@ -175,20 +165,6 @@
        };
 };
 
-&gsbi4 {
-       qcom,mode = <GSBI_PROT_I2C_UART>;
-       status = "okay";
-       serial@16340000 {
-               status = "okay";
-       };
-       /*
-               * The i2c device on gsbi4 should not be enabled.
-               * On ipq806x designs gsbi4 i2c is meant for exclusive
-               * RPM usage. Turning this on in kernel manifests as
-               * i2c failure for the RPM.
-               */
-};
-
 &gsbi5 {
        qcom,mode = <GSBI_PROT_SPI>;
        status = "okay";

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
index 5bd195955ab95eca9c3ff067a8e92c3d4102c8ac..dc25a424037a86a0b8e377b476565fab875ce14b 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
@@ -11,16 +11,6 @@
                device_type = "memory";
        };
 
-       reserved-memory {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               ranges;
-               rsvd@41200000 {
-                       reg = <0x41200000 0x300000>;
-                       no-map;
-               };
-       };
-
        aliases {
                mdio-gpio0 = &mdio0;
 
@@ -152,26 +142,11 @@
        };
 };
 
-&gsbi4 {
-       qcom,mode = <GSBI_PROT_I2C_UART>;
-       status = "okay";
-       serial@16340000 {
-               status = "okay";
-       };
-       /*
-               * The i2c device on gsbi4 should not be enabled.
-               * On ipq806x designs gsbi4 i2c is meant for exclusive
-               * RPM usage. Turning this on in kernel manifests as
-               * i2c failure for the RPM.
-               */
-};
-
 &sata_phy {
        status = "okay";
 };
 
 &sata {
-       ports-implemented = <0x1>;
        status = "okay";
 };
 

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea7500-v1.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea7500-v1.dts
index 6454fae7f7629005e64dba6c6591f5746d92be59..8001b17e815ad969fa9195d8307acc5d7c0b6f1a 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea7500-v1.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea7500-v1.dts
@@ -12,19 +12,7 @@
                device_type = "memory";
        };
 
-       reserved-memory {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               ranges;
-               rsvd@41200000 {
-                       reg = <0x41200000 0x300000>;
-                       no-map;
-               };
-       };
-
        aliases {
-               serial0 = &gsbi4_serial;
-
                led-boot = &led_power;
                led-failsafe = &led_power;
                led-running = &led_power;
@@ -33,7 +21,7 @@
 
        chosen {
                bootargs = "console=ttyMSM0,115200n8";
-               stdout-path = "serial0:115200n8";
+
                append-rootblock = "ubi.mtd=";  /* append to bootargs adding the root deviceblock nbr from bootloader */
                find-rootblock = "ubi.mtd=";  /* look for root deviceblock nbr in this bootarg */
        };
@@ -89,20 +77,6 @@
        };
 };
 
-&gsbi4 {
-       qcom,mode = <GSBI_PROT_I2C_UART>;
-       status = "okay";
-       serial@16340000 {
-               status = "okay";
-       };
-       /*
-       * The i2c device on gsbi4 should not be enabled.
-       * On ipq806x designs gsbi4 i2c is meant for exclusive
-       * RPM usage. Turning this on in kernel manifests as
-       * i2c failure for the RPM.
-       */
-};
-
 &usb3_0 {
        status = "okay";
 };

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
index 7110f8943ab2bc8a1bee3453feea9e93aae7485e..9c5d1639190ed3d785792fff654bff4f9ece0c5a 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
@@ -11,16 +11,6 @@
                device_type = "memory";
        };
 
-       reserved-memory {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               ranges;
-               rsvd@41200000 {
-                       reg = <0x41200000 0x300000>;
-                       no-map;
-               };
-       };
-
        aliases {
                mdio-gpio0 = &mdio0;
 
@@ -102,20 +92,6 @@
        };
 };
 
-&gsbi4 {
-       qcom,mode = <GSBI_PROT_I2C_UART>;
-       status = "okay";
-       serial@16340000 {
-               status = "okay";
-       };
-       /*
-               * The i2c device on gsbi4 should not be enabled.
-               * On ipq806x designs gsbi4 i2c is meant for exclusive
-               * RPM usage. Turning this on in kernel manifests as
-               * i2c failure for the RPM.
-               */
-};
-
 &sata_phy {
        status = "okay";
 };

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
index c1fb3b55345b019573b7c3def01b53c4fc605a58..868d1e9a9a2ce51680c61b9440c629ffd5116542 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
@@ -133,13 +133,6 @@
        };
 };
 
-/*
-* The i2c device on gsbi4 should not be enabled.
-* On ipq806x designs gsbi4 i2c is meant for exclusive
-* RPM usage. Turning this on in kernel manifests as
-* i2c failure for the RPM.
-*/
-
 &gsbi5 {
        status = "disabled";
 

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
index 015de3d2b1d542fdcdf6a854c6cac6ad8ccd45cc..8cb6376ee7e404e6067612436f12d0c22afaac86 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
@@ -12,14 +12,6 @@
        };
 
        reserved-memory {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               ranges;
-               rsvd@41200000 {
-                       reg = <0x41200000 0x300000>;
-                       no-map;
-               };
-
                rsvd@5fe00000 {
                        reg = <0x5fe00000 0x200000>;
                        reusable;
@@ -161,20 +153,6 @@
        };
 };
 
-&gsbi4 {
-       qcom,mode = <GSBI_PROT_I2C_UART>;
-       status = "okay";
-       serial@16340000 {
-               status = "okay";
-       };
-       /*
-               * The i2c device on gsbi4 should not be enabled.
-               * On ipq806x designs gsbi4 i2c is meant for exclusive
-               * RPM usage. Turning this on in kernel manifests as
-               * i2c failure for the RPM.
-               */
-};
-
 &sata_phy {
        status = "okay";
 };

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi
index c0bcee783dc70dd21462316922dbc5f001fdeb2b..350965200b9ec62d2c91e453f5ff6e9eaea94eab 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi
@@ -8,6 +8,32 @@
        chosen {
                stdout-path = "serial0:115200n8";
        };
+
+       reserved-memory {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges;
+
+               rsvd@41200000 {
+                       reg = <0x41200000 0x300000>;
+                       no-map;
+               };
+       };
+};
+
+&gsbi4 {
+       qcom,mode = <GSBI_PROT_I2C_UART>;
+       status = "okay";
+
+       serial@16340000 {
+               status = "okay";
+       };
+       /*
+       * The i2c device on gsbi4 should not be enabled.
+       * On ipq806x designs gsbi4 i2c is meant for exclusive
+       * RPM usage. Turning this on in kernel manifests as
+       * i2c failure for the RPM.
+       */
 };
 
 &CPU_SPC {

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts
index 5de089eab42e8057cd7ed7a32e4de934712ccf23..8cc69bca88b018ec0da72d27511b4143ed35702c 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts
@@ -11,16 +11,6 @@
                device_type = "memory";
        };
 
-       reserved-memory {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               ranges;
-               rsvd@41200000 {
-                       reg = <0x41200000 0x300000>;
-                       no-map;
-               };
-       };
-
        aliases {
                mdio-gpio0 = &mdio0;
 
@@ -164,20 +154,6 @@
        };
 };
 
-&gsbi4 {
-       qcom,mode = <GSBI_PROT_I2C_UART>;
-       status = "okay";
-       serial@16340000 {
-               status = "okay";
-       };
-       /*
-               * The i2c device on gsbi4 should not be enabled.
-               * On ipq806x designs gsbi4 i2c is meant for exclusive
-               * RPM usage. Turning this on in kernel manifests as
-               * i2c failure for the RPM.
-               */
-};
-
 &gsbi5 {
        qcom,mode = <GSBI_PROT_SPI>;
        status = "okay";

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts
index f8a0d07016b34a7b14b886a6add9fbb29c652bb9..322968dfdb6f40eaa241f2f529d349b567d5e4e2 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts
@@ -11,16 +11,6 @@
                device_type = "memory";
        };
 
-       reserved-memory {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               ranges;
-               rsvd@41200000 {
-                       reg = <0x41200000 0x300000>;
-                       no-map;
-               };
-       };
-
        aliases {
                mdio-gpio0 = &mdio0;
 
@@ -187,15 +177,6 @@
        };
 };
 
-&gsbi4 {
-       status = "okay";
-       qcom,mode = <GSBI_PROT_I2C_UART>;
-};
-
-&gsbi4_serial {
-       status = "okay";
-};
-
 &gsbi5 {
        status = "okay";
 

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts
index 557ea614523d6978bd67026e44e17f6d490944d1..812757131a033769a0d51f331a7255091fd45d5f 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts
@@ -12,16 +12,6 @@
                device_type = "memory";
        };
 
-       reserved-memory {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               ranges;
-               rsvd@41200000 {
-                       reg = <0x41200000 0x300000>;
-                       no-map;
-               };
-       };
-
        aliases {
                led-boot = &power;
                led-failsafe = &diag;
@@ -245,14 +235,7 @@
        };
 };
 
-&gsbi4 {
-       status = "okay";
-       qcom,mode = <GSBI_PROT_I2C_UART>;
-};
-
 &gsbi4_serial {
-       status = "okay";
-
        pinctrl-0 = <&uart0_pins>;
        pinctrl-names = "default";
 };

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
index 02cb4dc7e89f7fec87c606c32dae2ca6f10013a4..dab5c4ccd5893f75443a149e7c999edf1a1df5e2 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
@@ -11,16 +11,6 @@
                device_type = "memory";
        };
 
-       reserved-memory {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               ranges;
-               rsvd@41200000 {
-                       reg = <0x41200000 0x300000>;
-                       no-map;
-               };
-       };
-
        aliases {
                mdio-gpio0 = &mdio0;
                sdcc1 = &sdcc1;
@@ -172,20 +162,6 @@
        };
 };
 
-&gsbi4 {
-       qcom,mode = <GSBI_PROT_I2C_UART>;
-       status = "okay";
-       serial@16340000 {
-               status = "okay";
-       };
-       /*
-               * The i2c device on gsbi4 should not be enabled.
-               * On ipq806x designs gsbi4 i2c is meant for exclusive
-               * RPM usage. Turning this on in kernel manifests as
-               * i2c failure for the RPM.
-               */
-};
-
 &gsbi5 {
        qcom,mode = <GSBI_PROT_SPI>;
        status = "okay";

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
index f7cc8643f152eaf3f8718febb2b778960adab11e..7b272b74ca5757166c297d3cacd5d5932e8e065f 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
@@ -12,14 +12,6 @@
        };
 
        reserved-memory {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               ranges;
-               rsvd@41200000 {
-                       reg = <0x41200000 0x300000>;
-                       no-map;
-               };
-
                rsvd@5fe00000 {
                        reg = <0x5fe00000 0x200000>;
                        reusable;
@@ -234,22 +226,6 @@
        };
 };
 
-&gsbi4 {
-       qcom,mode = <GSBI_PROT_I2C_UART>;
-       status = "okay";
-
-       serial@16340000 {
-               status = "okay";
-       };
-
-       /*
-       * The i2c device on gsbi4 should not be enabled.
-       * On ipq806x designs gsbi4 i2c is meant for exclusive
-       * RPM usage. Turning this on in kernel manifests as
-       * i2c failure for the RPM.
-       */
-};
-
 &nand_controller {
        status = "okay";
 
@@ -416,7 +392,6 @@
 };
 
 &sata {
-       ports-implemented = <0x1>;
        status = "okay";
 };
 

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065.dtsi b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065.dtsi
index 0a58c970954696be233a9a15d7b57a29b3cb86b6..b706bfa3a7835950356cc9a28318e1b9158ee875 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065.dtsi
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065.dtsi
@@ -17,6 +17,32 @@
                        qcom,l2-cpufreq = <384000000 600000000 1400000000>;
                };
        };
+
+       reserved-memory {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges;
+
+               rsvd@41200000 {
+                       reg = <0x41200000 0x300000>;
+                       no-map;
+               };
+       };
+};
+
+&gsbi4 {
+       qcom,mode = <GSBI_PROT_I2C_UART>;
+       status = "okay";
+
+       serial@16340000 {
+               status = "okay";
+       };
+       /*
+       * The i2c device on gsbi4 should not be enabled.
+       * On ipq806x designs gsbi4 i2c is meant for exclusive
+       * RPM usage. Turning this on in kernel manifests as
+       * i2c failure for the RPM.
+       */
 };
 
 &pcie0 {