airoha: an7581: drop airoha,x2-mode related property and enable in device

Drop airoha,x2-mode related property from the DTSI and enable them only in
the relevant devices that use a PCIe0 line. x2-mode should be enabled only
for the WiFi card that would use it as it might cause problem for WiFi card
that expect 2 single PCIe x1 line instead of a single PCIe x2 line.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

diff --git a/target/linux/airoha/dts/an7581-nokia-valyrian.dts b/target/linux/airoha/dts/an7581-nokia-valyrian.dts
index ae24d075e774f5fc4858fd43ad5b00bf04ac458c..7e5facbcdac10fb9e1f65c929eff77f7245382a3 100644 (file)
--- a/target/linux/airoha/dts/an7581-nokia-valyrian.dts
+++ b/target/linux/airoha/dts/an7581-nokia-valyrian.dts
@@ -356,6 +356,7 @@
 };
 
 &pcie0 {
+       airoha,x2-mode;
        pinctrl-names = "default";
        pinctrl-0 = <&pcie1_rst_pins>;
        status = "okay";

diff --git a/target/linux/airoha/dts/an7581-w1700k-ubi.dts b/target/linux/airoha/dts/an7581-w1700k-ubi.dts
index 10a2c7d11560936f47d39d8eacf4c1e838f3908c..bbcc1d11358c41846a7e9b564df45880c8f7b4cd 100644 (file)
--- a/target/linux/airoha/dts/an7581-w1700k-ubi.dts
+++ b/target/linux/airoha/dts/an7581-w1700k-ubi.dts
@@ -252,6 +252,8 @@
 &pcie0 {
        status = "okay";
 
+       airoha,x2-mode;
+
        pinctrl-names = "default";
        pinctrl-0 = <&pcie0_rst_pins>;
        pcie@0,0 {

diff --git a/target/linux/airoha/dts/an7581.dtsi b/target/linux/airoha/dts/an7581.dtsi
index 0cb4d32701ed66218b114dba98184f66a6d8ff9c..056e593f39aad55bcde416f55de9d1147acbc75f 100644 (file)
--- a/target/linux/airoha/dts/an7581.dtsi
+++ b/target/linux/airoha/dts/an7581.dtsi
@@ -728,10 +728,7 @@
 
                        mediatek,pbus-csr = <&pbus_csr 0x0 0x4>;
 
-                       airoha,chip-scu = <&chip_scu>;
                        airoha,np-scu = <&scuclk>;
-                       airoha,x2-mode;
-                       airoha,serdes-lanes-mask = <0x3>;
 
                        interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;
                        bus-range = <0x00 0xff>;
@@ -819,8 +816,6 @@
 
                        mediatek,pbus-csr = <&pbus_csr 0x10 0x14>;
 
-                       airoha,chip-scu = <&chip_scu>;
-                       airoha,serdes-lanes-mask = <0x4>;
                        airoha,np-scu = <&scuclk>;
 
                        interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;