[openwrt/openwrt] ipq806x: move further common nodes to the DTSI files
LEDE Commits
lede-commits at lists.infradead.org
Mon Aug 17 09:26:16 EDT 2020
adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/57e029ba573bb6b4e19c90d55960bed0357c321b
commit 57e029ba573bb6b4e19c90d55960bed0357c321b
Author: Adrian Schmutzler <freifunk at adrianschmutzler.de>
AuthorDate: Fri Aug 14 16:31:40 2020 +0200
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 at adrianschmutzler.de>
---
.../arch/arm/boot/dts/qcom-ipq8064-ap148.dts | 7 ------
.../arch/arm/boot/dts/qcom-ipq8064-ap161.dts | 7 ------
.../arch/arm/boot/dts/qcom-ipq8064-c2600.dts | 24 -------------------
.../arch/arm/boot/dts/qcom-ipq8064-d7800.dts | 25 -------------------
.../arch/arm/boot/dts/qcom-ipq8064-ea7500-v1.dts | 28 +---------------------
.../arch/arm/boot/dts/qcom-ipq8064-ea8500.dts | 24 -------------------
.../arch/arm/boot/dts/qcom-ipq8064-r7500.dts | 7 ------
.../arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts | 22 -----------------
.../arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi | 26 ++++++++++++++++++++
.../arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts | 24 -------------------
.../arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts | 19 ---------------
.../arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts | 17 -------------
.../arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts | 24 -------------------
.../arch/arm/boot/dts/qcom-ipq8065-r7800.dts | 25 -------------------
.../files-5.4/arch/arm/boot/dts/qcom-ipq8065.dtsi | 26 ++++++++++++++++++++
15 files changed, 53 insertions(+), 252 deletions(-)
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 a23f3da469..a28927cde7 100644
--- 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 59c06dbccc..f86f61f5ca 100644
--- 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 c6d7da3917..1f2cd247b6 100644
--- 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 at 41200000 {
- reg = <0x41200000 0x300000>;
- no-map;
- };
- };
-
aliases {
mdio-gpio0 = &mdio0;
@@ -175,20 +165,6 @@
};
};
-&gsbi4 {
- qcom,mode = <GSBI_PROT_I2C_UART>;
- status = "okay";
- serial at 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 5bd195955a..dc25a42403 100644
--- 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 at 41200000 {
- reg = <0x41200000 0x300000>;
- no-map;
- };
- };
-
aliases {
mdio-gpio0 = &mdio0;
@@ -152,26 +142,11 @@
};
};
-&gsbi4 {
- qcom,mode = <GSBI_PROT_I2C_UART>;
- status = "okay";
- serial at 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 6454fae7f7..8001b17e81 100644
--- 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 at 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 at 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 7110f8943a..9c5d163919 100644
--- 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 at 41200000 {
- reg = <0x41200000 0x300000>;
- no-map;
- };
- };
-
aliases {
mdio-gpio0 = &mdio0;
@@ -102,20 +92,6 @@
};
};
-&gsbi4 {
- qcom,mode = <GSBI_PROT_I2C_UART>;
- status = "okay";
- serial at 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 c1fb3b5534..868d1e9a9a 100644
--- 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 015de3d2b1..8cb6376ee7 100644
--- 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 at 41200000 {
- reg = <0x41200000 0x300000>;
- no-map;
- };
-
rsvd at 5fe00000 {
reg = <0x5fe00000 0x200000>;
reusable;
@@ -161,20 +153,6 @@
};
};
-&gsbi4 {
- qcom,mode = <GSBI_PROT_I2C_UART>;
- status = "okay";
- serial at 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 c0bcee783d..350965200b 100644
--- 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 at 41200000 {
+ reg = <0x41200000 0x300000>;
+ no-map;
+ };
+ };
+};
+
+&gsbi4 {
+ qcom,mode = <GSBI_PROT_I2C_UART>;
+ status = "okay";
+
+ serial at 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 5de089eab4..8cc69bca88 100644
--- 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 at 41200000 {
- reg = <0x41200000 0x300000>;
- no-map;
- };
- };
-
aliases {
mdio-gpio0 = &mdio0;
@@ -164,20 +154,6 @@
};
};
-&gsbi4 {
- qcom,mode = <GSBI_PROT_I2C_UART>;
- status = "okay";
- serial at 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 f8a0d07016..322968dfdb 100644
--- 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 at 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 557ea61452..812757131a 100644
--- 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 at 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 02cb4dc7e8..dab5c4ccd5 100644
--- 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 at 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 at 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 f7cc8643f1..7b272b74ca 100644
--- 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 at 41200000 {
- reg = <0x41200000 0x300000>;
- no-map;
- };
-
rsvd at 5fe00000 {
reg = <0x5fe00000 0x200000>;
reusable;
@@ -234,22 +226,6 @@
};
};
-&gsbi4 {
- qcom,mode = <GSBI_PROT_I2C_UART>;
- status = "okay";
-
- serial at 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 0a58c97095..b706bfa3a7 100644
--- 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 at 41200000 {
+ reg = <0x41200000 0x300000>;
+ no-map;
+ };
+ };
+};
+
+&gsbi4 {
+ qcom,mode = <GSBI_PROT_I2C_UART>;
+ status = "okay";
+
+ serial at 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 {
More information about the lede-commits
mailing list