mediatek: dts: convert pinctrl bias to the Linux generic style

There are two types properties here that can control the pin bias
resistors. "mediatek,pull-{up,down}-adv" and "bias-pull-{up,down}"
actually do the same thing[1]. The first type is customized by the
Mediatek and the second type is widely used in the Linux pinctrl
framework. To avoid confusing developers, unify pinctrl bias to the
new Linux generic style.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=cafe19db7751269bf6b4dd2148cbfa9fbe91d651
Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/19741
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/mediatek/dts/mt7981a-glinet-gl-x3000-xe3000-common.dtsi b/target/linux/mediatek/dts/mt7981a-glinet-gl-x3000-xe3000-common.dtsi
index 11dd1a9edc880e0604fc902370193cc986dc1740..fc39d10780f0996ed022e024a27acedeffbbaccf 100644 (file)
--- a/target/linux/mediatek/dts/mt7981a-glinet-gl-x3000-xe3000-common.dtsi
+++ b/target/linux/mediatek/dts/mt7981a-glinet-gl-x3000-xe3000-common.dtsi
@@ -2,6 +2,8 @@
 
 /dts-v1/;
 
+#include <dt-bindings/pinctrl/mt65xx.h>
+
 #include "mt7981b.dtsi"
 
 / {
@@ -223,12 +225,12 @@
                                "SPI1_CLK", "SPI1_MOSI", "SPI1_MISO";
                        input-enable;
                        drive-strength = <MTK_DRIVE_12mA>;
-                       mediatek,pull-up-adv = <1>;
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
                conf-clk {
                        pins = "SPI1_CS";
                        drive-strength = <MTK_DRIVE_12mA>;
-                       mediatek,pull-down-adv = <2>;
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                };
        };
        mmc0_pins_uhs: mmc0-pins-uhs {
@@ -242,12 +244,12 @@
                                "SPI1_CLK", "SPI1_MOSI", "SPI1_MISO";
                        input-enable;
                        drive-strength = <MTK_DRIVE_12mA>;
-                       mediatek,pull-up-adv = <1>;
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
                conf-clk {
                        pins = "SPI1_CS";
                        drive-strength = <MTK_DRIVE_12mA>;
-                       mediatek,pull-down-adv = <2>;
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                };
        };
        pcie_pins: pcie-pins {

diff --git a/target/linux/mediatek/dts/mt7981b-abt-asr3000.dts b/target/linux/mediatek/dts/mt7981b-abt-asr3000.dts
index 651d6461c704b390f4084e9992de90fe145127fa..bdc6dece8d0be89a930a7668adad5a6d5918e272 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-abt-asr3000.dts
+++ b/target/linux/mediatek/dts/mt7981b-abt-asr3000.dts
@@ -4,6 +4,8 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/leds/common.h>
+#include <dt-bindings/pinctrl/mt65xx.h>
+
 #include "mt7981b.dtsi"
 
 / {
@@ -130,13 +132,13 @@
                conf-pu {
                        pins = "SPI0_CS", "SPI0_HOLD", "SPI0_WP";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
 
                conf-pd {
                        pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
        };
 };

diff --git a/target/linux/mediatek/dts/mt7981b-cmcc-a10.dtsi b/target/linux/mediatek/dts/mt7981b-cmcc-a10.dtsi
index 2029537518a708aec179af6d13a54e2885ffc964..ac08786a24583dc34abcb39ebd04649922eba75e 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-cmcc-a10.dtsi
+++ b/target/linux/mediatek/dts/mt7981b-cmcc-a10.dtsi
@@ -7,6 +7,8 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/leds/common.h>
+#include <dt-bindings/pinctrl/mt65xx.h>
+
 #include "mt7981b.dtsi"
 
 / {
@@ -107,13 +109,13 @@
                conf-pu {
                        pins = "SPI0_CS", "SPI0_HOLD", "SPI0_WP";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
 
                conf-pd {
                        pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
        };
 };

diff --git a/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-nand.dtso b/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-nand.dtso
index de9ab0e6ff9fdf59c72e7dcf0ea7e47388e0cd20..4b441283a3110cf137ab74db3f5ca94f8c764a1a 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-nand.dtso
+++ b/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-nand.dtso
@@ -3,6 +3,8 @@
 /dts-v1/;
 /plugin/;
 
+#include <dt-bindings/pinctrl/mt65xx.h>
+
 / {
        compatible = "cmcc,rax3000m", "mediatek,mt7981";
 
@@ -41,13 +43,13 @@
                                conf-pu {
                                        pins = "SPI0_CS", "SPI0_HOLD", "SPI0_WP";
                                        drive-strength = <8>;
-                                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                                       bias-disable; /* bias-disable */
                                };
 
                                conf-pd {
                                        pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO";
                                        drive-strength = <8>;
-                                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                                       bias-disable; /* bias-disable */
                                };
                        };
                };

diff --git a/target/linux/mediatek/dts/mt7981b-cudy-re3000-v1.dts b/target/linux/mediatek/dts/mt7981b-cudy-re3000-v1.dts
index e1df65380029bdf217799262d0bea1c1ec449832..7b05f4b94ce80a5a8f7cb5e0502d6f8653730dd8 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-cudy-re3000-v1.dts
+++ b/target/linux/mediatek/dts/mt7981b-cudy-re3000-v1.dts
@@ -5,6 +5,7 @@
 #include <dt-bindings/leds/common.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/pinctrl/mt65xx.h>
 
 #include "mt7981b.dtsi"
 
@@ -203,13 +204,13 @@
                conf-pu {
                        pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP";
                        drive-strength = <8>;
-                       bias-pull-up = <103>;
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_11>;
                };
 
                conf-pd {
                        pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
                        drive-strength = <8>;
-                       bias-pull-down = <103>;
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_11>;
                };
        };
 };

diff --git a/target/linux/mediatek/dts/mt7981b-cudy-wr3000-v1.dts b/target/linux/mediatek/dts/mt7981b-cudy-wr3000-v1.dts
index b3864d099dc24c89cb650063bbc7dd3a357c4882..055dec01e5231123e3b4e345c14d25ceb85c3601 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-cudy-wr3000-v1.dts
+++ b/target/linux/mediatek/dts/mt7981b-cudy-wr3000-v1.dts
@@ -3,6 +3,7 @@
 /dts-v1/;
 
 #include <dt-bindings/leds/common.h>
+#include <dt-bindings/pinctrl/mt65xx.h>
 
 #include "mt7981b.dtsi"
 
@@ -218,13 +219,13 @@
                conf-pu {
                        pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP";
                        drive-strength = <8>;
-                       bias-pull-up = <103>;
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_11>;
                };
 
                conf-pd {
                        pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
                        drive-strength = <8>;
-                       bias-pull-down = <103>;
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_11>;
                };
        };
 };

diff --git a/target/linux/mediatek/dts/mt7981b-glinet-gl-mt2500.dtsi b/target/linux/mediatek/dts/mt7981b-glinet-gl-mt2500.dtsi
index 82cb938058a661427c85f7702c813296cb434c4a..73d254ff10fb75e81f950899edf158e73acbe93b 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-glinet-gl-mt2500.dtsi
+++ b/target/linux/mediatek/dts/mt7981b-glinet-gl-mt2500.dtsi
@@ -2,6 +2,7 @@
 
 /dts-v1/;
 #include "mt7981b.dtsi"
+#include <dt-bindings/pinctrl/mt65xx.h>
 
 / {
        model = "GL.iNet GL-MT2500";
@@ -84,12 +85,12 @@
                                "SPI1_CLK", "SPI1_MOSI", "SPI1_MISO";
                        input-enable;
                        drive-strength = <MTK_DRIVE_12mA>;
-                       mediatek,pull-up-adv = <1>;
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
                conf-clk {
                        pins = "SPI1_CS";
                        drive-strength = <MTK_DRIVE_12mA>;
-                       mediatek,pull-down-adv = <2>;
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                };
        };
        mmc0_pins_uhs: mmc0-pins-uhs {
@@ -103,12 +104,12 @@
                                "SPI1_CLK", "SPI1_MOSI", "SPI1_MISO";
                        input-enable;
                        drive-strength = <MTK_DRIVE_12mA>;
-                       mediatek,pull-up-adv = <1>;
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
                conf-clk {
                        pins = "SPI1_CS";
                        drive-strength = <MTK_DRIVE_12mA>;
-                       mediatek,pull-down-adv = <2>;
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                };
        };
 };

diff --git a/target/linux/mediatek/dts/mt7981b-h3c-magic-nx30-pro.dts b/target/linux/mediatek/dts/mt7981b-h3c-magic-nx30-pro.dts
index 2f141b8c7a7a457968ac7734a9192291cb9d1d5b..0b235d6afdb549327f8b70a81ed114054eb0a132 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-h3c-magic-nx30-pro.dts
+++ b/target/linux/mediatek/dts/mt7981b-h3c-magic-nx30-pro.dts
@@ -4,6 +4,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/leds/common.h>
+#include <dt-bindings/pinctrl/mt65xx.h>
 
 #include "mt7981b.dtsi"
 
@@ -226,13 +227,13 @@
                conf-pu {
                        pins = "SPI0_CS", "SPI0_HOLD", "SPI0_WP";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
 
                conf-pd {
                        pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
        };
 };

diff --git a/target/linux/mediatek/dts/mt7981b-jcg-q30-pro.dts b/target/linux/mediatek/dts/mt7981b-jcg-q30-pro.dts
index 0045c452a7f4a34ef18d0254765ce14dfa0ccf5c..9b1ef96c152e93513820a49bc72d6e6342d5efb4 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-jcg-q30-pro.dts
+++ b/target/linux/mediatek/dts/mt7981b-jcg-q30-pro.dts
@@ -4,6 +4,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/leds/common.h>
+#include <dt-bindings/pinctrl/mt65xx.h>
 
 #include "mt7981b.dtsi"
 
@@ -212,13 +213,13 @@
                conf-pu {
                        pins = "SPI0_CS", "SPI0_HOLD", "SPI0_WP";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
 
                conf-pd {
                        pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
        };
 };

diff --git a/target/linux/mediatek/dts/mt7981b-nokia-ea0326gmp.dts b/target/linux/mediatek/dts/mt7981b-nokia-ea0326gmp.dts
index 707ec2b4ee96a6bf3bea3dcfbc46057c307d008e..9918a326704bbd9e0fdec29e4343ddba5fddacfb 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-nokia-ea0326gmp.dts
+++ b/target/linux/mediatek/dts/mt7981b-nokia-ea0326gmp.dts
@@ -4,6 +4,8 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/leds/common.h>
+#include <dt-bindings/pinctrl/mt65xx.h>
+
 #include "mt7981b.dtsi"
 
 / {
@@ -139,13 +141,13 @@
                conf-pu {
                        pins = "SPI0_CS", "SPI0_HOLD", "SPI0_WP";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
 
                conf-pd {
                        pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
        };
 };

diff --git a/target/linux/mediatek/dts/mt7981b-openembed-som7981.dts b/target/linux/mediatek/dts/mt7981b-openembed-som7981.dts
index 4c3f80ed5e1cce0a55615123d2cf4785aa7d0e05..7b0abd472a69361be1511ab511f2e8dbd2ace037 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-openembed-som7981.dts
+++ b/target/linux/mediatek/dts/mt7981b-openembed-som7981.dts
@@ -5,6 +5,8 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/leds/common.h>
+#include <dt-bindings/pinctrl/mt65xx.h>
+
 #include "mt7981b.dtsi"
 
 / {
@@ -223,13 +225,13 @@
                conf-pu {
                        pins = "SPI0_CS", "SPI0_HOLD", "SPI0_WP";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>;
+                       bias-disable;
                };
 
                conf-pd {
                        pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO";
                        drive-strength = <8>;
-                       mediatek,pull-down-adv = <0>;
+                       bias-disable;
                };
        };
 
@@ -250,7 +252,7 @@
        wwan_rst_h: wwan-rst-h {
                pins = "GPIO_WPS";
                drive-strength = <8>;
-               mediatek,pull-down-adv = <0>;
+               bias-disable;
                output-low;
        };
 };

diff --git a/target/linux/mediatek/dts/mt7981b-qihoo-360t7.dts b/target/linux/mediatek/dts/mt7981b-qihoo-360t7.dts
index 67ea2ff4c5a6f7394c3701543d78cafc6a048ed3..e614ebac945e1806d7b7a581c80fe63822918d0a 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-qihoo-360t7.dts
+++ b/target/linux/mediatek/dts/mt7981b-qihoo-360t7.dts
@@ -4,6 +4,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/leds/common.h>
+#include <dt-bindings/pinctrl/mt65xx.h>
 
 #include "mt7981b.dtsi"
 
@@ -216,13 +217,13 @@
                conf-pu {
                        pins = "SPI0_CS", "SPI0_HOLD", "SPI0_WP";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
 
                conf-pd {
                        pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
        };
 };

diff --git a/target/linux/mediatek/dts/mt7981b-tplink-fr365v1.dts b/target/linux/mediatek/dts/mt7981b-tplink-fr365v1.dts
index 5815f84912f33e3815068ccebe12ff8edcfb5d1d..78c5927a85bed4a5a2bcdb5aee9b4554aec020c5 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-tplink-fr365v1.dts
+++ b/target/linux/mediatek/dts/mt7981b-tplink-fr365v1.dts
@@ -4,6 +4,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/leds/common.h>
+#include <dt-bindings/pinctrl/mt65xx.h>
 
 #include "mt7981b.dtsi"
 
@@ -366,13 +367,13 @@
                conf-pu {
                        pins = "SPI0_CS", "SPI0_HOLD", "SPI0_WP";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
 
                conf-pd {
                        pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
        };
 };

diff --git a/target/linux/mediatek/dts/mt7981b-unielec-u7981-01-nand.dts b/target/linux/mediatek/dts/mt7981b-unielec-u7981-01-nand.dts
index 649787ae64b1ace48fdd65a248fbdc76b51baa1a..3254ca3145929136488f189016f0b726629a0e93 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-unielec-u7981-01-nand.dts
+++ b/target/linux/mediatek/dts/mt7981b-unielec-u7981-01-nand.dts
@@ -4,6 +4,9 @@
  */
 
 /dts-v1/;
+
+#include <dt-bindings/pinctrl/mt65xx.h>
+
 #include "mt7981b-unielec-u7981-01.dtsi"
 / {
        model = "Unielec U7981-01 (NAND)";
@@ -87,13 +90,13 @@
                conf-pu {
                        pins = "SPI0_CS", "SPI0_HOLD", "SPI0_WP";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
 
                conf-pd {
                        pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
        };
 };

diff --git a/target/linux/mediatek/dts/mt7981b-wavlink-wl-3port-128nand-common.dtsi b/target/linux/mediatek/dts/mt7981b-wavlink-wl-3port-128nand-common.dtsi
index f796a008109788ae7bd8146fa20d89bdba3d923e..7317ac5af89c62b674f12a7592ff2b1cb0cf5f30 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-wavlink-wl-3port-128nand-common.dtsi
+++ b/target/linux/mediatek/dts/mt7981b-wavlink-wl-3port-128nand-common.dtsi
@@ -2,6 +2,8 @@
 
 /dts-v1/;
 
+#include <dt-bindings/pinctrl/mt65xx.h>
+
 #include "mt7981b.dtsi"
 
 / {
@@ -38,13 +40,13 @@
                conf-pu {
                        pins = "SPI0_CS", "SPI0_HOLD", "SPI0_WP";
                        drive-strength = <8>;
-                       bias-pull-up = <103>;
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_11>;
                };
 
                conf-pd {
                        pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO";
                        drive-strength = <8>;
-                       bias-pull-down = <103>;
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_11>;
                };
        };
 };

diff --git a/target/linux/mediatek/dts/mt7981b-wavlink-wl-wn573hx3.dts b/target/linux/mediatek/dts/mt7981b-wavlink-wl-wn573hx3.dts
index e5118bc3d14399305a2ca3bbd64c6d61301c11f4..233743ce799548c639cd3ba661a0b1ffb636655a 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-wavlink-wl-wn573hx3.dts
+++ b/target/linux/mediatek/dts/mt7981b-wavlink-wl-wn573hx3.dts
@@ -2,6 +2,8 @@
 
 /dts-v1/;
 
+#include <dt-bindings/pinctrl/mt65xx.h>
+
 #include "mt7981b.dtsi"
 
 / {
@@ -169,13 +171,13 @@
                conf-pu {
                        pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP";
                        drive-strength = <8>;
-                       bias-pull-up = <103>;
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_11>;
                };
 
                conf-pd {
                        pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
                        drive-strength = <8>;
-                       bias-pull-down = <103>;
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_11>;
                };
        };
 };

diff --git a/target/linux/mediatek/dts/mt7981b-wavlink-wl-wn586x3.dts b/target/linux/mediatek/dts/mt7981b-wavlink-wl-wn586x3.dts
index 9190134e35d587d8cd2c094c5fb38f6ad2c98d68..4062d4aaa8969680e501dae160467dc229788ab0 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-wavlink-wl-wn586x3.dts
+++ b/target/linux/mediatek/dts/mt7981b-wavlink-wl-wn586x3.dts
@@ -2,6 +2,8 @@
 
 /dts-v1/;
 
+#include <dt-bindings/pinctrl/mt65xx.h>
+
 #include "mt7981b.dtsi"
 
 / {
@@ -222,13 +224,13 @@
                conf-pu {
                        pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP";
                        drive-strength = <8>;
-                       bias-pull-up = <103>;
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_11>;
                };
 
                conf-pd {
                        pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
                        drive-strength = <8>;
-                       bias-pull-down = <103>;
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_11>;
                };
        };
 };

diff --git a/target/linux/mediatek/dts/mt7981b-yuncore-ax835.dts b/target/linux/mediatek/dts/mt7981b-yuncore-ax835.dts
index eada07b7aba1186851e1de8e879c7a77be8ae8c3..70a9d10781f3f2de38aff34205b154eb753b8ec8 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-yuncore-ax835.dts
+++ b/target/linux/mediatek/dts/mt7981b-yuncore-ax835.dts
@@ -2,6 +2,8 @@
 
 /dts-v1/;
 
+#include <dt-bindings/pinctrl/mt65xx.h>
+
 #include "mt7981b.dtsi"
 
 / {
@@ -120,13 +122,13 @@
                conf-pu {
                        pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP";
                        drive-strength = <8>;
-                       bias-pull-up = <103>;
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_11>;
                };
 
                conf-pd {
                        pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
                        drive-strength = <8>;
-                       bias-pull-down = <103>;
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_11>;
                };
        };
 };

diff --git a/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8102ax-v2.dts b/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8102ax-v2.dts
index 6557b0ff4a4cc592d880135d76b4e4824495122b..ad27b0fd03fdc1d55b2dbc19788b1d3375436aa6 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8102ax-v2.dts
+++ b/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8102ax-v2.dts
@@ -3,6 +3,7 @@
 /dts-v1/;
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/pinctrl/mt65xx.h>
 
 #include "mt7981b.dtsi"
 
@@ -287,13 +288,13 @@
                conf-pu {
                        pins = "SPI0_CS", "SPI0_HOLD", "SPI0_WP";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
 
                conf-pd {
                        pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
        };
 };

diff --git a/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8102ax.dts b/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8102ax.dts
index 80dd203560592a50c55ac41a6c90bad663c0d52a..2951f9bac72d98074b2afb5e9d1e841fb5c7e379 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8102ax.dts
+++ b/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8102ax.dts
@@ -2,6 +2,8 @@
 
 /dts-v1/;
 
+#include <dt-bindings/pinctrl/mt65xx.h>
+
 #include "mt7981b.dtsi"
 
 / {
@@ -291,13 +293,13 @@
                conf-pu {
                        pins = "SPI0_CS", "SPI0_HOLD", "SPI0_WP";
                        drive-strength = <8>;
-                       bias-pull-up = <103>;
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_11>;
                };
 
                conf-pd {
                        pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO";
                        drive-strength = <8>;
-                       bias-pull-down = <103>;
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_11>;
                };
        };
 };

diff --git a/target/linux/mediatek/dts/mt7986a-acelink-ew-7886cax.dts b/target/linux/mediatek/dts/mt7986a-acelink-ew-7886cax.dts
index 4add0fd51f53bb7dbf0a737dd78a4a0ffff0ace1..81190e0cccd66999dd8afd15e2256d0f79a666d4 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-acelink-ew-7886cax.dts
+++ b/target/linux/mediatek/dts/mt7986a-acelink-ew-7886cax.dts
@@ -4,6 +4,7 @@
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/leds/common.h>
+#include <dt-bindings/pinctrl/mt65xx.h>
 
 #include "mt7986a.dtsi"
 
@@ -105,12 +106,12 @@
                conf-pu {
                        pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
                conf-pd {
                        pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
                        drive-strength = <8>;
-                       mediatek,pull-down-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
        };
 

diff --git a/target/linux/mediatek/dts/mt7986a-acer-predator-w6x.dts b/target/linux/mediatek/dts/mt7986a-acer-predator-w6x.dts
index c80f80e1cf7187db9b01f6de1140c661dff3a8ba..3152901f0c97d7b2c6ab2102e9036ca274094dfc 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-acer-predator-w6x.dts
+++ b/target/linux/mediatek/dts/mt7986a-acer-predator-w6x.dts
@@ -4,6 +4,7 @@
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/leds/common.h>
+#include <dt-bindings/pinctrl/mt65xx.h>
 
 #include "mt7986a.dtsi"
 
@@ -160,12 +161,12 @@
                conf-pu {
                        pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
                conf-pd {
                        pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
                        drive-strength = <8>;
-                       mediatek,pull-down-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
        };
 

diff --git a/target/linux/mediatek/dts/mt7986a-acer-w6-common.dtsi b/target/linux/mediatek/dts/mt7986a-acer-w6-common.dtsi
index f0df58847328834c0c20f9fac628787cf36e557c..fceed350938d86d6e1d73778d39ce6daf5bfaab9 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-acer-w6-common.dtsi
+++ b/target/linux/mediatek/dts/mt7986a-acer-w6-common.dtsi
@@ -3,6 +3,7 @@
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/leds/common.h>
+#include <dt-bindings/pinctrl/mt65xx.h>
 
 #include "mt7986a.dtsi"
 
@@ -78,24 +79,24 @@
                               "EMMC_DATA_6", "EMMC_DATA_7", "EMMC_CMD";
                        input-enable;
                        drive-strength = <4>;
-                       mediatek,pull-up-adv = <1>;     /* pull-up 10K */
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;  /* pull-up 10K */
                };
 
                conf-clk {
                        pins = "EMMC_CK";
                        drive-strength = <6>;
-                       mediatek,pull-down-adv = <2>;   /* pull-down 50K */
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_10>;        /* pull-down 50K */
                };
 
                conf-ds {
                        pins = "EMMC_DSL";
-                       mediatek,pull-down-adv = <2>;   /* pull-down 50K */
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_10>;        /* pull-down 50K */
                };
 
                conf-rst {
                        pins = "EMMC_RSTB";
                        drive-strength = <4>;
-                       mediatek,pull-up-adv = <1>;     /* pull-up 10K */
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;  /* pull-up 10K */
                };
        };
 
@@ -111,24 +112,24 @@
                               "EMMC_DATA_6", "EMMC_DATA_7", "EMMC_CMD";
                        input-enable;
                        drive-strength = <4>;
-                       mediatek,pull-up-adv = <1>;     /* pull-up 10K */
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;  /* pull-up 10K */
                };
 
                conf-clk {
                        pins = "EMMC_CK";
                        drive-strength = <6>;
-                       mediatek,pull-down-adv = <2>;   /* pull-down 50K */
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_10>;        /* pull-down 50K */
                };
 
                conf-ds {
                        pins = "EMMC_DSL";
-                       mediatek,pull-down-adv = <2>;   /* pull-down 50K */
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_10>;        /* pull-down 50K */
                };
 
                conf-rst {
                        pins = "EMMC_RSTB";
                        drive-strength = <4>;
-                       mediatek,pull-up-adv = <1>;     /* pull-up 10K */
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;  /* pull-up 10K */
                };
        };
 

diff --git a/target/linux/mediatek/dts/mt7986a-asus-rt-ax59u.dts b/target/linux/mediatek/dts/mt7986a-asus-rt-ax59u.dts
index d213c7679375cc04ce585d2524844131e915ab1a..9061480cb103b41aeca73691f1d307023c26bbf2 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-asus-rt-ax59u.dts
+++ b/target/linux/mediatek/dts/mt7986a-asus-rt-ax59u.dts
@@ -4,6 +4,7 @@
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/leds/common.h>
+#include <dt-bindings/pinctrl/mt65xx.h>
 
 #include "mt7986a.dtsi"
 
@@ -161,12 +162,12 @@
                conf-pu {
                        pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
                conf-pd {
                        pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
                        drive-strength = <8>;
-                       mediatek,pull-down-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
        };
 

diff --git a/target/linux/mediatek/dts/mt7986a-asus-tuf-ax4200.dts b/target/linux/mediatek/dts/mt7986a-asus-tuf-ax4200.dts
index 712584a3af73ea1ab37ad77d9df6840d7c89e105..37f9e974ac4d361909debb021de5d32186da9308 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-asus-tuf-ax4200.dts
+++ b/target/linux/mediatek/dts/mt7986a-asus-tuf-ax4200.dts
@@ -4,6 +4,7 @@
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/leds/common.h>
+#include <dt-bindings/pinctrl/mt65xx.h>
 
 #include "mt7986a.dtsi"
 
@@ -168,12 +169,12 @@
                conf-pu {
                        pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
                conf-pd {
                        pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
                        drive-strength = <8>;
-                       mediatek,pull-down-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
        };
 

diff --git a/target/linux/mediatek/dts/mt7986a-asus-tuf-ax6000.dts b/target/linux/mediatek/dts/mt7986a-asus-tuf-ax6000.dts
index e0faaaa11b50a62821452c80af30bfff45e8807c..c5d753325deb1c2b887c57ccf3cf293f965813f3 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-asus-tuf-ax6000.dts
+++ b/target/linux/mediatek/dts/mt7986a-asus-tuf-ax6000.dts
@@ -4,6 +4,7 @@
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/leds/common.h>
+#include <dt-bindings/pinctrl/mt65xx.h>
 
 #include "mt7986a.dtsi"
 
@@ -195,12 +196,12 @@
                conf-pu {
                        pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
                conf-pd {
                        pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
                        drive-strength = <8>;
-                       mediatek,pull-down-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
        };
 

diff --git a/target/linux/mediatek/dts/mt7986a-bananapi-bpi-r3-mini.dts b/target/linux/mediatek/dts/mt7986a-bananapi-bpi-r3-mini.dts
index 6808db80feb6a3a94ebecb1072ddf4a488fff4a8..d4b67f5cfc6b602f734936adb1db6282d052527f 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-bananapi-bpi-r3-mini.dts
+++ b/target/linux/mediatek/dts/mt7986a-bananapi-bpi-r3-mini.dts
@@ -7,6 +7,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/leds/common.h>
+#include <dt-bindings/pinctrl/mt65xx.h>
 
 #include "mt7986a.dtsi"
 
@@ -301,14 +302,14 @@
        en8811_pwr_a: en8811-pwr-a {
                pins = "GPIO_11";
                drive-strength = <8>;
-               mediatek,pull-down-adv = <1>;
+               bias-pull-down = <MTK_PUPD_SET_R1R0_01>;
                output-low;
        };
 
        en8811_pwr_b: en8811-pwr-b {
                pins = "GPIO_12";
                drive-strength = <8>;
-               mediatek,pull-down-adv = <1>;
+               bias-pull-down = <MTK_PUPD_SET_R1R0_01>;
                output-low;
        };
 
@@ -337,21 +338,21 @@
                               "EMMC_DATA_6", "EMMC_DATA_7", "EMMC_CMD";
                        input-enable;
                        drive-strength = <4>;
-                       mediatek,pull-up-adv = <1>;
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
                conf-clk {
                        pins = "EMMC_CK";
                        drive-strength = <6>;
-                       mediatek,pull-down-adv = <2>;
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                };
                conf-ds {
                        pins = "EMMC_DSL";
-                       mediatek,pull-down-adv = <2>;
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                };
                conf-rst {
                        pins = "EMMC_RSTB";
                        drive-strength = <4>;
-                       mediatek,pull-up-adv = <1>;
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
        };
 
@@ -366,21 +367,21 @@
                               "EMMC_DATA_6", "EMMC_DATA_7", "EMMC_CMD";
                        input-enable;
                        drive-strength = <4>;
-                       mediatek,pull-up-adv = <1>;
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
                conf-clk {
                        pins = "EMMC_CK";
                        drive-strength = <6>;
-                       mediatek,pull-down-adv = <2>;
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                };
                conf-ds {
                        pins = "EMMC_DSL";
-                       mediatek,pull-down-adv = <2>;
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                };
                conf-rst {
                        pins = "EMMC_RSTB";
                        drive-strength = <4>;
-                       mediatek,pull-up-adv = <1>;
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
        };
 
@@ -406,12 +407,12 @@
                conf-pu {
                        pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>;
+                       bias-disable;
                };
                conf-pd {
                        pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
                        drive-strength = <8>;
-                       mediatek,pull-down-adv = <0>;
+                       bias-disable;
                };
        };
 
@@ -433,32 +434,32 @@
                ngff-gnss-off {
                        pins = "GPIO_6";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <1>;
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
                ngff-pe-rst {
                        pins = "GPIO_7";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <1>;
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
                ngff-wwan-off {
                        pins = "GPIO_8";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <1>;
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
                ngff-pwr-off {
                        pins = "GPIO_9";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <1>;
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
                ngff-rst {
                        pins = "GPIO_10";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <1>;
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
                ngff-coex {
                        pins = "SPI1_CS";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <1>;
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
        };
 

diff --git a/target/linux/mediatek/dts/mt7986a-dlink-aquila-pro-ai-m60-a1.dts b/target/linux/mediatek/dts/mt7986a-dlink-aquila-pro-ai-m60-a1.dts
index 97a96aadea2b856445cec4fbe027ca3d8d5ed4bf..d0a280b57a9e5f837041c68b0b7e240836ea04a6 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-dlink-aquila-pro-ai-m60-a1.dts
+++ b/target/linux/mediatek/dts/mt7986a-dlink-aquila-pro-ai-m60-a1.dts
@@ -4,6 +4,7 @@
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/leds/common.h>
+#include <dt-bindings/pinctrl/mt65xx.h>
 
 #include "mt7986a.dtsi"
 
@@ -150,12 +151,12 @@
                conf-pu {
                        pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
                conf-pd {
                        pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
                        drive-strength = <8>;
-                       mediatek,pull-down-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
        };
 

diff --git a/target/linux/mediatek/dts/mt7986a-glinet-gl-mt6000.dts b/target/linux/mediatek/dts/mt7986a-glinet-gl-mt6000.dts
index 1c815ae5ca9a82fdda11b56064344f73b2d2e8e6..2bed134a95cb034de49e1b4f3fc5382348a1d846 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-glinet-gl-mt6000.dts
+++ b/target/linux/mediatek/dts/mt7986a-glinet-gl-mt6000.dts
@@ -215,21 +215,21 @@
                               "EMMC_DATA_6", "EMMC_DATA_7", "EMMC_CMD";
                        input-enable;
                        drive-strength = <4>;
-                       mediatek,pull-up-adv = <1>;     /* pull-up 10K */
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;  /* pull-up 10K */
                };
                conf-clk {
                        pins = "EMMC_CK";
                        drive-strength = <6>;
-                       mediatek,pull-down-adv = <2>;   /* pull-down 50K */
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_10>;        /* pull-down 50K */
                };
                conf-ds {
                        pins = "EMMC_DSL";
-                       mediatek,pull-down-adv = <2>;   /* pull-down 50K */
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_10>;        /* pull-down 50K */
                };
                conf-rst {
                        pins = "EMMC_RSTB";
                        drive-strength = <4>;
-                       mediatek,pull-up-adv = <1>;     /* pull-up 10K */
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;  /* pull-up 10K */
                };
        };
 
@@ -244,21 +244,21 @@
                               "EMMC_DATA_6", "EMMC_DATA_7", "EMMC_CMD";
                        input-enable;
                        drive-strength = <4>;
-                       mediatek,pull-up-adv = <1>;     /* pull-up 10K */
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;  /* pull-up 10K */
                };
                conf-clk {
                        pins = "EMMC_CK";
                        drive-strength = <6>;
-                       mediatek,pull-down-adv = <2>;   /* pull-down 50K */
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_10>;        /* pull-down 50K */
                };
                conf-ds {
                        pins = "EMMC_DSL";
-                       mediatek,pull-down-adv = <2>;   /* pull-down 50K */
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_10>;        /* pull-down 50K */
                };
                conf-rst {
                        pins = "EMMC_RSTB";
                        drive-strength = <4>;
-                       mediatek,pull-up-adv = <1>;     /* pull-up 10K */
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;  /* pull-up 10K */
                };
        };
 };

diff --git a/target/linux/mediatek/dts/mt7986a-jdcloud-re-cp-03.dts b/target/linux/mediatek/dts/mt7986a-jdcloud-re-cp-03.dts
index a318ad1ae48acf824e9f7826c834329b4a1f6e1b..9daf03c611087f6bdb0d65431bbfafdbe5049181 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-jdcloud-re-cp-03.dts
+++ b/target/linux/mediatek/dts/mt7986a-jdcloud-re-cp-03.dts
@@ -7,6 +7,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/leds/common.h>
+#include <dt-bindings/pinctrl/mt65xx.h>
 
 #include "mt7986a.dtsi"
 
@@ -223,21 +224,21 @@
                               "EMMC_DATA_6", "EMMC_DATA_7", "EMMC_CMD";
                        input-enable;
                        drive-strength = <4>;
-                       mediatek,pull-up-adv = <1>;
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
                conf-clk {
                        pins = "EMMC_CK";
                        drive-strength = <6>;
-                       mediatek,pull-down-adv = <2>;
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                };
                conf-ds {
                        pins = "EMMC_DSL";
-                       mediatek,pull-down-adv = <2>;
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                };
                conf-rst {
                        pins = "EMMC_RSTB";
                        drive-strength = <4>;
-                       mediatek,pull-up-adv = <1>;
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
        };
 
@@ -252,21 +253,21 @@
                               "EMMC_DATA_6", "EMMC_DATA_7", "EMMC_CMD";
                        input-enable;
                        drive-strength = <4>;
-                       mediatek,pull-up-adv = <1>;
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
                conf-clk {
                        pins = "EMMC_CK";
                        drive-strength = <6>;
-                       mediatek,pull-down-adv = <2>;
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                };
                conf-ds {
                        pins = "EMMC_DSL";
-                       mediatek,pull-down-adv = <2>;
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                };
                conf-rst {
                        pins = "EMMC_RSTB";
                        drive-strength = <4>;
-                       mediatek,pull-up-adv = <1>;
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
        };
 

diff --git a/target/linux/mediatek/dts/mt7986a-netcore-n60-pro.dts b/target/linux/mediatek/dts/mt7986a-netcore-n60-pro.dts
index 786c5eb312ff8346868b800e5ed0f310ef78bb1a..6a8aa0e0d3e08efbe8af17d1fb5fbae84f348c4c 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-netcore-n60-pro.dts
+++ b/target/linux/mediatek/dts/mt7986a-netcore-n60-pro.dts
@@ -4,6 +4,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/leds/common.h>
+#include <dt-bindings/pinctrl/mt65xx.h>
 
 #include "mt7986a.dtsi"
 
@@ -313,12 +314,12 @@
                conf-pu {
                        pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
                conf-pd {
                        pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
                        drive-strength = <8>;
-                       mediatek,pull-down-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
        };
 

diff --git a/target/linux/mediatek/dts/mt7986a-netcore-n60.dts b/target/linux/mediatek/dts/mt7986a-netcore-n60.dts
index 6ab0f497c35492f2043d81d3aafd0c89b8d745c6..0f0b2b3f2fafdec5d0aabceb8c5bb54caa4e33c2 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-netcore-n60.dts
+++ b/target/linux/mediatek/dts/mt7986a-netcore-n60.dts
@@ -4,6 +4,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/leds/common.h>
+#include <dt-bindings/pinctrl/mt65xx.h>
 
 #include "mt7986a.dtsi"
 
@@ -240,12 +241,12 @@
                conf-pu {
                        pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
                conf-pd {
                        pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
                        drive-strength = <8>;
-                       mediatek,pull-down-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
        };
 

diff --git a/target/linux/mediatek/dts/mt7986a-ruijie-rg-x60-pro.dts b/target/linux/mediatek/dts/mt7986a-ruijie-rg-x60-pro.dts
index 3628ad00e116db08fcbcdb1a29c879f2293988e9..d29d9f855a4d07699e989d13ccfd221a8ef2e9d1 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-ruijie-rg-x60-pro.dts
+++ b/target/linux/mediatek/dts/mt7986a-ruijie-rg-x60-pro.dts
@@ -4,6 +4,7 @@
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/leds/common.h>
+#include <dt-bindings/pinctrl/mt65xx.h>
 
 #include "mt7986a.dtsi"
 
@@ -118,12 +119,12 @@
                conf-pu {
                        pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
                conf-pd {
                        pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
                        drive-strength = <8>;
-                       mediatek,pull-down-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
        };
 

diff --git a/target/linux/mediatek/dts/mt7986a-smartrg-bonanza-peak.dtsi b/target/linux/mediatek/dts/mt7986a-smartrg-bonanza-peak.dtsi
index 41468449de3292db431453c24b3a78f43eb4374a..688b8adbd54c0b40635e6b2d4a3081d5fdddf330 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-smartrg-bonanza-peak.dtsi
+++ b/target/linux/mediatek/dts/mt7986a-smartrg-bonanza-peak.dtsi
@@ -8,6 +8,7 @@
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/leds/common.h>
+#include <dt-bindings/pinctrl/mt65xx.h>
 
 #include "mt7986a.dtsi"
 
@@ -409,21 +410,21 @@
                               "EMMC_DATA_6", "EMMC_DATA_7", "EMMC_CMD";
                        input-enable;
                        drive-strength = <4>;
-                       mediatek,pull-up-adv = <1>;     /* pull-up 10K */
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;  /* pull-up 10K */
                };
                conf-clk {
                        pins = "EMMC_CK";
                        drive-strength = <6>;
-                       mediatek,pull-down-adv = <2>;   /* pull-down 50K */
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_10>;        /* pull-down 50K */
                };
                conf-ds {
                        pins = "EMMC_DSL";
-                       mediatek,pull-down-adv = <2>;   /* pull-down 50K */
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_10>;        /* pull-down 50K */
                };
                conf-rst {
                        pins = "EMMC_RSTB";
                        drive-strength = <4>;
-                       mediatek,pull-up-adv = <1>;     /* pull-up 10K */
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;  /* pull-up 10K */
                };
        };
 
@@ -438,21 +439,21 @@
                               "EMMC_DATA_6", "EMMC_DATA_7", "EMMC_CMD";
                        input-enable;
                        drive-strength = <4>;
-                       mediatek,pull-up-adv = <1>;     /* pull-up 10K */
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;  /* pull-up 10K */
                };
                conf-clk {
                        pins = "EMMC_CK";
                        drive-strength = <6>;
-                       mediatek,pull-down-adv = <2>;   /* pull-down 50K */
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_10>;        /* pull-down 50K */
                };
                conf-ds {
                        pins = "EMMC_DSL";
-                       mediatek,pull-down-adv = <2>;   /* pull-down 50K */
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_10>;        /* pull-down 50K */
                };
                conf-rst {
                        pins = "EMMC_RSTB";
                        drive-strength = <4>;
-                       mediatek,pull-up-adv = <1>;     /* pull-up 10K */
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;  /* pull-up 10K */
                };
        };
 
@@ -465,7 +466,7 @@
 
        button_pins: button-pins {
                pins = "GPIO_12";
-               mediatek,pull-down-adv = <0>; /* bias-disable */
+               bias-disable; /* bias-disable */
        };
 
        uart1_pins: uart1-pins {

diff --git a/target/linux/mediatek/dts/mt7986a-tplink-archer-ax80-v1.dts b/target/linux/mediatek/dts/mt7986a-tplink-archer-ax80-v1.dts
index 12f03e1fdadca75d44dbdd0f54ad3ac0aaf76ead..6e023de11f3e5d9ea725f8033d7279051e480a62 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-tplink-archer-ax80-v1.dts
+++ b/target/linux/mediatek/dts/mt7986a-tplink-archer-ax80-v1.dts
@@ -4,6 +4,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/leds/common.h>
+#include <dt-bindings/pinctrl/mt65xx.h>
 
 #include "mt7986a.dtsi"
 
@@ -278,12 +279,12 @@
                conf-pu {
                        pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
                conf-pd {
                        pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
                        drive-strength = <8>;
-                       mediatek,pull-down-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
        };
        wf_2g_5g_pins: wf_2g_5g-pins {

diff --git a/target/linux/mediatek/dts/mt7986a-tplink-tl-xdr-common.dtsi b/target/linux/mediatek/dts/mt7986a-tplink-tl-xdr-common.dtsi
index 0056f6f2246b5fff1720026dc8eb9c39cb269f55..ad625dca73469fb130996170c9339fc4246b4af6 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-tplink-tl-xdr-common.dtsi
+++ b/target/linux/mediatek/dts/mt7986a-tplink-tl-xdr-common.dtsi
@@ -3,6 +3,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/leds/common.h>
+#include <dt-bindings/pinctrl/mt65xx.h>
 
 #include "mt7986a.dtsi"
 
@@ -243,12 +244,12 @@
                conf-pu {
                        pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
                conf-pd {
                        pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
                        drive-strength = <8>;
-                       mediatek,pull-down-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
        };
 };

diff --git a/target/linux/mediatek/dts/mt7986a-tplink-tl-xtr8488.dts b/target/linux/mediatek/dts/mt7986a-tplink-tl-xtr8488.dts
index c2ed7c9a28452fc72699a2ad87eace9dc010dfe9..342a0f98a34da0e281ef38dec3d7085a704dce1f 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-tplink-tl-xtr8488.dts
+++ b/target/linux/mediatek/dts/mt7986a-tplink-tl-xtr8488.dts
@@ -4,6 +4,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/leds/common.h>
+#include <dt-bindings/pinctrl/mt65xx.h>
 
 #include "mt7986a.dtsi"
 
@@ -334,12 +335,12 @@
                conf-pu {
                        pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
                conf-pd {
                        pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
                        drive-strength = <8>;
-                       mediatek,pull-down-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
        };
 

diff --git a/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi b/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi
index 33754343938a7164dd2d3ec153d54f96863cfd5f..d17f29cceb7e038201aaea2a2a90f92bae7fe9d2 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi
+++ b/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi
@@ -4,6 +4,7 @@
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/leds/common.h>
+#include <dt-bindings/pinctrl/mt65xx.h>
 
 #include "mt7986a.dtsi"
 
@@ -92,12 +93,12 @@
                conf-pu {
                        pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
                conf-pd {
                        pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
                        drive-strength = <8>;
-                       mediatek,pull-down-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
        };
 

diff --git a/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-common.dtsi b/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-common.dtsi
index 86c08138aca967434cbec8591d6ec0689682815c..5c9abff56da7a9d2d51ef6ef0f43e6d98317ce4a 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-common.dtsi
+++ b/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-common.dtsi
@@ -8,6 +8,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/leds/common.h>
+#include <dt-bindings/pinctrl/mt65xx.h>
 
 / {
        aliases {
@@ -329,12 +330,12 @@
                conf-pu {
                        pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP";
                        drive-strength = <4>;
-                       mediatek,pull-up-adv = <0>;     /* bias-disable */
+                       bias-disable;   /* bias-disable */
                };
                conf-pd {
                        pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
                        drive-strength = <4>;
-                       mediatek,pull-down-adv = <0>;   /* bias-disable */
+                       bias-disable;   /* bias-disable */
                };
        };
 

diff --git a/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts b/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts
index c2a0ef2ab0029b81ea2238aad4ee402e5d8da4e6..4fcd4110dcc904b01f6e91857b662dd4b1511192 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts
+++ b/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts
@@ -4,6 +4,7 @@
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/leds/common.h>
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/pinctrl/mt65xx.h>
 
 #include "mt7986a.dtsi"
 
@@ -313,12 +314,12 @@
                conf-pu {
                        pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
                conf-pd {
                        pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
                        drive-strength = <8>;
-                       mediatek,pull-down-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
        };
 

diff --git a/target/linux/mediatek/dts/mt7986b-mercusys-mr90x-v1-common.dtsi b/target/linux/mediatek/dts/mt7986b-mercusys-mr90x-v1-common.dtsi
index 964c17e8212048e7145d5e2c8aaef5ad554fb1e8..60b82a1ed96c2e4633fc0b3429627246cb0cc3f1 100644 (file)
--- a/target/linux/mediatek/dts/mt7986b-mercusys-mr90x-v1-common.dtsi
+++ b/target/linux/mediatek/dts/mt7986b-mercusys-mr90x-v1-common.dtsi
@@ -4,6 +4,7 @@
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/leds/common.h>
+#include <dt-bindings/pinctrl/mt65xx.h>
 
 #include "mt7986b.dtsi"
 
@@ -181,12 +182,12 @@
                conf-pu {
                        pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
                conf-pd {
                        pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
                        drive-strength = <8>;
-                       mediatek,pull-down-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
        };
 

diff --git a/target/linux/mediatek/dts/mt7986b-netgear-wax220.dts b/target/linux/mediatek/dts/mt7986b-netgear-wax220.dts
index 9537afba898aed5e52480ca37fb2c57d17017a40..7447186ab596495a92302517f8deef889f8446bb 100644 (file)
--- a/target/linux/mediatek/dts/mt7986b-netgear-wax220.dts
+++ b/target/linux/mediatek/dts/mt7986b-netgear-wax220.dts
@@ -4,6 +4,7 @@
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/leds/common.h>
+#include <dt-bindings/pinctrl/mt65xx.h>
 
 #include "mt7986b.dtsi"
 
@@ -132,12 +133,12 @@
                conf-pu {
                        pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
                conf-pd {
                        pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
                        drive-strength = <8>;
-                       mediatek,pull-down-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
        };
 

diff --git a/target/linux/mediatek/dts/mt7986b-tplink-re6000xd.dts b/target/linux/mediatek/dts/mt7986b-tplink-re6000xd.dts
index 12e264073d02e0c883f3364b09b1dcb9e2f04b5b..afc5640fe1700febb69bf4d3eaf7a096ec07f350 100644 (file)
--- a/target/linux/mediatek/dts/mt7986b-tplink-re6000xd.dts
+++ b/target/linux/mediatek/dts/mt7986b-tplink-re6000xd.dts
@@ -4,6 +4,7 @@
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/leds/common.h>
+#include <dt-bindings/pinctrl/mt65xx.h>
 
 #include "mt7986b.dtsi"
 
@@ -196,12 +197,12 @@
                conf-pu {
                        pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
                conf-pd {
                        pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
                        drive-strength = <8>;
-                       mediatek,pull-down-adv = <0>; /* bias-disable */
+                       bias-disable; /* bias-disable */
                };
        };
 

diff --git a/target/linux/mediatek/dts/mt7988a-smartrg-mt-stuart.dtsi b/target/linux/mediatek/dts/mt7988a-smartrg-mt-stuart.dtsi
index a8eeebda6c88477e95ea3edfb555814e597831dc..002908c74bfd634302c17fd19a4ac1837979113c 100644 (file)
--- a/target/linux/mediatek/dts/mt7988a-smartrg-mt-stuart.dtsi
+++ b/target/linux/mediatek/dts/mt7988a-smartrg-mt-stuart.dtsi
@@ -609,7 +609,7 @@
 &pio {
        button_pins: button-pins {
                pins = "GPIO_RESET", "GPIO_WPS";
-               mediatek,pull-down-adv = <0>; /* bias-disable */
+               bias-disable; /* bias-disable */
        };
 
        gbe1_led0_pins: gbe1-led0-pins {
@@ -712,12 +712,12 @@
                conf-scl {
                        pins = "LED_A";
                        drive-strength =  <8>;
-                       mediatek,pull-up-adv = <1>;
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
                conf-sda {
                        pins = "LED_E";
                        drive-strength =  <8>;
-                       mediatek,pull-up-adv = <0>;
+                       bias-disable;
                };
        };
 

diff --git a/target/linux/mediatek/dts/mt7988d-asus-zenwifi-bt8.dtsi b/target/linux/mediatek/dts/mt7988d-asus-zenwifi-bt8.dtsi
index 1d916d760fd528343d8a0c250da80a74055384e5..e5c33fb5d08fe7f0987eefe1af304cc24b2abd70 100644 (file)
--- a/target/linux/mediatek/dts/mt7988d-asus-zenwifi-bt8.dtsi
+++ b/target/linux/mediatek/dts/mt7988d-asus-zenwifi-bt8.dtsi
@@ -300,7 +300,7 @@
 &pio {
        button_pins: button-pins {
                pins = "GPIO_RESET", "GPIO_WPS";
-               mediatek,pull-down-adv = <0>; /* bias-disable */
+               bias-disable; /* bias-disable */
        };
 
        mdio0_pins: mdio0-pins {

diff --git a/target/linux/mediatek/files-6.12/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dtsi b/target/linux/mediatek/files-6.12/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dtsi
index 0b6df172148750461c0e48832a52fcc85297403d..5e90ac1fa6411071295a9f74f2ed6f0cfdbaafb5 100644 (file)
--- a/target/linux/mediatek/files-6.12/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dtsi
+++ b/target/linux/mediatek/files-6.12/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dtsi
@@ -5,6 +5,7 @@
  */
 
 /dts-v1/;
+#include <dt-bindings/pinctrl/mt65xx.h>
 #include "mt7986a.dtsi"
 
 / {
@@ -151,21 +152,21 @@
                               "EMMC_DATA_6", "EMMC_DATA_7", "EMMC_CMD";
                        input-enable;
                        drive-strength = <4>;
-                       mediatek,pull-up-adv = <1>;     /* pull-up 10K */
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;  /* pull-up 10K */
                };
                conf-clk {
                        pins = "EMMC_CK";
                        drive-strength = <6>;
-                       mediatek,pull-down-adv = <2>;   /* pull-down 50K */
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_10>;        /* pull-down 50K */
                };
                conf-ds {
                        pins = "EMMC_DSL";
-                       mediatek,pull-down-adv = <2>;   /* pull-down 50K */
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_10>;        /* pull-down 50K */
                };
                conf-rst {
                        pins = "EMMC_RSTB";
                        drive-strength = <4>;
-                       mediatek,pull-up-adv = <1>;     /* pull-up 10K */
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;  /* pull-up 10K */
                };
        };
 
@@ -180,21 +181,21 @@
                               "EMMC_DATA_6", "EMMC_DATA_7", "EMMC_CMD";
                        input-enable;
                        drive-strength = <4>;
-                       mediatek,pull-up-adv = <1>;     /* pull-up 10K */
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;  /* pull-up 10K */
                };
                conf-clk {
                        pins = "EMMC_CK";
                        drive-strength = <6>;
-                       mediatek,pull-down-adv = <2>;   /* pull-down 50K */
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_10>;        /* pull-down 50K */
                };
                conf-ds {
                        pins = "EMMC_DSL";
-                       mediatek,pull-down-adv = <2>;   /* pull-down 50K */
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_10>;        /* pull-down 50K */
                };
                conf-rst {
                        pins = "EMMC_RSTB";
                        drive-strength = <4>;
-                       mediatek,pull-up-adv = <1>;     /* pull-up 10K */
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;  /* pull-up 10K */
                };
        };
 
@@ -220,12 +221,12 @@
                conf-pu {
                        pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP";
                        drive-strength = <8>;
-                       mediatek,pull-up-adv = <0>;     /* bias-disable */
+                       bias-disable;   /* bias-disable */
                };
                conf-pd {
                        pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
                        drive-strength = <8>;
-                       mediatek,pull-down-adv = <0>;   /* bias-disable */
+                       bias-disable;   /* bias-disable */
                };
        };