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>
master
Adrian Schmutzler 2020-08-14 16:31:40 +02:00
parent 8484a764df
commit 57e029ba57
15 changed files with 53 additions and 252 deletions

View File

@ -28,13 +28,6 @@
status = "okay"; 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 { &flash {
partitions { partitions {
compatible = "qcom,smem"; compatible = "qcom,smem";

View File

@ -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 { &flash {
partitions { partitions {
compatible = "qcom,smem"; compatible = "qcom,smem";

View File

@ -11,16 +11,6 @@
device_type = "memory"; device_type = "memory";
}; };
reserved-memory {
#address-cells = <1>;
#size-cells = <1>;
ranges;
rsvd@41200000 {
reg = <0x41200000 0x300000>;
no-map;
};
};
aliases { aliases {
mdio-gpio0 = &mdio0; 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 { &gsbi5 {
qcom,mode = <GSBI_PROT_SPI>; qcom,mode = <GSBI_PROT_SPI>;
status = "okay"; status = "okay";

View File

@ -11,16 +11,6 @@
device_type = "memory"; device_type = "memory";
}; };
reserved-memory {
#address-cells = <1>;
#size-cells = <1>;
ranges;
rsvd@41200000 {
reg = <0x41200000 0x300000>;
no-map;
};
};
aliases { aliases {
mdio-gpio0 = &mdio0; 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 { &sata_phy {
status = "okay"; status = "okay";
}; };
&sata { &sata {
ports-implemented = <0x1>;
status = "okay"; status = "okay";
}; };

View File

@ -12,19 +12,7 @@
device_type = "memory"; device_type = "memory";
}; };
reserved-memory {
#address-cells = <1>;
#size-cells = <1>;
ranges;
rsvd@41200000 {
reg = <0x41200000 0x300000>;
no-map;
};
};
aliases { aliases {
serial0 = &gsbi4_serial;
led-boot = &led_power; led-boot = &led_power;
led-failsafe = &led_power; led-failsafe = &led_power;
led-running = &led_power; led-running = &led_power;
@ -33,7 +21,7 @@
chosen { chosen {
bootargs = "console=ttyMSM0,115200n8"; bootargs = "console=ttyMSM0,115200n8";
stdout-path = "serial0:115200n8";
append-rootblock = "ubi.mtd="; /* append to bootargs adding the root deviceblock nbr from bootloader */ 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 */ 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 { &usb3_0 {
status = "okay"; status = "okay";
}; };

View File

@ -11,16 +11,6 @@
device_type = "memory"; device_type = "memory";
}; };
reserved-memory {
#address-cells = <1>;
#size-cells = <1>;
ranges;
rsvd@41200000 {
reg = <0x41200000 0x300000>;
no-map;
};
};
aliases { aliases {
mdio-gpio0 = &mdio0; 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 { &sata_phy {
status = "okay"; status = "okay";
}; };

View File

@ -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 { &gsbi5 {
status = "disabled"; status = "disabled";

View File

@ -12,14 +12,6 @@
}; };
reserved-memory { reserved-memory {
#address-cells = <1>;
#size-cells = <1>;
ranges;
rsvd@41200000 {
reg = <0x41200000 0x300000>;
no-map;
};
rsvd@5fe00000 { rsvd@5fe00000 {
reg = <0x5fe00000 0x200000>; reg = <0x5fe00000 0x200000>;
reusable; 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 { &sata_phy {
status = "okay"; status = "okay";
}; };

View File

@ -8,6 +8,32 @@
chosen { chosen {
stdout-path = "serial0:115200n8"; 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 { &CPU_SPC {

View File

@ -11,16 +11,6 @@
device_type = "memory"; device_type = "memory";
}; };
reserved-memory {
#address-cells = <1>;
#size-cells = <1>;
ranges;
rsvd@41200000 {
reg = <0x41200000 0x300000>;
no-map;
};
};
aliases { aliases {
mdio-gpio0 = &mdio0; 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 { &gsbi5 {
qcom,mode = <GSBI_PROT_SPI>; qcom,mode = <GSBI_PROT_SPI>;
status = "okay"; status = "okay";

View File

@ -11,16 +11,6 @@
device_type = "memory"; device_type = "memory";
}; };
reserved-memory {
#address-cells = <1>;
#size-cells = <1>;
ranges;
rsvd@41200000 {
reg = <0x41200000 0x300000>;
no-map;
};
};
aliases { aliases {
mdio-gpio0 = &mdio0; mdio-gpio0 = &mdio0;
@ -187,15 +177,6 @@
}; };
}; };
&gsbi4 {
status = "okay";
qcom,mode = <GSBI_PROT_I2C_UART>;
};
&gsbi4_serial {
status = "okay";
};
&gsbi5 { &gsbi5 {
status = "okay"; status = "okay";

View File

@ -12,16 +12,6 @@
device_type = "memory"; device_type = "memory";
}; };
reserved-memory {
#address-cells = <1>;
#size-cells = <1>;
ranges;
rsvd@41200000 {
reg = <0x41200000 0x300000>;
no-map;
};
};
aliases { aliases {
led-boot = &power; led-boot = &power;
led-failsafe = &diag; led-failsafe = &diag;
@ -245,14 +235,7 @@
}; };
}; };
&gsbi4 {
status = "okay";
qcom,mode = <GSBI_PROT_I2C_UART>;
};
&gsbi4_serial { &gsbi4_serial {
status = "okay";
pinctrl-0 = <&uart0_pins>; pinctrl-0 = <&uart0_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
}; };

View File

@ -11,16 +11,6 @@
device_type = "memory"; device_type = "memory";
}; };
reserved-memory {
#address-cells = <1>;
#size-cells = <1>;
ranges;
rsvd@41200000 {
reg = <0x41200000 0x300000>;
no-map;
};
};
aliases { aliases {
mdio-gpio0 = &mdio0; mdio-gpio0 = &mdio0;
sdcc1 = &sdcc1; 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 { &gsbi5 {
qcom,mode = <GSBI_PROT_SPI>; qcom,mode = <GSBI_PROT_SPI>;
status = "okay"; status = "okay";

View File

@ -12,14 +12,6 @@
}; };
reserved-memory { reserved-memory {
#address-cells = <1>;
#size-cells = <1>;
ranges;
rsvd@41200000 {
reg = <0x41200000 0x300000>;
no-map;
};
rsvd@5fe00000 { rsvd@5fe00000 {
reg = <0x5fe00000 0x200000>; reg = <0x5fe00000 0x200000>;
reusable; 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 { &nand_controller {
status = "okay"; status = "okay";
@ -416,7 +392,6 @@
}; };
&sata { &sata {
ports-implemented = <0x1>;
status = "okay"; status = "okay";
}; };

View File

@ -17,6 +17,32 @@
qcom,l2-cpufreq = <384000000 600000000 1400000000>; 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 { &pcie0 {