From nobody Sun Sep 7 23:39:06 2025 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 37CB92D323D; Thu, 24 Jul 2025 08:40:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753346443; cv=none; b=XgjX6woI1XXPkIgCPxa2REe4JaG5dWIzqSKL+4VRBZ5vniTM2PIa//4gyzvHgo2NuDlz+9y9+465MAxxEoBrb9FJ6nblfYcG5s0R/y9Kx2KNRYUwnMw3zjHJkhDSQpSOm1AZZAPxBCUoJB0Df/rqwj3u1O97sDmx31Sw6QrpGRk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753346443; c=relaxed/simple; bh=61TsENTbcnTVKtS7pa9gHS0SsFFeoRzSzkWyfk9U/wc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=J0nHLmAYgH9t2wsYSL8fBvz8X75cWyICNKFPMMb0bl4Rgh8G2j+Z1Z//K716ltY1WGR2rR9swSbJhtxwmp9hXo4F5F1dx+1U3yjPjaHySg77U0G0unXHi4608L/DK1k55MF4vPFhvF8myOYlE048LYPpzjrVESn2ow6xQyCJHZw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=PaLbWjah; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="PaLbWjah" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1753346439; bh=61TsENTbcnTVKtS7pa9gHS0SsFFeoRzSzkWyfk9U/wc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PaLbWjah2O9Uo1dw6B4l8MVLZIIR2jeQMqjiWQSXz1lirEb8aTFqrxlmWLeWrL7Ke myBLi6oYxjmP282f/Zlk+u3mCmQFaxQt7hnbgW1Bys9/mGirIvcZbuRHNaMljURdGw AnmqcRSk/FZ4WYjf3pkMJ3AkMh+NF4Sk2WSx+XRFmjG2gSF0cKMzUc7jaOsgVatK0j ciQqHJbJZWQWPw6mr7GrfddtHt7FrGzkYQMcI1gN3PRsPLy21R3BeqWhlYKB4oeieT JuAHDEqNIfkvfqUri0/DRKhH644JautlNPDyw4OWUU60JXz7uD+B8S6vEUbxhcJhBb WCqxc9iIgYuYw== Received: from IcarusMOD.eternityproject.eu (2-237-20-237.ip236.fastwebnet.it [2.237.20.237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by bali.collaboradmins.com (Postfix) with ESMTPSA id 2C1D417E0FC2; Thu, 24 Jul 2025 10:40:37 +0200 (CEST) From: AngeloGioacchino Del Regno To: linux-mediatek@lists.infradead.org, robh@kernel.org Cc: herbert@gondor.apana.org.au, davem@davemloft.net, krzk+dt@kernel.org, conor+dt@kernel.org, chunkuang.hu@kernel.org, p.zabel@pengutronix.de, airlied@gmail.com, simona@ffwll.ch, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, jassisinghbrar@gmail.com, mchehab@kernel.org, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, chunfeng.yun@mediatek.com, vkoul@kernel.org, kishon@kernel.org, sean.wang@kernel.org, linus.walleij@linaro.org, lgirdwood@gmail.com, broonie@kernel.org, andersson@kernel.org, mathieu.poirier@linaro.org, daniel.lezcano@linaro.org, tglx@linutronix.de, atenart@kernel.org, jitao.shi@mediatek.com, ck.hu@mediatek.com, houlong.wei@mediatek.com, kyrie.wu@mediatek.corp-partner.google.com, andy.teng@mediatek.com, tinghan.shen@mediatek.com, jiaxin.yu@mediatek.com, shane.chien@mediatek.com, olivia.wen@mediatek.com, granquet@baylibre.com, eugen.hristev@linaro.org, arnd@arndb.de, sam.shih@mediatek.com, jieyy.yang@mediatek.com, frank-w@public-files.de, mwalle@kernel.org, fparent@baylibre.com, linux-crypto@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-phy@lists.infradead.org, linux-gpio@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-sound@vger.kernel.org Subject: [PATCH 28/38] arm64: dts: mediatek: mt8173: Fix pinctrl node names and cleanup Date: Thu, 24 Jul 2025 10:39:04 +0200 Message-ID: <20250724083914.61351-29-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250724083914.61351-1-angelogioacchino.delregno@collabora.com> References: <20250724083914.61351-1-angelogioacchino.delregno@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Fix the pinctrl node names to adhere to the bindings, as the main pin node is supposed to be named like "uart0-pins" and the pinmux node named like "pins-bus". While at it, also cleanup all of the MTK_DRIVE_(x)mA by changing that to just the (x) number. Signed-off-by: AngeloGioacchino Del Regno Reviewed-by: Chen-Yu Tsai --- .../boot/dts/mediatek/mt8173-elm-hana.dtsi | 34 ++--- arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 138 +++++++++--------- arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 60 ++++---- arch/arm64/boot/dts/mediatek/mt8173.dtsi | 28 ++-- 4 files changed, 128 insertions(+), 132 deletions(-) diff --git a/arch/arm64/boot/dts/mediatek/mt8173-elm-hana.dtsi b/arch/arm64= /boot/dts/mediatek/mt8173-elm-hana.dtsi index dfc5c2f0ddef..1004eb8ea52c 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173-elm-hana.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8173-elm-hana.dtsi @@ -5,6 +5,14 @@ =20 #include "mt8173-elm.dtsi" =20 +&hdmi_mux_pins { + pins-mux { + pinmux =3D ; + bias-pull-up; + output-high; + }; +}; + &i2c0 { clock-frequency =3D <200000>; }; @@ -67,26 +75,16 @@ trackpad2: trackpad@2c { }; }; =20 -&mmc1 { - wp-gpios =3D <&pio 42 GPIO_ACTIVE_HIGH>; -}; - -&pio { - hdmi_mux_pins: hdmi_mux_pins { - pins2 { - pinmux =3D ; - bias-pull-up; - output-high; - }; +&mmc1_pins_default { + pins-wp { + pinmux =3D ; + input-enable; + bias-pull-up; }; +}; =20 - mmc1_pins_default: mmc1default { - pins_wp { - pinmux =3D ; - input-enable; - bias-pull-up; - }; - }; +&mmc1 { + wp-gpios =3D <&pio 42 GPIO_ACTIVE_HIGH>; }; =20 &touchscreen { diff --git a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi b/arch/arm64/boot= /dts/mediatek/mt8173-elm.dtsi index 0d995b342d46..9ec930058b92 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi @@ -601,8 +601,8 @@ &pio { "SOC_I2C4_1V8_SDA_400K", "SOC_I2C4_1V8_SCL_400K"; =20 - aud_i2s2: aud_i2s2 { - pins1 { + aud_i2s2: aud-i2s2-pins { + pins-bus { pinmux =3D , , , @@ -614,55 +614,55 @@ pins1 { }; }; =20 - bl_fixed_pins: bl_fixed_pins { - pins1 { + bl_fixed_pins: backlight-pins { + pins-blon { pinmux =3D ; output-low; }; }; =20 - bt_wake_pins: bt_wake_pins { - pins1 { + bt_wake_pins: bt-pins { + pins-wake { pinmux =3D ; bias-pull-up; }; }; =20 - disp_pwm0_pins: disp_pwm0_pins { + disp_pwm0_pins: disp-pwm0-pins { pins1 { pinmux =3D ; output-low; }; }; =20 - gpio_keys_pins: gpio_keys_pins { - volume_pins { + gpio_keys_pins: gpio-keys-pins { + pins-volumeupdn { pinmux =3D , ; bias-pull-up; }; =20 - tablet_mode_pins { + pins-tabletmode { pinmux =3D ; bias-pull-up; }; }; =20 - hdmi_mux_pins: hdmi_mux_pins { - pins1 { + hdmi_mux_pins: hdmi-pins { + pins-mux { pinmux =3D ; }; }; =20 - i2c1_pins_a: i2c1 { - da9211_pins { + i2c1_pins_a: i2c1-pins { + pins-da9211 { pinmux =3D ; bias-pull-up; }; }; =20 - mmc0_pins_default: mmc0default { - pins_cmd_dat { + mmc0_pins_default: mmc0-default-pins { + pins-cmd-dat { pinmux =3D , , , @@ -675,68 +675,68 @@ pins_cmd_dat { bias-pull-up; }; =20 - pins_clk { + pins-clk { pinmux =3D ; bias-pull-down; }; =20 - pins_rst { + pins-rst { pinmux =3D ; bias-pull-up; }; }; =20 - mmc1_pins_default: mmc1default { - pins_cmd_dat { + mmc1_pins_default: mmc1-default-pins { + pins-cmd-dat { pinmux =3D , , , , ; input-enable; - drive-strength =3D ; + drive-strength =3D <4>; bias-pull-up =3D ; }; =20 - pins_clk { + pins-clk { pinmux =3D ; bias-pull-down; - drive-strength =3D ; + drive-strength =3D <4>; }; =20 - pins_insert { + pins-insert { pinmux =3D ; bias-pull-up; }; }; =20 - mmc3_pins_default: mmc3default { - pins_dat { + mmc3_pins_default: mmc3-default-pins { + pins-dat { pinmux =3D , , , ; input-enable; - drive-strength =3D ; + drive-strength =3D <8>; bias-pull-up =3D ; }; =20 - pins_cmd { + pins-cmd { pinmux =3D ; input-enable; - drive-strength =3D ; + drive-strength =3D <8>; bias-pull-up =3D ; }; =20 - pins_clk { + pins-clk { pinmux =3D ; bias-pull-down; - drive-strength =3D ; + drive-strength =3D <8>; }; }; =20 - mmc0_pins_uhs: mmc0 { - pins_cmd_dat { + mmc0_pins_uhs: mmc0-uhs-pins { + pins-cmd-dat { pinmux =3D , , , @@ -747,109 +747,109 @@ pins_cmd_dat { , ; input-enable; - drive-strength =3D ; + drive-strength =3D <6>; bias-pull-up =3D ; }; =20 - pins_clk { + pins-clk { pinmux =3D ; - drive-strength =3D ; + drive-strength =3D <6>; bias-pull-down =3D ; }; =20 - pins_ds { + pins-ds { pinmux =3D ; drive-strength =3D ; bias-pull-down =3D ; }; =20 - pins_rst { + pins-rst { pinmux =3D ; bias-pull-up; }; }; =20 - mmc1_pins_uhs: mmc1 { - pins_cmd_dat { + mmc1_pins_uhs: mmc1-pins { + pins-cmd-dat { pinmux =3D , , , , ; input-enable; - drive-strength =3D ; + drive-strength =3D <6>; bias-pull-up =3D ; }; =20 - pins_clk { + pins-clk { pinmux =3D ; - drive-strength =3D ; + drive-strength =3D <8>; bias-pull-down =3D ; }; }; =20 - mmc3_pins_uhs: mmc3 { - pins_dat { + mmc3_pins_uhs: mmc3-pins { + pins-dat { pinmux =3D , , , ; input-enable; - drive-strength =3D ; + drive-strength =3D <8>; bias-pull-up =3D ; }; =20 - pins_cmd { + pins-cmd { pinmux =3D ; input-enable; - drive-strength =3D ; + drive-strength =3D <8>; bias-pull-up =3D ; }; =20 - pins_clk { + pins-clk { pinmux =3D ; - drive-strength =3D ; + drive-strength =3D <8>; bias-pull-down =3D ; }; }; =20 - nor_gpio1_pins: nor { + nor_gpio1_pins: nor-pins { pins1 { pinmux =3D , , ; input-enable; - drive-strength =3D ; + drive-strength =3D <4>; bias-pull-up; }; =20 pins2 { pinmux =3D ; - drive-strength =3D ; + drive-strength =3D <4>; bias-pull-up; }; =20 - pins_clk { + pins-clk { pinmux =3D ; input-enable; - drive-strength =3D ; + drive-strength =3D <4>; bias-pull-up; }; }; =20 - panel_backlight_en_pins: panel_backlight_en_pins { + panel_backlight_en_pins: panel-backlight-en-pins { pins1 { pinmux =3D ; }; }; =20 - panel_fixed_pins: panel_fixed_pins { + panel_fixed_pins: panel-fixed-pins { pins1 { pinmux =3D ; }; }; =20 - ps8640_pins: ps8640_pins { + ps8640_pins: ps8640-pins { pins1 { pinmux =3D , , @@ -857,33 +857,33 @@ pins1 { }; }; =20 - ps8640_fixed_pins: ps8640_fixed_pins { + ps8640_fixed_pins: ps8640-fixed-pins { pins1 { pinmux =3D ; }; }; =20 - rt5650_irq: rt5650_irq { - pins1 { + rt5650_irq: rt5650-pins { + pins-intn { pinmux =3D ; bias-pull-down; }; }; =20 - sdio_fixed_3v3_pins: sdio_fixed_3v3_pins { + sdio_fixed_3v3_pins: sdio-vreg-3v3-pins { pins1 { pinmux =3D ; output-low; }; }; =20 - spi_pins_a: spi1 { + spi_pins_a: spi1-pins { pins1 { pinmux =3D ; bias-pull-up; }; =20 - pins_spi { + pins-spi { pinmux =3D , , , @@ -892,15 +892,15 @@ pins_spi { }; }; =20 - trackpad_irq: trackpad_irq { - pins1 { + trackpad_irq: trackpad-pins { + pins-intn { pinmux =3D ; input-enable; bias-pull-up; }; }; =20 - usb_pins: usb { + usb_pins: usb-pins { pins1 { pinmux =3D ; output-high; @@ -908,8 +908,8 @@ pins1 { }; }; =20 - wifi_wake_pins: wifi_wake_pins { - pins1 { + wifi_wake_pins: wifi-pins { + pins-wake { pinmux =3D ; bias-pull-up; }; diff --git a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts b/arch/arm64/boot/= dts/mediatek/mt8173-evb.dts index 9fffed0ef4bf..51118a4149d8 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts +++ b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts @@ -172,15 +172,15 @@ &mmc1 { }; =20 &pio { - disp_pwm0_pins: disp_pwm0_pins { + disp_pwm0_pins: disp-pwm0-pins { pins1 { pinmux =3D ; output-low; }; }; =20 - mmc0_pins_default: mmc0default { - pins_cmd_dat { + mmc0_pins_default: mmc0-default-pins { + pins-cmd-dat { pinmux =3D , , , @@ -194,19 +194,19 @@ pins_cmd_dat { bias-pull-up; }; =20 - pins_clk { + pins-clk { pinmux =3D ; bias-pull-down; }; =20 - pins_rst { + pins-rst { pinmux =3D ; bias-pull-up; }; }; =20 - mmc1_pins_default: mmc1default { - pins_cmd_dat { + mmc1_pins_default: mmc1-default-pins { + pins-cmd-dat { pinmux =3D , , , @@ -217,20 +217,20 @@ pins_cmd_dat { bias-pull-up =3D ; }; =20 - pins_clk { + pins-clk { pinmux =3D ; bias-pull-down; drive-strength =3D <4>; }; =20 - pins_insert { + pins-insert { pinmux =3D ; bias-pull-up; }; }; =20 - mmc0_pins_uhs: mmc0 { - pins_cmd_dat { + mmc0_pins_uhs: mmc0-uhs-pins { + pins-cmd-dat { pinmux =3D , , , @@ -245,20 +245,29 @@ pins_cmd_dat { bias-pull-up =3D ; }; =20 - pins_clk { + pins-clk { pinmux =3D ; drive-strength =3D <2>; bias-pull-down =3D ; }; =20 - pins_rst { + pins-rst { pinmux =3D ; bias-pull-up; }; }; =20 - mmc1_pins_uhs: mmc1 { - pins_cmd_dat { + spi_pins_a: spi0-pins { + pins-bus { + pinmux =3D , + , + , + ; + }; + }; + + mmc1_pins_uhs: mmc1-uhs-pins { + pins-cmd-dat { pinmux =3D , , , @@ -269,22 +278,22 @@ pins_cmd_dat { bias-pull-up =3D ; }; =20 - pins_clk { + pins-clk { pinmux =3D ; drive-strength =3D <4>; bias-pull-down =3D ; }; }; =20 - usb_id_pins_float: usb_iddig_pull_up { - pins_iddig { + usb_id_pins_float: usb-iddig-pu-pins { + pins-iddig-pu { pinmux =3D ; bias-pull-up; }; }; =20 - usb_id_pins_ground: usb_iddig_pull_down { - pins_iddig { + usb_id_pins_ground: usb-iddig-pd-pins { + pins-iddig-pd { pinmux =3D ; bias-pull-down; }; @@ -473,17 +482,6 @@ mt6397_vibr_reg: ldo_vibr { }; }; =20 -&pio { - spi_pins_a: spi0 { - pins_spi { - pinmux =3D , - , - , - ; - }; - }; -}; - &spi { pinctrl-names =3D "default"; pinctrl-0 =3D <&spi_pins_a>; diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts= /mediatek/mt8173.dtsi index 122a57c3780b..78c2ccd5be13 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi @@ -391,58 +391,58 @@ pio: pinctrl@1000b000 { , ; =20 - hdmi_pin: xxx { + hdmi_pin: hdmi-hotplug-pins { =20 /*hdmi htplg pin*/ - pins1 { + pins-htplg { pinmux =3D ; input-enable; bias-pull-down; }; }; =20 - i2c0_pins_a: i2c0 { - pins1 { + i2c0_pins_a: i2c0-pins { + pins-bus { pinmux =3D , ; bias-disable; }; }; =20 - i2c1_pins_a: i2c1 { - pins1 { + i2c1_pins_a: i2c1-pins { + pins-bus { pinmux =3D , ; bias-disable; }; }; =20 - i2c2_pins_a: i2c2 { - pins1 { + i2c2_pins_a: i2c2-pins { + pins-bus { pinmux =3D , ; bias-disable; }; }; =20 - i2c3_pins_a: i2c3 { - pins1 { + i2c3_pins_a: i2c3-pins { + pins-bus { pinmux =3D , ; bias-disable; }; }; =20 - i2c4_pins_a: i2c4 { - pins1 { + i2c4_pins_a: i2c4-pins { + pins-bus { pinmux =3D , ; bias-disable; }; }; =20 - i2c6_pins_a: i2c6 { - pins1 { + i2c6_pins_a: i2c6-pins { + pins-bus { pinmux =3D , ; bias-disable; --=20 2.50.1