[openwrt/openwrt] mediatek: dts: convert pinctrl bias to the Linux generic style
LEDE Commits
lede-commits at lists.infradead.org
Sun Aug 24 04:58:33 PDT 2025
hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/c089ad8f68ffdcc45ee6fd856bb92266d0a2f2c4
commit c089ad8f68ffdcc45ee6fd856bb92266d0a2f2c4
Author: Shiji Yang <yangshiji66 at outlook.com>
AuthorDate: Fri Aug 8 21:05:10 2025 +0800
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 at outlook.com>
Link: https://github.com/openwrt/openwrt/pull/19741
Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
.../dts/mt7981a-glinet-gl-x3000-xe3000-common.dtsi | 10 +++---
target/linux/mediatek/dts/mt7981b-abt-asr3000.dts | 6 ++--
target/linux/mediatek/dts/mt7981b-cmcc-a10.dtsi | 6 ++--
.../mediatek/dts/mt7981b-cmcc-rax3000m-nand.dtso | 6 ++--
.../linux/mediatek/dts/mt7981b-cudy-re3000-v1.dts | 5 +--
.../linux/mediatek/dts/mt7981b-cudy-wr3000-v1.dts | 5 +--
.../mediatek/dts/mt7981b-glinet-gl-mt2500.dtsi | 9 +++---
.../mediatek/dts/mt7981b-h3c-magic-nx30-pro.dts | 5 +--
target/linux/mediatek/dts/mt7981b-jcg-q30-pro.dts | 5 +--
.../linux/mediatek/dts/mt7981b-nokia-ea0326gmp.dts | 6 ++--
.../mediatek/dts/mt7981b-openembed-som7981.dts | 8 +++--
target/linux/mediatek/dts/mt7981b-qihoo-360t7.dts | 5 +--
.../linux/mediatek/dts/mt7981b-tplink-fr365v1.dts | 5 +--
.../mediatek/dts/mt7981b-unielec-u7981-01-nand.dts | 7 ++--
.../mt7981b-wavlink-wl-3port-128nand-common.dtsi | 6 ++--
.../mediatek/dts/mt7981b-wavlink-wl-wn573hx3.dts | 6 ++--
.../mediatek/dts/mt7981b-wavlink-wl-wn586x3.dts | 6 ++--
.../linux/mediatek/dts/mt7981b-yuncore-ax835.dts | 6 ++--
.../dts/mt7981b-zbtlink-zbt-z8102ax-v2.dts | 5 +--
.../mediatek/dts/mt7981b-zbtlink-zbt-z8102ax.dts | 6 ++--
.../mediatek/dts/mt7986a-acelink-ew-7886cax.dts | 5 +--
.../mediatek/dts/mt7986a-acer-predator-w6x.dts | 5 +--
.../linux/mediatek/dts/mt7986a-acer-w6-common.dtsi | 17 +++++-----
.../linux/mediatek/dts/mt7986a-asus-rt-ax59u.dts | 5 +--
.../linux/mediatek/dts/mt7986a-asus-tuf-ax4200.dts | 5 +--
.../linux/mediatek/dts/mt7986a-asus-tuf-ax6000.dts | 5 +--
.../mediatek/dts/mt7986a-bananapi-bpi-r3-mini.dts | 37 +++++++++++-----------
.../dts/mt7986a-dlink-aquila-pro-ai-m60-a1.dts | 5 +--
.../mediatek/dts/mt7986a-glinet-gl-mt6000.dts | 16 +++++-----
.../mediatek/dts/mt7986a-jdcloud-re-cp-03.dts | 17 +++++-----
.../linux/mediatek/dts/mt7986a-netcore-n60-pro.dts | 5 +--
target/linux/mediatek/dts/mt7986a-netcore-n60.dts | 5 +--
.../mediatek/dts/mt7986a-ruijie-rg-x60-pro.dts | 5 +--
.../mediatek/dts/mt7986a-smartrg-bonanza-peak.dtsi | 19 +++++------
.../mediatek/dts/mt7986a-tplink-archer-ax80-v1.dts | 5 +--
.../mediatek/dts/mt7986a-tplink-tl-xdr-common.dtsi | 5 +--
.../mediatek/dts/mt7986a-tplink-tl-xtr8488.dts | 5 +--
.../dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi | 5 +--
.../dts/mt7986a-zyxel-ex5601-t0-common.dtsi | 5 +--
.../mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts | 5 +--
.../dts/mt7986b-mercusys-mr90x-v1-common.dtsi | 5 +--
.../linux/mediatek/dts/mt7986b-netgear-wax220.dts | 5 +--
.../linux/mediatek/dts/mt7986b-tplink-re6000xd.dts | 5 +--
.../mediatek/dts/mt7988a-smartrg-mt-stuart.dtsi | 6 ++--
.../mediatek/dts/mt7988d-asus-zenwifi-bt8.dtsi | 2 +-
.../arch/arm64/boot/dts/mediatek/mt7986a-rfb.dtsi | 21 ++++++------
46 files changed, 202 insertions(+), 146 deletions(-)
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 11dd1a9edc..fc39d10780 100644
--- 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 651d6461c7..bdc6dece8d 100644
--- 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 2029537518..ac08786a24 100644
--- 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 de9ab0e6ff..4b441283a3 100644
--- 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 e1df653800..7b05f4b94c 100644
--- 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 b3864d099d..055dec01e5 100644
--- 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 82cb938058..73d254ff10 100644
--- 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 2f141b8c7a..0b235d6afd 100644
--- 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 0045c452a7..9b1ef96c15 100644
--- 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 707ec2b4ee..9918a32670 100644
--- 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 4c3f80ed5e..7b0abd472a 100644
--- 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 67ea2ff4c5..e614ebac94 100644
--- 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 5815f84912..78c5927a85 100644
--- 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 649787ae64..3254ca3145 100644
--- 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 f796a00810..7317ac5af8 100644
--- 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 e5118bc3d1..233743ce79 100644
--- 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 9190134e35..4062d4aaa8 100644
--- 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 eada07b7ab..70a9d10781 100644
--- 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 6557b0ff4a..ad27b0fd03 100644
--- 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 80dd203560..2951f9bac7 100644
--- 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 4add0fd51f..81190e0ccc 100644
--- 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 c80f80e1cf..3152901f0c 100644
--- 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 f0df588473..fceed35093 100644
--- 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 d213c76793..9061480cb1 100644
--- 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 712584a3af..37f9e974ac 100644
--- 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 e0faaaa11b..c5d753325d 100644
--- 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 6808db80fe..d4b67f5cfc 100644
--- 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 97a96aadea..d0a280b57a 100644
--- 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 1c815ae5ca..2bed134a95 100644
--- 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 a318ad1ae4..9daf03c611 100644
--- 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 786c5eb312..6a8aa0e0d3 100644
--- 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 6ab0f497c3..0f0b2b3f2f 100644
--- 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 3628ad00e1..d29d9f855a 100644
--- 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 41468449de..688b8adbd5 100644
--- 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 12f03e1fda..6e023de11f 100644
--- 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 0056f6f224..ad625dca73 100644
--- 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 c2ed7c9a28..342a0f98a3 100644
--- 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 3375434393..d17f29cceb 100644
--- 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 86c08138ac..5c9abff56d 100644
--- 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 c2a0ef2ab0..4fcd4110dc 100644
--- 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 964c17e821..60b82a1ed9 100644
--- 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 9537afba89..7447186ab5 100644
--- 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 12e264073d..afc5640fe1 100644
--- 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 a8eeebda6c..002908c74b 100644
--- 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 1d916d760f..e5c33fb5d0 100644
--- 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 0b6df17214..5e90ac1fa6 100644
--- 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 */
};
};
More information about the lede-commits
mailing list