diff options
author | Arnd Bergmann <arnd@arndb.de> | 2024-09-05 10:18:04 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2024-09-05 10:18:07 +0000 |
commit | 9c6a3382f5ac44992db158315d2b9b8fb032c0fc (patch) | |
tree | c62083903960b7b805deb1d5e754d988247754fd /arch/arm/boot/dts/nxp/mxs/imx23-xfi3.dts | |
parent | 701f86fce5c9e8bdd0d69f6e63bb044b1fffdd03 (diff) | |
parent | c30f4711b8bf938c447750f31eb6ad00a67782b1 (diff) |
Merge tag 'imx-dt-6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/dt
i.MX ARM device tree changes for 6.12:
- A series from Fabio Estevam to fix dt-schema warnings on i.MX23,
i.MX28 and i.MX27 device trees
- A bunch of changes from Krzysztof Kozlowski that corrects TQ Systems
DTS patterns in MAINTAINERS file and fix various dt-schema warnings
- A couple changes from Liu Ying to improve HDMI support on i.MX53 QSB
board
- A series from Lukasz Majewski to update imx28-lwe device tree, fixing
partition definitions, reducing SPI frequency and cleaning up SAIF
- A series from Markus Niebel to improve TQ-Systems device trees, adding
iio-hwmon device, using better compatible for LM75 temp sensor, moving
I2C3 pinmux to a better place
* tag 'imx-dt-6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (27 commits)
ARM: dts: imx28-lwe: Remove saif[01] definitions
ARM: dts: imx28-lwe: Reduce maximal SPI frequency
ARM: dts: imx28-lwe: Fix partitions definitions
ARM: dts: imx6qdl: align pin config nodes with bindings
ARM: dts: imx6sl: align pin config nodes with bindings
ARM: dts: imx6ul: align pin config nodes with bindings
ARM: dts: imx6ul-tx6ul: drop empty pinctrl placeholder
ARM: dts: imx28-tx28: Fix the fsl,saif-master usage
ARM: dts: imx6ull-seeed-npi: fix fsl,pins property in tscgrp pinctrl
ARM: dts: imx6ul-geam: fix fsl,pins property in tscgrp pinctrl
ARM: dts: imx23/8: Rename apbh and apbx nodes
ARM: dts: imx6qdl-mba6b: remove doubled entry for I2C1 pinmux
ARM: dts: imx6qdl-mba6: improve compatible for LM75 temp sensor
ARM: dts: imx6qdl-tqma6: improve compatible for LM75 temp sensor
ARM: dts: imx6qdl-tqma6: move i2c3 pinmux to imx6qdl-tqma6b
ARM: dts: imx7d-sdb: align pin config nodes with bindings
ARM: dts: imx7: align pin config nodes with bindings
ARM: dts: imx7d-zii-rmu2: fix Ethernet PHY pinctrl property
MAINTAINERS: correct TQ Systems DTS patterns
ARM: dts: imx6: update spdif sound card node properties
...
Link: https://lore.kernel.org/r/20240904143439.211552-4-shawnguo2@yeah.net
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/nxp/mxs/imx23-xfi3.dts')
-rw-r--r-- | arch/arm/boot/dts/nxp/mxs/imx23-xfi3.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/nxp/mxs/imx23-xfi3.dts b/arch/arm/boot/dts/nxp/mxs/imx23-xfi3.dts index 28341d8315c2..0b088c8ab6b6 100644 --- a/arch/arm/boot/dts/nxp/mxs/imx23-xfi3.dts +++ b/arch/arm/boot/dts/nxp/mxs/imx23-xfi3.dts @@ -54,7 +54,7 @@ }; apb@80000000 { - apbh@80000000 { + apbh-bus@80000000 { ssp0: spi@80010000 { compatible = "fsl,imx23-mmc"; pinctrl-names = "default"; @@ -101,7 +101,7 @@ }; }; - apbx@80040000 { + apbx-bus@80040000 { i2c: i2c@80058000 { pinctrl-names = "default"; pinctrl-0 = <&i2c_pins_a>; |