diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-06-09 14:54:32 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-06-09 14:54:33 +0200 |
| commit | 739c4c317e20dbaab9b05780598932995e68b569 (patch) | |
| tree | 530229f2ee80812cb5146dc6960e43322e4d712d /arch/arm/boot/dts/am335x-baltos-ir2110.dts | |
| parent | c5c3f746c9baf9927c3358fdf7c152638d5a2ffb (diff) | |
| parent | 5cb957a188c7c71f6fdae6bc5a730eb7cbb676ca (diff) | |
Merge tag 'omap-for-v6.5/dt-pin-nodes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into soc/dt
Clean-up for pinctrl-single node names for omaps for v6.5
To avoid producing lots of make dtbs checks warnings when the yaml binding
for pinctrl-single gets merged, let's fix up the pin group node names. We
want to do this rather than add non-standard node name workarounds to the
yaml binding.
Also included is a non-urgent fix to move gta04 model name out of the pinmux
node that can wait for the merge window.
* tag 'omap-for-v6.5/dt-pin-nodes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: dts: Unify pinctrl-single pin group nodes for dra7
ARM: dts: Unify pinctrl-single pin group nodes for am4
ARM: dts: Unify pinctrl-single pin group nodes for am33xx
ARM: dts: Unify pinctrl-single pin group nodes for ti81xx
ARM: dts: Unify pinctrl-single pin group nodes for omap5
ARM: dts: Unify pinctrl-single pin group nodes for omap4
ARM: dts: Unify pinctrl-single pin group nodes for omap2
ARM: dts: Unify pinctrl-single pin group nodes for omap3
ARM: dts: gta04: Move model property out of pinctrl node
Link: https://lore.kernel.org/r/pull-1685700720-242492@atomide.com-2
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/am335x-baltos-ir2110.dts')
| -rw-r--r-- | arch/arm/boot/dts/am335x-baltos-ir2110.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/am335x-baltos-ir2110.dts b/arch/arm/boot/dts/am335x-baltos-ir2110.dts index 75992eec830f..ea5882ed7010 100644 --- a/arch/arm/boot/dts/am335x-baltos-ir2110.dts +++ b/arch/arm/boot/dts/am335x-baltos-ir2110.dts @@ -18,7 +18,7 @@ }; &am33xx_pinmux { - uart1_pins: pinmux_uart1_pins { + uart1_pins: uart1-pins { pinctrl-single,pins = < AM33XX_PADCONF(AM335X_PIN_UART1_RXD, PIN_INPUT, MUX_MODE0) AM33XX_PADCONF(AM335X_PIN_UART1_TXD, PIN_INPUT, MUX_MODE0) @@ -31,7 +31,7 @@ >; }; - mmc1_pins: pinmux_mmc1_pins { + mmc1_pins: mmc1-pins { pinctrl-single,pins = < AM33XX_PADCONF(AM335X_PIN_GPMC_AD15, PIN_INPUT, MUX_MODE7) /* MMC1 CD */ >; |