summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2022-04-14 22:59:53 +0200
committerArnd Bergmann <arnd@arndb.de>2022-04-14 22:59:53 +0200
commit803fa58dfa47dd5401a7c3ce3bbb6575e812fa22 (patch)
tree45a7910d4db412c19fb6f9e1d61159b8c6225e36 /arch/arm/boot/dts
parent24a4351e1c04de8e580bf06cae7f3a79094fe7f0 (diff)
parentf571e9c9aafed2fbd60fd99aa4b9823221338b98 (diff)
downloadlinux-803fa58dfa47dd5401a7c3ce3bbb6575e812fa22.tar.bz2
Merge tag 'imx-fixes-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes
i.MX fixes for 5.18: - Increase DOMAIN_MAX_CLKS in imx8m-blk-ctrl driver to fix an ISI hang on i.MX8MN. - Fix spi-tx-bus-width on imx8mq-tqma8mq board. - Fix an SGTL5000 detection issue by moving MCLK pinctrl into SGTL5000 codec node. - Fix spi2 pin configuration on imx8mm-venice board. - Fix SCU clock controller's compatible property for i.MX8QM. - Fix SAI device compatible for i.MX8MN. - A couple of fixes from Rob to address issues in boolean properties and touchscreen property sizes. - Fix OTG controller over-current configuration for imx8mm-venice-gw boards. - Fix NULL but dereferenced coccicheck error in imx-weim driver. * tag 'imx-fixes-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: arm64: dts: imx: Fix imx8*-var-som touchscreen property sizes ARM: dts: imx: Fix boolean properties with values ARM: dts: imx8mm-venice-gw{71xx,72xx,73xx}: fix OTG controller OC mode arm64: dts: imx8mn: Fix SAI nodes arm64: dts: imx8mq-tqma8mq: change the spi-nor tx ARM: dts: imx6qdl-apalis: Fix sgtl5000 detection issue soc: imx: imx8m-blk-ctrl: Fix IMX8MN_DISPBLK_PD_ISI hang arm64: dts: imx8qm: Correct SCU clock controller's compatible property arm64: dts: imx8mm-venice: fix spi2 pin configuration bus: imx-weim: fix NULL but dereferenced coccicheck error Link: https://lore.kernel.org/r/20220411024301.GH129381@dragon Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts')
-rw-r--r--arch/arm/boot/dts/imx6qdl-apalis.dtsi10
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
index ed2739e39085..bd763bae596b 100644
--- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
@@ -286,6 +286,8 @@
codec: sgtl5000@a {
compatible = "fsl,sgtl5000";
reg = <0x0a>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_sgtl5000>;
clocks = <&clks IMX6QDL_CLK_CKO>;
VDDA-supply = <&reg_module_3v3_audio>;
VDDIO-supply = <&reg_module_3v3>;
@@ -517,8 +519,6 @@
MX6QDL_PAD_DISP0_DAT21__AUD4_TXD 0x130b0
MX6QDL_PAD_DISP0_DAT22__AUD4_TXFS 0x130b0
MX6QDL_PAD_DISP0_DAT23__AUD4_RXD 0x130b0
- /* SGTL5000 sys_mclk */
- MX6QDL_PAD_GPIO_5__CCM_CLKO1 0x130b0
>;
};
@@ -811,6 +811,12 @@
>;
};
+ pinctrl_sgtl5000: sgtl5000grp {
+ fsl,pins = <
+ MX6QDL_PAD_GPIO_5__CCM_CLKO1 0x130b0
+ >;
+ };
+
pinctrl_spdif: spdifgrp {
fsl,pins = <
MX6QDL_PAD_GPIO_16__SPDIF_IN 0x1b0b0