diff mbox series

[2/2] arm: dts: mediatek: Declare drive-strength numerically

Message ID 20240620101656.1096374-3-angelogioacchino.delregno@collabora.com (mailing list archive)
State New
Headers show
Series dts: mediatek: Stop using unneeded definitions | expand

Commit Message

AngeloGioacchino Del Regno June 20, 2024, 10:16 a.m. UTC 
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.

Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
---
 arch/arm/boot/dts/mediatek/mt2701-evb.dts |  2 +-
 arch/arm/boot/dts/mediatek/mt7623.dtsi    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

Comments

Chen-Yu Tsai June 20, 2024, 10:19 a.m. UTC | #1 
On Thu, Jun 20, 2024 at 6:17 PM AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com> wrote:
>
> 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.
>
> Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>

Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>

> ---
>  arch/arm/boot/dts/mediatek/mt2701-evb.dts |  2 +-
>  arch/arm/boot/dts/mediatek/mt7623.dtsi    | 18 +++++++++---------
>  2 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/arch/arm/boot/dts/mediatek/mt2701-evb.dts b/arch/arm/boot/dts/mediatek/mt2701-evb.dts
> index 9c7325f18933..4c76366aa938 100644
> --- a/arch/arm/boot/dts/mediatek/mt2701-evb.dts
> +++ b/arch/arm/boot/dts/mediatek/mt2701-evb.dts
> @@ -231,7 +231,7 @@ pins1 {
>                                  <MT2701_PIN_238_EXT_SDIO1__FUNC_EXT_SDIO1>,
>                                  <MT2701_PIN_237_EXT_SDIO2__FUNC_EXT_SDIO2>,
>                                  <MT2701_PIN_236_EXT_SDIO3__FUNC_EXT_SDIO3>;
> -                       drive-strength = <MTK_DRIVE_4mA>;
> +                       drive-strength = <4>;
>                         bias-pull-up;
>                 };
>         };
> diff --git a/arch/arm/boot/dts/mediatek/mt7623.dtsi b/arch/arm/boot/dts/mediatek/mt7623.dtsi
> index f0b4a09004b3..814586abc297 100644
> --- a/arch/arm/boot/dts/mediatek/mt7623.dtsi
> +++ b/arch/arm/boot/dts/mediatek/mt7623.dtsi
> @@ -1143,13 +1143,13 @@ pins-cmd-dat {
>                                  <MT7623_PIN_121_MSDC0_DAT0_FUNC_MSDC0_DAT0>,
>                                  <MT7623_PIN_116_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 = <MT7623_PIN_117_MSDC0_CLK_FUNC_MSDC0_CLK>;
> -                       drive-strength = <MTK_DRIVE_2mA>;
> +                       drive-strength = <2>;
>                         bias-pull-down = <MTK_PUPD_SET_R1R0_01>;
>                 };
>
> @@ -1167,14 +1167,14 @@ pins-cmd-dat {
>                                  <MT7623_PIN_110_MSDC1_DAT3_FUNC_MSDC1_DAT3>,
>                                  <MT7623_PIN_105_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 = <MT7623_PIN_106_MSDC1_CLK_FUNC_MSDC1_CLK>;
>                         bias-pull-down;
> -                       drive-strength = <MTK_DRIVE_4mA>;
> +                       drive-strength = <4>;
>                 };
>
>                 pins-wp {
> @@ -1197,13 +1197,13 @@ pins-cmd-dat {
>                                  <MT7623_PIN_110_MSDC1_DAT3_FUNC_MSDC1_DAT3>,
>                                  <MT7623_PIN_105_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 = <MT7623_PIN_106_MSDC1_CLK_FUNC_MSDC1_CLK>;
> -                       drive-strength = <MTK_DRIVE_4mA>;
> +                       drive-strength = <4>;
>                         bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
>                 };
>         };
> @@ -1211,7 +1211,7 @@ pins-clk {
>         nand_pins_default: nanddefault {
>                 pins-ale {
>                         pinmux = <MT7623_PIN_116_MSDC0_CMD_FUNC_NALE>;
> -                       drive-strength = <MTK_DRIVE_8mA>;
> +                       drive-strength = <8>;
>                         bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
>                 };
>
> @@ -1226,13 +1226,13 @@ pins-dat {
>                                  <MT7623_PIN_115_MSDC0_RSTB_FUNC_NLD8>,
>                                  <MT7623_PIN_119_MSDC0_DAT2_FUNC_NLD2>;
>                         input-enable;
> -                       drive-strength = <MTK_DRIVE_8mA>;
> +                       drive-strength = <8>;
>                         bias-pull-up;
>                 };
>
>                 pins-we {
>                         pinmux = <MT7623_PIN_117_MSDC0_CLK_FUNC_NWEB>;
> -                       drive-strength = <MTK_DRIVE_8mA>;
> +                       drive-strength = <8>;
>                         bias-pull-up = <MTK_PUPD_SET_R1R0_10>;
>                 };
>         };
> --
> 2.45.2
>
>
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/mediatek/mt2701-evb.dts b/arch/arm/boot/dts/mediatek/mt2701-evb.dts
index 9c7325f18933..4c76366aa938 100644
--- a/arch/arm/boot/dts/mediatek/mt2701-evb.dts
+++ b/arch/arm/boot/dts/mediatek/mt2701-evb.dts
@@ -231,7 +231,7 @@  pins1 {
 				 <MT2701_PIN_238_EXT_SDIO1__FUNC_EXT_SDIO1>,
 				 <MT2701_PIN_237_EXT_SDIO2__FUNC_EXT_SDIO2>,
 				 <MT2701_PIN_236_EXT_SDIO3__FUNC_EXT_SDIO3>;
-			drive-strength = <MTK_DRIVE_4mA>;
+			drive-strength = <4>;
 			bias-pull-up;
 		};
 	};
diff --git a/arch/arm/boot/dts/mediatek/mt7623.dtsi b/arch/arm/boot/dts/mediatek/mt7623.dtsi
index f0b4a09004b3..814586abc297 100644
--- a/arch/arm/boot/dts/mediatek/mt7623.dtsi
+++ b/arch/arm/boot/dts/mediatek/mt7623.dtsi
@@ -1143,13 +1143,13 @@  pins-cmd-dat {
 				 <MT7623_PIN_121_MSDC0_DAT0_FUNC_MSDC0_DAT0>,
 				 <MT7623_PIN_116_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 = <MT7623_PIN_117_MSDC0_CLK_FUNC_MSDC0_CLK>;
-			drive-strength = <MTK_DRIVE_2mA>;
+			drive-strength = <2>;
 			bias-pull-down = <MTK_PUPD_SET_R1R0_01>;
 		};
 
@@ -1167,14 +1167,14 @@  pins-cmd-dat {
 				 <MT7623_PIN_110_MSDC1_DAT3_FUNC_MSDC1_DAT3>,
 				 <MT7623_PIN_105_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 = <MT7623_PIN_106_MSDC1_CLK_FUNC_MSDC1_CLK>;
 			bias-pull-down;
-			drive-strength = <MTK_DRIVE_4mA>;
+			drive-strength = <4>;
 		};
 
 		pins-wp {
@@ -1197,13 +1197,13 @@  pins-cmd-dat {
 				 <MT7623_PIN_110_MSDC1_DAT3_FUNC_MSDC1_DAT3>,
 				 <MT7623_PIN_105_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 = <MT7623_PIN_106_MSDC1_CLK_FUNC_MSDC1_CLK>;
-			drive-strength = <MTK_DRIVE_4mA>;
+			drive-strength = <4>;
 			bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
 		};
 	};
@@ -1211,7 +1211,7 @@  pins-clk {
 	nand_pins_default: nanddefault {
 		pins-ale {
 			pinmux = <MT7623_PIN_116_MSDC0_CMD_FUNC_NALE>;
-			drive-strength = <MTK_DRIVE_8mA>;
+			drive-strength = <8>;
 			bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
 		};
 
@@ -1226,13 +1226,13 @@  pins-dat {
 				 <MT7623_PIN_115_MSDC0_RSTB_FUNC_NLD8>,
 				 <MT7623_PIN_119_MSDC0_DAT2_FUNC_NLD2>;
 			input-enable;
-			drive-strength = <MTK_DRIVE_8mA>;
+			drive-strength = <8>;
 			bias-pull-up;
 		};
 
 		pins-we {
 			pinmux = <MT7623_PIN_117_MSDC0_CLK_FUNC_NWEB>;
-			drive-strength = <MTK_DRIVE_8mA>;
+			drive-strength = <8>;
 			bias-pull-up = <MTK_PUPD_SET_R1R0_10>;
 		};
 	};