arm64: dts: mediatek: Declare drive-strength numerically

On some devicetrees, the drive-strength property gets assigned a
MTK_DRIVE_(x)_mA definition, which matches with (x).

For example, MTK_DRIVE_8mA equals to 8 and MTK_DRIVE_30mA equals
to 30.

Also keeping in mind that the drive-strength property is, by
(binding) definition, taking a number in milliamperes unit,
change all devicetrees to avoid the usage of any MTK_DRIVE_(x)
definition.

Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
Link: https://lore.kernel.org/r/20240620101656.1096374-2-angelogioacchino.delregno@collabora.com
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>

diff --git a/arch/arm64/boot/dts/mediatek/mt2712-evb.dts b/arch/arm64/boot/dts/mediatek/mt2712-evb.dts
index 234e3b23d7a8d3206c1f5e74f875a4501eea3942..c84c47c1352fba49d219fb8ace17a74953927fdc 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt2712-evb.dts
+++ b/arch/arm64/boot/dts/mediatek/mt2712-evb.dts
@@ -137,7 +137,7 @@
                                 <MT2712_PIN_74_GBE_TXD0__FUNC_GBE_TXD0>,
                                 <MT2712_PIN_75_GBE_TXC__FUNC_GBE_TXC>,
                                 <MT2712_PIN_76_GBE_TXEN__FUNC_GBE_TXEN>;
-                       drive-strength = <MTK_DRIVE_8mA>;
+                       drive-strength = <8>;
                };
                rx_pins {
                        pinmux = <MT2712_PIN_78_GBE_RXD3__FUNC_GBE_RXD3>,
@@ -151,7 +151,7 @@
                mdio_pins {
                        pinmux = <MT2712_PIN_85_GBE_MDC__FUNC_GBE_MDC>,
                                 <MT2712_PIN_86_GBE_MDIO__FUNC_GBE_MDIO>;
-                       drive-strength = <MTK_DRIVE_8mA>;
+                       drive-strength = <8>;
                        input-enable;
                };
        };

diff --git a/arch/arm64/boot/dts/mediatek/mt6795-sony-xperia-m5.dts b/arch/arm64/boot/dts/mediatek/mt6795-sony-xperia-m5.dts
index 7364c7278276940a2e21cfcb6a26b91f845f6b86..91de920c2245713967fe83f11fa52405a181f5bb 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt6795-sony-xperia-m5.dts
+++ b/arch/arm64/boot/dts/mediatek/mt6795-sony-xperia-m5.dts
@@ -288,25 +288,25 @@
                                 <PINMUX_GPIO161__FUNC_MSDC0_DAT7>,
                                 <PINMUX_GPIO162__FUNC_MSDC0_CMD>;
                        input-enable;
-                       drive-strength = <MTK_DRIVE_6mA>;
+                       drive-strength = <6>;
                        bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
 
                pins-clk {
                        pinmux = <PINMUX_GPIO163__FUNC_MSDC0_CLK>;
-                       drive-strength = <MTK_DRIVE_6mA>;
+                       drive-strength = <6>;
                        bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                };
 
                pins-rst {
                        pinmux = <PINMUX_GPIO165__FUNC_MSDC0_RSTB>;
-                       drive-strength = <MTK_DRIVE_6mA>;
+                       drive-strength = <6>;
                        bias-pull-up = <MTK_PUPD_SET_R1R0_10>;
                };
 
                pins-ds {
                        pinmux = <PINMUX_GPIO164__FUNC_MSDC0_DSL>;
-                       drive-strength = <MTK_DRIVE_6mA>;
+                       drive-strength = <6>;
                        bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                };
        };

diff --git a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts
index 3fab21f59d1834e8c02a94436b0a8c24b392d4cf..bb4671c18e3bd4680afdb5fe928a9f6d96eaf1c9 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts
@@ -213,14 +213,14 @@
                                 <MT8173_PIN_76_MSDC1_DAT3__FUNC_MSDC1_DAT3>,
                                 <MT8173_PIN_78_MSDC1_CMD__FUNC_MSDC1_CMD>;
                        input-enable;
-                       drive-strength = <MTK_DRIVE_4mA>;
+                       drive-strength = <4>;
                        bias-pull-up = <MTK_PUPD_SET_R1R0_10>;
                };
 
                pins_clk {
                        pinmux = <MT8173_PIN_77_MSDC1_CLK__FUNC_MSDC1_CLK>;
                        bias-pull-down;
-                       drive-strength = <MTK_DRIVE_4mA>;
+                       drive-strength = <4>;
                };
 
                pins_insert {
@@ -241,13 +241,13 @@
                                 <MT8173_PIN_64_MSDC0_DAT7__FUNC_MSDC0_DAT7>,
                                 <MT8173_PIN_66_MSDC0_CMD__FUNC_MSDC0_CMD>;
                        input-enable;
-                       drive-strength = <MTK_DRIVE_2mA>;
+                       drive-strength = <2>;
                        bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
 
                pins_clk {
                        pinmux = <MT8173_PIN_65_MSDC0_CLK__FUNC_MSDC0_CLK>;
-                       drive-strength = <MTK_DRIVE_2mA>;
+                       drive-strength = <2>;
                        bias-pull-down = <MTK_PUPD_SET_R1R0_01>;
                };
 
@@ -265,13 +265,13 @@
                                 <MT8173_PIN_76_MSDC1_DAT3__FUNC_MSDC1_DAT3>,
                                 <MT8173_PIN_78_MSDC1_CMD__FUNC_MSDC1_CMD>;
                        input-enable;
-                       drive-strength = <MTK_DRIVE_4mA>;
+                       drive-strength = <4>;
                        bias-pull-up = <MTK_PUPD_SET_R1R0_10>;
                };
 
                pins_clk {
                        pinmux = <MT8173_PIN_77_MSDC1_CLK__FUNC_MSDC1_CLK>;
-                       drive-strength = <MTK_DRIVE_4mA>;
+                       drive-strength = <4>;
                        bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                };
        };

diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-makomo-sku0.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-makomo-sku0.dts
index 4eb2a0d571af455af374cf98b05ec6ced5f4bf3d..ddb993521bbfee1b94f9451d329aab0784837825 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-makomo-sku0.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-makomo-sku0.dts
@@ -19,6 +19,6 @@
 
 &mmc1_pins_uhs {
        pins-clk {
-               drive-strength = <MTK_DRIVE_6mA>;
+               drive-strength = <6>;
        };
 };

diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-makomo-sku1.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-makomo-sku1.dts
index 6a733361e8ae2667f3ae14f78f6c070d23b76a38..10c4f920a7d82ea6efc01b2ab10959e90fad7239 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-makomo-sku1.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-makomo-sku1.dts
@@ -19,6 +19,6 @@
 
 &mmc1_pins_uhs {
        pins-clk {
-               drive-strength = <MTK_DRIVE_6mA>;
+               drive-strength = <6>;
        };
 };

diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts
index 0d5a11c93c6810f2793b585ee2af2ba4ddb0a158..cce326aec1aa594deb6f5b14340d3552d110b160 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts
@@ -66,16 +66,16 @@
 
 &mmc1_pins_default {
        pins-cmd-dat {
-               drive-strength = <MTK_DRIVE_6mA>;
+               drive-strength = <6>;
        };
        pins-clk {
-               drive-strength = <MTK_DRIVE_6mA>;
+               drive-strength = <6>;
        };
 };
 
 &mmc1_pins_uhs {
        pins-clk {
-               drive-strength = <MTK_DRIVE_6mA>;
+               drive-strength = <6>;
        };
 };
 

diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
index a9e40c291d0e6243086e66f6462c0c0d7928b79e..6345e969efae5fe8e574b840cc781717a6d375a3 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
@@ -488,7 +488,7 @@
                                <PINMUX_GPIO172__FUNC_TDM_DATA1_2ND>,
                                <PINMUX_GPIO173__FUNC_TDM_DATA2_2ND>,
                                <PINMUX_GPIO10__FUNC_TDM_DATA3>; /*8ch-i2s to it6505*/
-                       drive-strength = <MTK_DRIVE_6mA>;
+                       drive-strength = <6>;
                };
        };
 
@@ -502,7 +502,7 @@
                                <PINMUX_GPIO10__FUNC_GPIO10>;
                        input-enable;
                        bias-pull-down;
-                       drive-strength = <MTK_DRIVE_2mA>;
+                       drive-strength = <2>;
                };
        };
 
@@ -673,14 +673,14 @@
                                 <PINMUX_GPIO34__FUNC_MSDC1_DAT1>,
                                 <PINMUX_GPIO33__FUNC_MSDC1_DAT2>,
                                 <PINMUX_GPIO30__FUNC_MSDC1_DAT3>;
-                       drive-strength = <MTK_DRIVE_6mA>;
+                       drive-strength = <6>;
                        input-enable;
                        mediatek,pull-up-adv = <10>;
                };
 
                pins-clk {
                        pinmux = <PINMUX_GPIO29__FUNC_MSDC1_CLK>;
-                       drive-strength = <MTK_DRIVE_8mA>;
+                       drive-strength = <8>;
                        mediatek,pull-down-adv = <10>;
                        input-enable;
                };

diff --git a/arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts b/arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts
index 81f6c205fa980dab90ba95a5d78a2072be6b61ce..1aa668c3ccf9285ccc33aacb16d1c68c491475e2 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts
@@ -350,14 +350,14 @@
                                 <PINMUX_GPIO34__FUNC_MSDC1_DAT1>,
                                 <PINMUX_GPIO33__FUNC_MSDC1_DAT2>,
                                 <PINMUX_GPIO30__FUNC_MSDC1_DAT3>;
-                       drive-strength = <MTK_DRIVE_6mA>;
+                       drive-strength = <6>;
                        input-enable;
                        mediatek,pull-up-adv = <10>;
                };
 
                pins_clk {
                        pinmux = <PINMUX_GPIO29__FUNC_MSDC1_CLK>;
-                       drive-strength = <MTK_DRIVE_8mA>;
+                       drive-strength = <8>;
                        mediatek,pull-down-adv = <10>;
                        input-enable;
                };

diff --git a/arch/arm64/boot/dts/mediatek/mt8195-demo.dts b/arch/arm64/boot/dts/mediatek/mt8195-demo.dts
index b82f7176b4a1c62ec63f2d7686e1ce25088d6683..31d424b8fc7cedef65489392eb279b7fd2194a4a 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8195-demo.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8195-demo.dts
@@ -305,14 +305,14 @@
                                 <PINMUX_GPIO78__FUNC_GBE_TXD2>,
                                 <PINMUX_GPIO79__FUNC_GBE_TXD1>,
                                 <PINMUX_GPIO80__FUNC_GBE_TXD0>;
-                       drive-strength = <MTK_DRIVE_8mA>;
+                       drive-strength = <8>;
                };
                pins-cc {
                        pinmux = <PINMUX_GPIO85__FUNC_GBE_TXC>,
                                 <PINMUX_GPIO88__FUNC_GBE_TXEN>,
                                 <PINMUX_GPIO87__FUNC_GBE_RXDV>,
                                 <PINMUX_GPIO86__FUNC_GBE_RXC>;
-                       drive-strength = <MTK_DRIVE_8mA>;
+                       drive-strength = <8>;
                };
                pins-rxd {
                        pinmux = <PINMUX_GPIO81__FUNC_GBE_RXD3>,
@@ -377,7 +377,7 @@
        mmc0_default_pins: mmc0-default-pins {
                pins-clk {
                        pinmux = <PINMUX_GPIO122__FUNC_MSDC0_CLK>;
-                       drive-strength = <MTK_DRIVE_6mA>;
+                       drive-strength = <6>;
                        bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                };
 
@@ -392,13 +392,13 @@
                                 <PINMUX_GPIO116__FUNC_MSDC0_DAT7>,
                                 <PINMUX_GPIO121__FUNC_MSDC0_CMD>;
                        input-enable;
-                       drive-strength = <MTK_DRIVE_6mA>;
+                       drive-strength = <6>;
                        bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
 
                pins-rst {
                        pinmux = <PINMUX_GPIO120__FUNC_MSDC0_RSTB>;
-                       drive-strength = <MTK_DRIVE_6mA>;
+                       drive-strength = <6>;
                        bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
        };
@@ -406,7 +406,7 @@
        mmc0_uhs_pins: mmc0-uhs-pins {
                pins-clk {
                        pinmux = <PINMUX_GPIO122__FUNC_MSDC0_CLK>;
-                       drive-strength = <MTK_DRIVE_8mA>;
+                       drive-strength = <8>;
                        bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                };
 
@@ -421,19 +421,19 @@
                                 <PINMUX_GPIO116__FUNC_MSDC0_DAT7>,
                                 <PINMUX_GPIO121__FUNC_MSDC0_CMD>;
                        input-enable;
-                       drive-strength = <MTK_DRIVE_8mA>;
+                       drive-strength = <8>;
                        bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
 
                pins-ds {
                        pinmux = <PINMUX_GPIO127__FUNC_MSDC0_DSL>;
-                       drive-strength = <MTK_DRIVE_8mA>;
+                       drive-strength = <8>;
                        bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                };
 
                pins-rst {
                        pinmux = <PINMUX_GPIO120__FUNC_MSDC0_RSTB>;
-                       drive-strength = <MTK_DRIVE_8mA>;
+                       drive-strength = <8>;
                        bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
        };
@@ -441,7 +441,7 @@
        mmc1_default_pins: mmc1-default-pins {
                pins-clk {
                        pinmux = <PINMUX_GPIO111__FUNC_MSDC1_CLK>;
-                       drive-strength = <MTK_DRIVE_8mA>;
+                       drive-strength = <8>;
                        bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                };
 
@@ -452,7 +452,7 @@
                                 <PINMUX_GPIO114__FUNC_MSDC1_DAT2>,
                                 <PINMUX_GPIO115__FUNC_MSDC1_DAT3>;
                        input-enable;
-                       drive-strength = <MTK_DRIVE_8mA>;
+                       drive-strength = <8>;
                        bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
 
@@ -465,7 +465,7 @@
        mmc1_uhs_pins: mmc1-uhs-pins {
                pins-clk {
                        pinmux = <PINMUX_GPIO111__FUNC_MSDC1_CLK>;
-                       drive-strength = <MTK_DRIVE_8mA>;
+                       drive-strength = <8>;
                        bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                };
 
@@ -476,7 +476,7 @@
                                 <PINMUX_GPIO114__FUNC_MSDC1_DAT2>,
                                 <PINMUX_GPIO115__FUNC_MSDC1_DAT3>;
                        input-enable;
-                       drive-strength = <MTK_DRIVE_8mA>;
+                       drive-strength = <8>;
                        bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
        };

diff --git a/arch/arm64/boot/dts/mediatek/mt8365-evk.dts b/arch/arm64/boot/dts/mediatek/mt8365-evk.dts
index 50cbaefa1a9936c6ff6c3bb7ccb94e7326d4f7a1..4211a992dd9db4b9625dbc3c00bea4ed503a6759 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8365-evk.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8365-evk.dts
@@ -308,7 +308,7 @@
        mmc1_uhs_pins: mmc1-uhs-pins {
                clk-pins {
                        pinmux = <MT8365_PIN_88_MSDC1_CLK__FUNC_MSDC1_CLK>;
-                       drive-strength = <MTK_DRIVE_8mA>;
+                       drive-strength = <8>;
                        bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                };
 
@@ -319,7 +319,7 @@
                                 <MT8365_PIN_92_MSDC1_DAT3__FUNC_MSDC1_DAT3>,
                                 <MT8365_PIN_87_MSDC1_CMD__FUNC_MSDC1_CMD>;
                        input-enable;
-                       drive-strength = <MTK_DRIVE_6mA>;
+                       drive-strength = <6>;
                        bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
        };

diff --git a/arch/arm64/boot/dts/mediatek/mt8390-genio-700-evk.dts b/arch/arm64/boot/dts/mediatek/mt8390-genio-700-evk.dts
index 6bb1d5d112ef3840af361446a80a99bc6983315c..1474bef7e754d08141cbcdc22d32494d586b3bb6 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8390-genio-700-evk.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8390-genio-700-evk.dts
@@ -383,13 +383,13 @@
                                 <PINMUX_GPIO140__FUNC_I0_GBE_RXC>,
                                 <PINMUX_GPIO141__FUNC_I0_GBE_RXDV>,
                                 <PINMUX_GPIO142__FUNC_O_GBE_TXEN>;
-                       drive-strength = <MTK_DRIVE_8mA>;
+                       drive-strength = <8>;
                };
 
                pins-mdio {
                        pinmux = <PINMUX_GPIO143__FUNC_O_GBE_MDC>,
                                 <PINMUX_GPIO144__FUNC_B1_GBE_MDIO>;
-                       drive-strength = <MTK_DRIVE_8mA>;
+                       drive-strength = <8>;
                        input-enable;
                };
 
@@ -404,7 +404,7 @@
                                 <PINMUX_GPIO136__FUNC_I0_GBE_RXD2>,
                                 <PINMUX_GPIO137__FUNC_I0_GBE_RXD1>,
                                 <PINMUX_GPIO138__FUNC_I0_GBE_RXD0>;
-                       drive-strength = <MTK_DRIVE_8mA>;
+                       drive-strength = <8>;
                };
 
                pins-txd {
@@ -412,7 +412,7 @@
                                 <PINMUX_GPIO132__FUNC_O_GBE_TXD2>,
                                 <PINMUX_GPIO133__FUNC_O_GBE_TXD1>,
                                 <PINMUX_GPIO134__FUNC_O_GBE_TXD0>;
-                       drive-strength = <MTK_DRIVE_8mA>;
+                       drive-strength = <8>;
                };
        };
 
@@ -520,7 +520,7 @@
        mmc0_default_pins: mmc0-default-pins {
                pins-clk {
                        pinmux = <PINMUX_GPIO157__FUNC_B1_MSDC0_CLK>;
-                       drive-strength = <MTK_DRIVE_6mA>;
+                       drive-strength = <6>;
                        bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                };
 
@@ -535,13 +535,13 @@
                                 <PINMUX_GPIO151__FUNC_B1_MSDC0_DAT7>,
                                 <PINMUX_GPIO156__FUNC_B1_MSDC0_CMD>;
                        input-enable;
-                       drive-strength = <MTK_DRIVE_6mA>;
+                       drive-strength = <6>;
                        bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
 
                pins-rst {
                        pinmux = <PINMUX_GPIO155__FUNC_O_MSDC0_RSTB>;
-                       drive-strength = <MTK_DRIVE_6mA>;
+                       drive-strength = <6>;
                        bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
        };
@@ -549,7 +549,7 @@
        mmc0_uhs_pins: mmc0-uhs-pins {
                pins-clk {
                        pinmux = <PINMUX_GPIO157__FUNC_B1_MSDC0_CLK>;
-                       drive-strength = <MTK_DRIVE_8mA>;
+                       drive-strength = <8>;
                        bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                };
 
@@ -564,19 +564,19 @@
                                 <PINMUX_GPIO151__FUNC_B1_MSDC0_DAT7>,
                                 <PINMUX_GPIO156__FUNC_B1_MSDC0_CMD>;
                        input-enable;
-                       drive-strength = <MTK_DRIVE_8mA>;
+                       drive-strength = <8>;
                        bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
 
                pins-ds {
                        pinmux = <PINMUX_GPIO162__FUNC_B0_MSDC0_DSL>;
-                       drive-strength = <MTK_DRIVE_8mA>;
+                       drive-strength = <8>;
                        bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                };
 
                pins-rst {
                        pinmux = <PINMUX_GPIO155__FUNC_O_MSDC0_RSTB>;
-                       drive-strength = <MTK_DRIVE_8mA>;
+                       drive-strength = <8>;
                        bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
        };
@@ -584,7 +584,7 @@
        mmc1_default_pins: mmc1-default-pins {
                pins-clk {
                        pinmux = <PINMUX_GPIO164__FUNC_B1_MSDC1_CLK>;
-                       drive-strength = <MTK_DRIVE_6mA>;
+                       drive-strength = <6>;
                        bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                };
 
@@ -595,7 +595,7 @@
                                 <PINMUX_GPIO167__FUNC_B1_MSDC1_DAT2>,
                                 <PINMUX_GPIO168__FUNC_B1_MSDC1_DAT3>;
                        input-enable;
-                       drive-strength = <MTK_DRIVE_6mA>;
+                       drive-strength = <6>;
                        bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
 
@@ -608,7 +608,7 @@
        mmc1_uhs_pins: mmc1-uhs-pins {
                pins-clk {
                        pinmux = <PINMUX_GPIO164__FUNC_B1_MSDC1_CLK>;
-                       drive-strength = <MTK_DRIVE_6mA>;
+                       drive-strength = <6>;
                        bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                };
 
@@ -619,7 +619,7 @@
                                 <PINMUX_GPIO167__FUNC_B1_MSDC1_DAT2>,
                                 <PINMUX_GPIO168__FUNC_B1_MSDC1_DAT3>;
                        input-enable;
-                       drive-strength = <MTK_DRIVE_6mA>;
+                       drive-strength = <6>;
                        bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
        };
@@ -627,7 +627,7 @@
        mmc2_default_pins: mmc2-default-pins {
                pins-clk {
                        pinmux = <PINMUX_GPIO170__FUNC_B1_MSDC2_CLK>;
-                       drive-strength = <MTK_DRIVE_4mA>;
+                       drive-strength = <4>;
                        bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                };
 
@@ -638,7 +638,7 @@
                                 <PINMUX_GPIO173__FUNC_B1_MSDC2_DAT2>,
                                 <PINMUX_GPIO174__FUNC_B1_MSDC2_DAT3>;
                        input-enable;
-                       drive-strength = <MTK_DRIVE_6mA>;
+                       drive-strength = <6>;
                        bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
 
@@ -650,7 +650,7 @@
        mmc2_uhs_pins: mmc2-uhs-pins {
                pins-clk {
                        pinmux = <PINMUX_GPIO170__FUNC_B1_MSDC2_CLK>;
-                       drive-strength = <MTK_DRIVE_4mA>;
+                       drive-strength = <4>;
                        bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                };
 
@@ -661,7 +661,7 @@
                                 <PINMUX_GPIO173__FUNC_B1_MSDC2_DAT2>,
                                 <PINMUX_GPIO174__FUNC_B1_MSDC2_DAT3>;
                        input-enable;
-                       drive-strength = <MTK_DRIVE_6mA>;
+                       drive-strength = <6>;
                        bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
        };
@@ -678,7 +678,7 @@
                pins-dat1 {
                        pinmux = <PINMUX_GPIO172__FUNC_B1_MSDC2_DAT1>;
                        input-enable;
-                       drive-strength = <MTK_DRIVE_6mA>;
+                       drive-strength = <6>;
                        bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
        };

diff --git a/arch/arm64/boot/dts/mediatek/mt8395-genio-1200-evk.dts b/arch/arm64/boot/dts/mediatek/mt8395-genio-1200-evk.dts
index a1b613808780e8afe5b212434b40ea930cc863a0..a06610fff8adef57c2b5c0e0db3bab95e05ca5d6 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8395-genio-1200-evk.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8395-genio-1200-evk.dts
@@ -475,7 +475,7 @@
                                 <PINMUX_GPIO86__FUNC_GBE_RXC>,
                                 <PINMUX_GPIO87__FUNC_GBE_RXDV>,
                                 <PINMUX_GPIO88__FUNC_GBE_TXEN>;
-                       drive-strength = <MTK_DRIVE_8mA>;
+                       drive-strength = <8>;
                };
 
                pins-mdio {
@@ -502,7 +502,7 @@
                                 <PINMUX_GPIO78__FUNC_GBE_TXD2>,
                                 <PINMUX_GPIO79__FUNC_GBE_TXD1>,
                                 <PINMUX_GPIO80__FUNC_GBE_TXD0>;
-                       drive-strength = <MTK_DRIVE_8mA>;
+                       drive-strength = <8>;
                };
        };
 
@@ -567,7 +567,7 @@
                        pinmux = <PINMUX_GPIO12__FUNC_SDA2>,
                                 <PINMUX_GPIO13__FUNC_SCL2>;
                        bias-pull-up = <MTK_PULL_SET_RSEL_111>;
-                       drive-strength = <MTK_DRIVE_6mA>;
+                       drive-strength = <6>;
                };
        };
 
@@ -582,7 +582,7 @@
        mmc0_default_pins: mmc0-default-pins {
                pins-clk {
                        pinmux = <PINMUX_GPIO122__FUNC_MSDC0_CLK>;
-                       drive-strength = <MTK_DRIVE_6mA>;
+                       drive-strength = <6>;
                        bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                };
 
@@ -597,13 +597,13 @@
                                 <PINMUX_GPIO116__FUNC_MSDC0_DAT7>,
                                 <PINMUX_GPIO121__FUNC_MSDC0_CMD>;
                        input-enable;
-                       drive-strength = <MTK_DRIVE_6mA>;
+                       drive-strength = <6>;
                        bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
 
                pins-rst {
                        pinmux = <PINMUX_GPIO120__FUNC_MSDC0_RSTB>;
-                       drive-strength = <MTK_DRIVE_6mA>;
+                       drive-strength = <6>;
                        bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
        };
@@ -611,7 +611,7 @@
        mmc0_uhs_pins: mmc0-uhs-pins {
                pins-clk {
                        pinmux = <PINMUX_GPIO122__FUNC_MSDC0_CLK>;
-                       drive-strength = <MTK_DRIVE_8mA>;
+                       drive-strength = <8>;
                        bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                };
 
@@ -626,19 +626,19 @@
                                 <PINMUX_GPIO116__FUNC_MSDC0_DAT7>,
                                 <PINMUX_GPIO121__FUNC_MSDC0_CMD>;
                        input-enable;
-                       drive-strength = <MTK_DRIVE_8mA>;
+                       drive-strength = <8>;
                        bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
 
                pins-ds {
                        pinmux = <PINMUX_GPIO127__FUNC_MSDC0_DSL>;
-                       drive-strength = <MTK_DRIVE_8mA>;
+                       drive-strength = <8>;
                        bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                };
 
                pins-rst {
                        pinmux = <PINMUX_GPIO120__FUNC_MSDC0_RSTB>;
-                       drive-strength = <MTK_DRIVE_8mA>;
+                       drive-strength = <8>;
                        bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
        };
@@ -646,7 +646,7 @@
        mmc1_default_pins: mmc1-default-pins {
                pins-clk {
                        pinmux = <PINMUX_GPIO111__FUNC_MSDC1_CLK>;
-                       drive-strength = <MTK_DRIVE_8mA>;
+                       drive-strength = <8>;
                        bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                };
 
@@ -657,7 +657,7 @@
                                 <PINMUX_GPIO114__FUNC_MSDC1_DAT2>,
                                 <PINMUX_GPIO115__FUNC_MSDC1_DAT3>;
                        input-enable;
-                       drive-strength = <MTK_DRIVE_8mA>;
+                       drive-strength = <8>;
                        bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
        };
@@ -665,7 +665,7 @@
        mmc1_uhs_pins: mmc1-uhs-pins {
                pins-clk {
                        pinmux = <PINMUX_GPIO111__FUNC_MSDC1_CLK>;
-                       drive-strength = <MTK_DRIVE_8mA>;
+                       drive-strength = <8>;
                        bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
                };
 
@@ -676,7 +676,7 @@
                                 <PINMUX_GPIO114__FUNC_MSDC1_DAT2>,
                                 <PINMUX_GPIO115__FUNC_MSDC1_DAT3>;
                        input-enable;
-                       drive-strength = <MTK_DRIVE_8mA>;
+                       drive-strength = <8>;
                        bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
                };
        };