Unverified Commit c48081f4 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mtk-dts32-for-v6.11' of... 

Merge tag 'mtk-dts32-for-v6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux into soc/dt

MediaTek ARM32 DTS updates for v6.11

This adds a single commit that cleans up the drive-strength
value assignment on all devicetrees using the deprecated
MTK_DRIVE_(x)mA definition.

* tag 'mtk-dts32-for-v6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux:
  arm: dts: mediatek: Declare drive-strength numerically

Link: https://lore.kernel.org/r/20240628093801.126013-2-angelogioacchino.delregno@collabora.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents c4043e76 c04774af

arch/arm/boot/dts/mediatek/mt2701-evb.dts

+1 −1
Original line number Diff line number Diff line
@@ -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;

		};

	};

arch/arm/boot/dts/mediatek/mt7623.dtsi

+9 −9
Original line number Diff line number Diff line
@@ -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>;

		};

	};