[openwrt/openwrt] lantiq: fix pci driver once again
LEDE Commits
lede-commits at lists.infradead.org
Thu Jun 20 00:57:43 PDT 2024
robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/f6fe19ed6dfaf0444cd80f530bf89f6878fd5936
commit f6fe19ed6dfaf0444cd80f530bf89f6878fd5936
Author: Martin Schiller <ms at dev.tdt.de>
AuthorDate: Mon Jun 17 08:27:59 2024 +0200
lantiq: fix pci driver once again
In my previous attempt to solve the PCI problems for the lantiq targets,
I did not pay attention to the fact that the original accesses to the
GPIO took place in RAW mode. As a result, the polarity defined in the
device trees (apart from the initial value) was irrelevant.
In addition, the expected name of the GPIO in the dts has changed due to
the upstream change and therefore no RESET is currently performed.
As discussed in [1] on the linux-mips mailing list, we will now adapt
the dts files accordingly instead of patching the driver:
- dts property will be renamed to "reset-gpios"
- Polarity is set to "GPIO_ACTIVE_LOW".
I have verified this with a TP-Link TD-W8980. The PCI device is now
recognized by the system.
[1] https://patchwork.kernel.org/project/linux-mips/patch/20240607090400.1816612-1-ms@dev.tdt.de/
Signed-off-by: Martin Schiller <ms at dev.tdt.de>
Tested-by: Aleksander Jan Bajkowski <olek2 at wp.pl> # Tested on AVM 7330 (ar9)
Link: https://github.com/openwrt/openwrt/pull/15731
Signed-off-by: Robert Marko <robimarko at gmail.com>
---
.../mips/boot/dts/lantiq/ar9_avm_fritz7312.dts | 2 +-
.../mips/boot/dts/lantiq/ar9_avm_fritz7320.dts | 2 +-
.../mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts | 2 +-
.../mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi | 2 +-
.../boot/dts/lantiq/danube_arcadyan_arv4510pw.dts | 2 +-
.../dts/lantiq/danube_arcadyan_arv4518pwr01.dtsi | 2 +-
.../boot/dts/lantiq/danube_arcadyan_arv4519pw.dts | 2 +-
.../boot/dts/lantiq/danube_arcadyan_arv4520pw.dts | 2 +-
.../boot/dts/lantiq/danube_arcadyan_arv4525pw.dts | 2 +-
.../boot/dts/lantiq/danube_arcadyan_arv452cqw.dts | 2 +-
.../dts/lantiq/danube_arcadyan_arv7506pw11.dts | 2 +-
.../dts/lantiq/danube_arcadyan_arv7510pw22.dts | 2 +-
.../boot/dts/lantiq/danube_arcadyan_arv7518pw.dts | 2 +-
.../boot/dts/lantiq/danube_arcadyan_arv7519pw.dts | 2 +-
.../boot/dts/lantiq/danube_arcadyan_arv752dpw.dts | 2 +-
.../dts/lantiq/danube_arcadyan_arv752dpw22.dts | 2 +-
.../dts/lantiq/danube_arcadyan_arv8539pw22.dts | 2 +-
.../mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts | 2 +-
.../dts/lantiq/danube_siemens_gigaset-sx76x.dts | 2 +-
.../boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi | 2 +-
.../mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi | 2 +-
.../boot/dts/lantiq/vr9_arcadyan_vrv9510kwac23.dts | 2 +-
.../mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts | 2 +-
.../mips/boot/dts/lantiq/vr9_tplink_tdw8980.dts | 2 +-
.../mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi | 2 +-
.../boot/dts/lantiq/vr9_zyxel_p-2812hnu-fx.dtsi | 2 +-
...PS-pci-lantiq-restore-reset-gpio-polarity.patch | 62 ----------------------
...PS-pci-lantiq-restore-reset-gpio-polarity.patch | 62 ----------------------
28 files changed, 26 insertions(+), 150 deletions(-)
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts
index c6f0454d10..9ea6c3929c 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts
@@ -177,7 +177,7 @@
pinctrl-names = "default";
req-mask = <0xf>;
- gpio-reset = <&gpio 21 GPIO_ACTIVE_LOW>;
+ reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
wifi at 0,0 {
compatible = "pci0,0";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts
index 96adb0ddad..953a8ccbf7 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts
@@ -203,7 +203,7 @@
<&pci_req3_pins>, <&pci_req4_pins>;
req-mask = <0xf>;
- gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+ reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
wifi at 0,0 {
compatible = "pci0,0";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts
index fdc3c3037b..c76357279e 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts
@@ -177,7 +177,7 @@
pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>;
pinctrl-names = "default";
- gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+ reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
wifi at 7000 {
reg = <0x7000 0 0 0 0>;
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi
index 8409e07943..9108db1bd6 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi
@@ -133,7 +133,7 @@
pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>;
pinctrl-names = "default";
- gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+ reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
wifi at 168c,0029 {
compatible = "pci168c,0029";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4510pw.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4510pw.dts
index a6a8b93a24..e988da14e7 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4510pw.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4510pw.dts
@@ -203,7 +203,7 @@
0x7800 0 0 2 &icu0 66
0x7800 0 0 3 &icu0 66
>;
- gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+ reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
req-mask = <0x7>;
};
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dtsi
index 45ae578567..45162435bf 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4518pwr01.dtsi
@@ -192,7 +192,7 @@
<&pci_req1_pins>, <&pci_req2_pins>;
pinctrl-names = "default";
- gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+ reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
req-mask = <0xf>;
};
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts
index 55ac2038c8..9866b91fb4 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts
@@ -203,7 +203,7 @@
&pci0 {
status = "okay";
lantiq,external-clock;
- gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+ reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
req-mask = <0xf>;
};
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts
index 487a107ff2..3b9ee0fcb4 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts
@@ -218,7 +218,7 @@
pinctrl-names = "default";
lantiq,external-clock;
- gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+ reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
};
&usb_phy {
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts
index e781be3391..03f7afcd19 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts
@@ -152,7 +152,7 @@
pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>;
pinctrl-names = "default";
- gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+ reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
};
/* #define ARV4525PW_RELAY 31 */
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts
index 1fd192d221..42c50e1e82 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts
@@ -238,7 +238,7 @@
pinctrl-names = "default";
lantiq,external-clock;
- gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+ reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
};
&usb_phy {
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts
index 1c1fa2f77d..f4fd7397d3 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts
@@ -164,7 +164,7 @@
pinctrl-names = "default";
lantiq,external-clock;
- gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+ reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
wifi at 1814,3592 {
compatible = "pci1814,3592";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts
index 237188137b..4c9c9e524d 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7510pw22.dts
@@ -181,7 +181,7 @@
0x7800 0 0 2 &icu0 135
0x7800 0 0 3 &icu0 135
>;
- gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+ reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
req-mask = <0x3>;
wifi at 1814,3592 {
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts
index fe642b643f..dc4f6d3021 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts
@@ -225,7 +225,7 @@
pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>;
pinctrl-names = "default";
- gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+ reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
lantiq,external-clock;
req-mask = <0xf>;
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts
index 1f8db69f30..6b7c5f9b05 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7519pw.dts
@@ -201,7 +201,7 @@
pinctrl-names = "default";
lantiq,external-clock;
- gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+ reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
req-mask = <0xf>;
wifi at 0,0 {
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
index c5362a4d48..17b04846f9 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
@@ -227,7 +227,7 @@
pinctrl-names = "default";
lantiq,external-clock;
- gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+ reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
interrupt-map = <0x7000 0 0 1 &icu0 135>;
req-mask = <0x3>;
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts
index 9522e57f5e..1d8e521370 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts
@@ -248,7 +248,7 @@
0x7800 0 0 2 &icu0 135
0x7800 0 0 3 &icu0 135
>;
- gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+ reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
req-mask = <0x3>;
wifi at 1814,3592 {
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts
index 46b98c8c20..768e13c627 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts
@@ -170,7 +170,7 @@
pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>;
pinctrl-names = "default";
- gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+ reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
wifi at 168c,0029 {
compatible = "pci168c,0029";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts
index 4a422c6f4a..a1f7af075c 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts
@@ -219,7 +219,7 @@
pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>;
pinctrl-names = "default";
- gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+ reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
wifi at 168c,0027 {
compatible = "pci168c,0027";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_siemens_gigaset-sx76x.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_siemens_gigaset-sx76x.dts
index 5b57f70c9d..3296a44b4e 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_siemens_gigaset-sx76x.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/danube_siemens_gigaset-sx76x.dts
@@ -99,7 +99,7 @@
&pci0 {
status = "okay";
- gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+ reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
};
&usb_phy {
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi
index 6b2aa2b974..daf115088b 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi
@@ -230,7 +230,7 @@
&pci0 {
status = "okay";
- gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+ reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
wifi at 1814,3592 {
compatible = "pci1814,3592";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi
index 5056f3c709..52501b4d2a 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi
@@ -248,7 +248,7 @@
&pci0 {
status = "okay";
- gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+ reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
wifi at 1814,3091 {
compatible = "pci1814,3091";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vrv9510kwac23.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vrv9510kwac23.dts
index 9d9f981e95..0fb7347d73 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vrv9510kwac23.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_arcadyan_vrv9510kwac23.dts
@@ -326,7 +326,7 @@
pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>;
pinctrl-names = "default";
- gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+ reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
};
&pcie0 {
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts
index 0ee2cf74d1..cb6cb74af8 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts
@@ -260,7 +260,7 @@
&pci0 {
status = "okay";
- gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+ reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
wifi at 168c,002d {
compatible = "pci168c,002d";
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8980.dts b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8980.dts
index 1b8d2c6a0f..8221e0d5c5 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8980.dts
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8980.dts
@@ -25,5 +25,5 @@
&pci0 {
status = "okay";
- gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+ reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
};
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi
index 0fc54677db..34b58cd0b4 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi
@@ -205,7 +205,7 @@
&pci0 {
status = "okay";
- gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+ reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
};
&spi {
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-fx.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-fx.dtsi
index ac536e7a7a..2b8dc285cb 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-fx.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-fx.dtsi
@@ -216,7 +216,7 @@
pinctrl-0 = <&pci_gnt1_pins>, <&pci_req1_pins>;
pinctrl-names = "default";
- gpio-reset = <&gpio 21 GPIO_ACTIVE_HIGH>;
+ reset-gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
};
&stp {
diff --git a/target/linux/lantiq/patches-6.1/0002-MIPS-pci-lantiq-restore-reset-gpio-polarity.patch b/target/linux/lantiq/patches-6.1/0002-MIPS-pci-lantiq-restore-reset-gpio-polarity.patch
deleted file mode 100644
index 6b70f8b9a7..0000000000
--- a/target/linux/lantiq/patches-6.1/0002-MIPS-pci-lantiq-restore-reset-gpio-polarity.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From f038380835033e376d89c72516f087254792bbad Mon Sep 17 00:00:00 2001
-From: Martin Schiller <ms at dev.tdt.de>
-Date: Mon, 6 May 2024 09:41:42 +0200
-Subject: [PATCH] MIPS: pci: lantiq: restore reset gpio polarity
-
-Commit 90c2d2eb7ab5 ("MIPS: pci: lantiq: switch to using gpiod API") not
-only switched to the gpiod API, but also inverted / changed the polarity
-of the GPIO.
-
-According to the PCI specification, the RST# pin is an active-low
-signal. However, most of the device trees that have been widely used for
-a long time (mainly in the openWrt project) define this GPIO as
-active-high and the old driver code inverted the signal internally.
-
-Apparently there are actually boards where the reset gpio must be
-operated inverted. For this reason, we cannot use the GPIOD_OUT_LOW/HIGH
-flag for initialization. Instead, we must explicitly set the gpio to
-value 1 in order to take into account any "GPIO_ACTIVE_LOW" flag that
-may have been set.
-
-In order to remain compatible with all these existing device trees, we
-should therefore keep the logic as it was before the commit.
-
-Fixes: 90c2d2eb7ab5 ("MIPS: pci: lantiq: switch to using gpiod API")
-Cc: stable at vger.kernel.org
-Signed-off-by: Martin Schiller <ms at dev.tdt.de>
----
- arch/mips/pci/pci-lantiq.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/arch/mips/pci/pci-lantiq.c
-+++ b/arch/mips/pci/pci-lantiq.c
-@@ -124,14 +124,14 @@ static int ltq_pci_startup(struct platfo
- clk_disable(clk_external);
-
- /* setup reset gpio used by pci */
-- reset_gpio = devm_gpiod_get_optional(&pdev->dev, "reset",
-- GPIOD_OUT_LOW);
-+ reset_gpio = devm_gpiod_get_optional(&pdev->dev, "reset", GPIOD_ASIS);
- error = PTR_ERR_OR_ZERO(reset_gpio);
- if (error) {
- dev_err(&pdev->dev, "failed to request gpio: %d\n", error);
- return error;
- }
- gpiod_set_consumer_name(reset_gpio, "pci_reset");
-+ gpiod_direction_output(reset_gpio, 1);
-
- /* enable auto-switching between PCI and EBU */
- ltq_pci_w32(0xa, PCI_CR_CLK_CTRL);
-@@ -194,10 +194,10 @@ static int ltq_pci_startup(struct platfo
-
- /* toggle reset pin */
- if (reset_gpio) {
-- gpiod_set_value_cansleep(reset_gpio, 1);
-+ gpiod_set_value_cansleep(reset_gpio, 0);
- wmb();
- mdelay(1);
-- gpiod_set_value_cansleep(reset_gpio, 0);
-+ gpiod_set_value_cansleep(reset_gpio, 1);
- }
- return 0;
- }
diff --git a/target/linux/lantiq/patches-6.6/0002-MIPS-pci-lantiq-restore-reset-gpio-polarity.patch b/target/linux/lantiq/patches-6.6/0002-MIPS-pci-lantiq-restore-reset-gpio-polarity.patch
deleted file mode 100644
index 6b70f8b9a7..0000000000
--- a/target/linux/lantiq/patches-6.6/0002-MIPS-pci-lantiq-restore-reset-gpio-polarity.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From f038380835033e376d89c72516f087254792bbad Mon Sep 17 00:00:00 2001
-From: Martin Schiller <ms at dev.tdt.de>
-Date: Mon, 6 May 2024 09:41:42 +0200
-Subject: [PATCH] MIPS: pci: lantiq: restore reset gpio polarity
-
-Commit 90c2d2eb7ab5 ("MIPS: pci: lantiq: switch to using gpiod API") not
-only switched to the gpiod API, but also inverted / changed the polarity
-of the GPIO.
-
-According to the PCI specification, the RST# pin is an active-low
-signal. However, most of the device trees that have been widely used for
-a long time (mainly in the openWrt project) define this GPIO as
-active-high and the old driver code inverted the signal internally.
-
-Apparently there are actually boards where the reset gpio must be
-operated inverted. For this reason, we cannot use the GPIOD_OUT_LOW/HIGH
-flag for initialization. Instead, we must explicitly set the gpio to
-value 1 in order to take into account any "GPIO_ACTIVE_LOW" flag that
-may have been set.
-
-In order to remain compatible with all these existing device trees, we
-should therefore keep the logic as it was before the commit.
-
-Fixes: 90c2d2eb7ab5 ("MIPS: pci: lantiq: switch to using gpiod API")
-Cc: stable at vger.kernel.org
-Signed-off-by: Martin Schiller <ms at dev.tdt.de>
----
- arch/mips/pci/pci-lantiq.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/arch/mips/pci/pci-lantiq.c
-+++ b/arch/mips/pci/pci-lantiq.c
-@@ -124,14 +124,14 @@ static int ltq_pci_startup(struct platfo
- clk_disable(clk_external);
-
- /* setup reset gpio used by pci */
-- reset_gpio = devm_gpiod_get_optional(&pdev->dev, "reset",
-- GPIOD_OUT_LOW);
-+ reset_gpio = devm_gpiod_get_optional(&pdev->dev, "reset", GPIOD_ASIS);
- error = PTR_ERR_OR_ZERO(reset_gpio);
- if (error) {
- dev_err(&pdev->dev, "failed to request gpio: %d\n", error);
- return error;
- }
- gpiod_set_consumer_name(reset_gpio, "pci_reset");
-+ gpiod_direction_output(reset_gpio, 1);
-
- /* enable auto-switching between PCI and EBU */
- ltq_pci_w32(0xa, PCI_CR_CLK_CTRL);
-@@ -194,10 +194,10 @@ static int ltq_pci_startup(struct platfo
-
- /* toggle reset pin */
- if (reset_gpio) {
-- gpiod_set_value_cansleep(reset_gpio, 1);
-+ gpiod_set_value_cansleep(reset_gpio, 0);
- wmb();
- mdelay(1);
-- gpiod_set_value_cansleep(reset_gpio, 0);
-+ gpiod_set_value_cansleep(reset_gpio, 1);
- }
- return 0;
- }
More information about the lede-commits
mailing list