catspeed-cc/openwrt
2
1
Fork 0
Code Issues Pull Requests Activity

ipq806x: dts: fix 6.12 kernel pinmux conflicts

Browse Source 
Some pinmux nodes in the qcom-ipq8064.dtsi have been changed[1].
Adjust our local devices dts to solve the conflicts.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.12.y&id=de52c020e1a9c3313d88405a4545020b1f5ab24d

Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/18989
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Shiji Yang 2025-05-31 23:56:40 +08:00 committed by Christian Marangi
parent 7d2fd7d590
commit 6bc9ebc31d
WARNING! Although there is a key with this ID in the database it does not verify this commit! This commit is SUSPICIOUS.
GPG Key ID: AC001D09ADBFEAD7
18 changed files with 231 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8062-wg2600hp3.dts
View File

@ -25,7 +25,7 @@
keys {
compatible = "gpio-keys";
pinctrl-0 = <&buttons_pins>;
pinctrl-0 = <&button_pins>;
pinctrl-names = "default";
reset {
@ -66,7 +66,7 @@
leds {
compatible = "gpio-leds";
pinctrl-0 = <&leds_pins>;
pinctrl-0 = <&led_pins>;
pinctrl-names = "default";
led_power_green: power_green {
@ -135,7 +135,7 @@
};
};
/* nand_pins are used for leds_pins, empty the node
/* nand_pins are used for led_pins, empty the node
* from ipq8064.dtsi
*/
&nand_pins {
@ -148,7 +148,12 @@
pinctrl-0 = <&akro_pins>;
pinctrl-names = "default";
spi_pins: spi_pins {
spi_pins: spi-state {
/delete-property/ pins;
/delete-property/ function;
/delete-property/ drive-strength;
/delete-property/ bias-disable;
mux {
pins = "gpio18", "gpio19", "gpio21";
function = "gsbi5";
@ -171,7 +176,7 @@
};
};
buttons_pins: buttons_pins {
button_pins: button_pins {
mux {
pins = "gpio22", "gpio24", "gpio40",
"gpio41";
@ -181,7 +186,7 @@
};
};
leds_pins: leds_pins {
led_pins: led_pins {
mux {
pins = "gpio14", "gpio15", "gpio35",
"gpio36", "gpio38", "gpio42",

7
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-ad7200-c2600.dtsi
View File

@ -28,7 +28,12 @@
};
&qcom_pinmux {
spi_pins: spi_pins {
spi_pins: spi-state {
/delete-property/ pins;
/delete-property/ function;
/delete-property/ drive-strength;
/delete-property/ bias-disable;
mux {
pins = "gpio18", "gpio19", "gpio21";
function = "gsbi5";

14
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-ap161.dts
View File

@ -25,14 +25,12 @@
};
&qcom_pinmux {
rgmii2_pins: rgmii2-pins {
mux {
pins = "gpio27", "gpio28", "gpio29",
"gpio30", "gpio31", "gpio32",
"gpio51", "gpio52", "gpio59",
"gpio60", "gpio61", "gpio62",
"gpio2", "gpio66";
};
rgmii2_pins: rgmii2-state {
pins = "gpio27", "gpio28", "gpio29",
"gpio30", "gpio31", "gpio32",
"gpio51", "gpio52", "gpio59",
"gpio60", "gpio61", "gpio62",
"gpio2", "gpio66";
};
};

26
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-fap-421e.dts
View File

@ -116,8 +116,23 @@
};
};
rgmii2_pins: rgmii2-pins {
mux {
rgmii2_pins: rgmii2-state {
/delete-property/ pins;
/delete-property/ function;
/delete-property/ drive-strength;
/delete-property/ bias-disable;
mux-1 {
pins = "gpio27", "gpio28", "gpio29",
"gpio30", "gpio31", "gpio32",
"gpio51", "gpio52", "gpio59",
"gpio60", "gpio61", "gpio62";
function = "rgmii2";
drive-strength = <8>;
bias-disable;
};
mux-2 {
bias-disable;
drive-strength = <16>;
function = "rgmii2";
@ -125,7 +140,12 @@
};
};
spi_pins: spi_pins {
spi_pins: spi-state {
/delete-property/ pins;
/delete-property/ function;
/delete-property/ drive-strength;
/delete-property/ bias-disable;
mux {
pins = "gpio18", "gpio19", "gpio21";
function = "gsbi5";

7
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-onhub.dtsi
View File

@ -271,7 +271,12 @@
};
};
spi_pins: spi_pins {
spi_pins: spi-state {
/delete-property/ pins;
/delete-property/ function;
/delete-property/ drive-strength;
/delete-property/ bias-disable;
mux {
pins = "gpio18", "gpio19", "gpio21";
function = "gsbi5";

7
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-unifi-ac-hd.dts
View File

@ -71,7 +71,12 @@
};
};
spi_pins: spi_pins {
spi_pins: spi-state {
/delete-property/ pins;
/delete-property/ function;
/delete-property/ drive-strength;
/delete-property/ bias-disable;
mux {
pins = "gpio18", "gpio19", "gpio21";
function = "gsbi5";

7
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-vr2600v.dts
View File

@ -144,7 +144,12 @@
};
};
spi_pins: spi_pins {
spi_pins: spi-state {
/delete-property/ pins;
/delete-property/ function;
/delete-property/ drive-strength;
/delete-property/ bias-disable;
mux {
pins = "gpio18", "gpio19", "gpio21";
function = "gsbi5";

7
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wg2600hp.dts
View File

@ -516,7 +516,12 @@ switch@10 {
};
};
spi_pins: spi_pins {
spi_pins: spi-state {
/delete-property/ pins;
/delete-property/ function;
/delete-property/ drive-strength;
/delete-property/ bias-disable;
mux {
pins = "gpio18", "gpio19", "gpio21";
function = "gsbi5";

7
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wpq864.dts
View File

@ -528,7 +528,12 @@
};
};
spi_pins: spi_pins {
spi_pins: spi-state {
/delete-property/ pins;
/delete-property/ function;
/delete-property/ drive-strength;
/delete-property/ bias-disable;
mux {
pins = "gpio18", "gpio19";
function = "gsbi5";

7
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wxr-2533dhp.dts
View File

@ -586,7 +586,12 @@
};
};
spi_pins: spi_pins {
spi_pins: spi-state {
/delete-property/ pins;
/delete-property/ function;
/delete-property/ drive-strength;
/delete-property/ bias-disable;
mux {
pins = "gpio18", "gpio19", "gpio21";
function = "gsbi5";

7
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-ac400i.dts
View File

@ -102,7 +102,12 @@
};
&qcom_pinmux {
spi_pins: spi_pins {
spi_pins: spi-state {
/delete-property/ pins;
/delete-property/ function;
/delete-property/ drive-strength;
/delete-property/ bias-disable;
mux {
pins = "gpio18", "gpio19";
function = "gsbi5";

45
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-nbg6817.dts
View File

@ -110,21 +110,60 @@
};
};
mdio0_pins: mdio0-pins {
mdio0_pins: mdio0-state {
/delete-property/ pins;
/delete-property/ function;
/delete-property/ drive-strength;
/delete-property/ bias-disable;
mux {
pins = "gpio0", "gpio1";
function = "mdio";
drive-strength = <8>;
bias-disable;
};
clk {
pins = "gpio1";
input-disable;
};
};
rgmii2_pins: rgmii2-pins {
rgmii2_pins: rgmii2-state {
/delete-property/ pins;
/delete-property/ function;
/delete-property/ drive-strength;
/delete-property/ bias-disable;
mux {
pins = "gpio27", "gpio28", "gpio29",
"gpio30", "gpio31", "gpio32",
"gpio51", "gpio52", "gpio59",
"gpio60", "gpio61", "gpio62";
function = "rgmii2";
drive-strength = <8>;
bias-disable;
};
tx {
pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32" ;
input-disable;
};
};
spi_pins: spi_pins {
spi_pins: spi-state {
/delete-property/ pins;
/delete-property/ function;
/delete-property/ drive-strength;
/delete-property/ bias-disable;
mux {
pins = "gpio18", "gpio19", "gpio21";
function = "gsbi5";
drive-strength = <10>;
bias-disable;
};
cs {
pins = "gpio20";
drive-strength = <12>;

38
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-nighthawk.dtsi
View File

@ -130,14 +130,41 @@
};
};
mdio0_pins: mdio0-pins {
mdio0_pins: mdio0-state {
/delete-property/ pins;
/delete-property/ function;
/delete-property/ drive-strength;
/delete-property/ bias-disable;
mux {
pins = "gpio0", "gpio1";
function = "mdio";
drive-strength = <8>;
bias-disable;
};
clk {
pins = "gpio1";
input-disable;
};
};
rgmii2_pins: rgmii2-pins {
rgmii2_pins: rgmii2-state {
/delete-property/ pins;
/delete-property/ function;
/delete-property/ drive-strength;
/delete-property/ bias-disable;
mux {
pins = "gpio27", "gpio28", "gpio29",
"gpio30", "gpio31", "gpio32",
"gpio51", "gpio52", "gpio59",
"gpio60", "gpio61", "gpio62";
function = "rgmii2";
drive-strength = <8>;
bias-disable;
};
tx {
pins = "gpio27", "gpio28", "gpio29",
"gpio30", "gpio31", "gpio32";
@ -145,7 +172,12 @@
};
};
spi_pins: spi_pins {
spi_pins: spi-state {
/delete-property/ pins;
/delete-property/ function;
/delete-property/ drive-strength;
/delete-property/ bias-disable;
mux {
pins = "gpio18", "gpio19", "gpio21";
function = "gsbi5";

21
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-rt4230w-rev6.dts
View File

@ -84,7 +84,12 @@
};
};
rgmii2_pins: rgmii2-pins {
rgmii2_pins: rgmii2-state {
/delete-property/ pins;
/delete-property/ function;
/delete-property/ drive-strength;
/delete-property/ bias-disable;
mux {
pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31",
"gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62";
@ -99,7 +104,19 @@
};
};
spi_pins: spi_pins {
spi_pins: spi-state {
/delete-property/ pins;
/delete-property/ function;
/delete-property/ drive-strength;
/delete-property/ bias-disable;
mux {
pins = "gpio18", "gpio19", "gpio21";
function = "gsbi5";
drive-strength = <10>;
bias-disable;
};
cs {
pins = "gpio20";
drive-strength = <12>;

31
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-tr4400-v2.dts
View File

@ -84,14 +84,41 @@
};
};
rgmii2_pins: rgmii2-pins {
rgmii2_pins: rgmii2-state {
/delete-property/ pins;
/delete-property/ function;
/delete-property/ drive-strength;
/delete-property/ bias-disable;
mux {
pins = "gpio27", "gpio28", "gpio29",
"gpio30", "gpio31", "gpio32",
"gpio51", "gpio52", "gpio59",
"gpio60", "gpio61", "gpio62";
function = "rgmii2";
drive-strength = <8>;
bias-disable;
};
tx {
pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32";
input-disable;
};
};
spi_pins: spi_pins {
spi_pins: spi-state {
/delete-property/ pins;
/delete-property/ function;
/delete-property/ drive-strength;
/delete-property/ bias-disable;
mux {
pins = "gpio18", "gpio19", "gpio21";
function = "gsbi5";
drive-strength = <10>;
bias-disable;
};
cs {
pins = "gpio20";
drive-strength = <12>;

7
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ap3935.dts
View File

@ -99,7 +99,12 @@
&qcom_pinmux {
spi_pins: spi_pins {
spi_pins: spi-state {
/delete-property/ pins;
/delete-property/ function;
/delete-property/ drive-strength;
/delete-property/ bias-disable;
mux {
pins = "gpio18", "gpio19";
function = "gsbi5";

7
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ecw5410.dts
View File

@ -103,7 +103,12 @@
&qcom_pinmux {
spi_pins: spi_pins {
spi_pins: spi-state {
/delete-property/ pins;
/delete-property/ function;
/delete-property/ drive-strength;
/delete-property/ bias-disable;
mux {
pins = "gpio18", "gpio19";
function = "gsbi5";

7
target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ss-w2-ac2600.dts
View File

@ -95,7 +95,12 @@
};
&qcom_pinmux {
spi_pins: spi_pins {
spi_pins: spi-state {
/delete-property/ pins;
/delete-property/ function;
/delete-property/ drive-strength;
/delete-property/ bias-disable;
mux {
pins = "gpio18", "gpio19";
function = "gsbi5";