Skip to content

Commit 803fa58

Browse files
arndbarndb
committed
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>
2 parents 24a4351 + f571e9c commit 803fa58

9 files changed

Lines changed: 26 additions & 15 deletions

File tree

‎arch/arm/boot/dts/imx6qdl-apalis.dtsi‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,8 @@
286286
codec: sgtl5000@a {
287287
compatible = "fsl,sgtl5000";
288288
reg = <0x0a>;
289+
pinctrl-names = "default";
290+
pinctrl-0 = <&pinctrl_sgtl5000>;
289291
clocks = <&clks IMX6QDL_CLK_CKO>;
290292
VDDA-supply = <&reg_module_3v3_audio>;
291293
VDDIO-supply = <&reg_module_3v3>;
@@ -517,8 +519,6 @@
517519
MX6QDL_PAD_DISP0_DAT21__AUD4_TXD 0x130b0
518520
MX6QDL_PAD_DISP0_DAT22__AUD4_TXFS 0x130b0
519521
MX6QDL_PAD_DISP0_DAT23__AUD4_RXD 0x130b0
520-
/* SGTL5000 sys_mclk */
521-
MX6QDL_PAD_GPIO_5__CCM_CLKO1 0x130b0
522522
>;
523523
};
524524

@@ -811,6 +811,12 @@
811811
>;
812812
};
813813

814+
pinctrl_sgtl5000: sgtl5000grp {
815+
fsl,pins = <
816+
MX6QDL_PAD_GPIO_5__CCM_CLKO1 0x130b0
817+
>;
818+
};
819+
814820
pinctrl_spdif: spdifgrp {
815821
fsl,pins = <
816822
MX6QDL_PAD_GPIO_16__SPDIF_IN 0x1b0b0

‎arch/arm64/boot/dts/freescale/imx8mm-venice-gw71xx.dtsi‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,14 @@
146146

147147
&usbotg1 {
148148
dr_mode = "otg";
149+
over-current-active-low;
149150
vbus-supply = <&reg_usb_otg1_vbus>;
150151
status = "okay";
151152
};
152153

153154
&usbotg2 {
154155
dr_mode = "host";
156+
disable-over-current;
155157
status = "okay";
156158
};
157159

@@ -215,7 +217,7 @@
215217
fsl,pins = <
216218
MX8MM_IOMUXC_ECSPI2_SCLK_ECSPI2_SCLK 0xd6
217219
MX8MM_IOMUXC_ECSPI2_MOSI_ECSPI2_MOSI 0xd6
218-
MX8MM_IOMUXC_ECSPI2_SCLK_ECSPI2_SCLK 0xd6
220+
MX8MM_IOMUXC_ECSPI2_MISO_ECSPI2_MISO 0xd6
219221
MX8MM_IOMUXC_ECSPI2_SS0_GPIO5_IO13 0xd6
220222
>;
221223
};

‎arch/arm64/boot/dts/freescale/imx8mm-venice-gw72xx.dtsi‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,12 +211,14 @@
211211

212212
&usbotg1 {
213213
dr_mode = "otg";
214+
over-current-active-low;
214215
vbus-supply = <&reg_usb_otg1_vbus>;
215216
status = "okay";
216217
};
217218

218219
&usbotg2 {
219220
dr_mode = "host";
221+
disable-over-current;
220222
vbus-supply = <&reg_usb_otg2_vbus>;
221223
status = "okay";
222224
};
@@ -309,7 +311,7 @@
309311
fsl,pins = <
310312
MX8MM_IOMUXC_ECSPI2_SCLK_ECSPI2_SCLK 0xd6
311313
MX8MM_IOMUXC_ECSPI2_MOSI_ECSPI2_MOSI 0xd6
312-
MX8MM_IOMUXC_ECSPI2_SCLK_ECSPI2_SCLK 0xd6
314+
MX8MM_IOMUXC_ECSPI2_MISO_ECSPI2_MISO 0xd6
313315
MX8MM_IOMUXC_ECSPI2_SS0_GPIO5_IO13 0xd6
314316
>;
315317
};

‎arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx.dtsi‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,12 +238,14 @@
238238

239239
&usbotg1 {
240240
dr_mode = "otg";
241+
over-current-active-low;
241242
vbus-supply = <&reg_usb_otg1_vbus>;
242243
status = "okay";
243244
};
244245

245246
&usbotg2 {
246247
dr_mode = "host";
248+
disable-over-current;
247249
vbus-supply = <&reg_usb_otg2_vbus>;
248250
status = "okay";
249251
};
@@ -358,7 +360,7 @@
358360
fsl,pins = <
359361
MX8MM_IOMUXC_ECSPI2_SCLK_ECSPI2_SCLK 0xd6
360362
MX8MM_IOMUXC_ECSPI2_MOSI_ECSPI2_MOSI 0xd6
361-
MX8MM_IOMUXC_ECSPI2_SCLK_ECSPI2_SCLK 0xd6
363+
MX8MM_IOMUXC_ECSPI2_MISO_ECSPI2_MISO 0xd6
362364
MX8MM_IOMUXC_ECSPI2_SS0_GPIO5_IO13 0xd6
363365
>;
364366
};

‎arch/arm64/boot/dts/freescale/imx8mn.dtsi‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@
293293
ranges;
294294

295295
sai2: sai@30020000 {
296-
compatible = "fsl,imx8mm-sai", "fsl,imx8mq-sai";
296+
compatible = "fsl,imx8mn-sai", "fsl,imx8mq-sai";
297297
reg = <0x30020000 0x10000>;
298298
interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
299299
clocks = <&clk IMX8MN_CLK_SAI2_IPG>,
@@ -307,7 +307,7 @@
307307
};
308308

309309
sai3: sai@30030000 {
310-
compatible = "fsl,imx8mm-sai", "fsl,imx8mq-sai";
310+
compatible = "fsl,imx8mn-sai", "fsl,imx8mq-sai";
311311
reg = <0x30030000 0x10000>;
312312
interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
313313
clocks = <&clk IMX8MN_CLK_SAI3_IPG>,
@@ -321,7 +321,7 @@
321321
};
322322

323323
sai5: sai@30050000 {
324-
compatible = "fsl,imx8mm-sai", "fsl,imx8mq-sai";
324+
compatible = "fsl,imx8mn-sai", "fsl,imx8mq-sai";
325325
reg = <0x30050000 0x10000>;
326326
interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>;
327327
clocks = <&clk IMX8MN_CLK_SAI5_IPG>,
@@ -337,7 +337,7 @@
337337
};
338338

339339
sai6: sai@30060000 {
340-
compatible = "fsl,imx8mm-sai", "fsl,imx8mq-sai";
340+
compatible = "fsl,imx8mn-sai", "fsl,imx8mq-sai";
341341
reg = <0x30060000 0x10000>;
342342
interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>;
343343
clocks = <&clk IMX8MN_CLK_SAI6_IPG>,
@@ -394,7 +394,7 @@
394394
};
395395

396396
sai7: sai@300b0000 {
397-
compatible = "fsl,imx8mm-sai", "fsl,imx8mq-sai";
397+
compatible = "fsl,imx8mn-sai", "fsl,imx8mq-sai";
398398
reg = <0x300b0000 0x10000>;
399399
interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
400400
clocks = <&clk IMX8MN_CLK_SAI7_IPG>,

‎arch/arm64/boot/dts/freescale/imx8mq-tqma8mq.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@
253253
#address-cells = <1>;
254254
#size-cells = <1>;
255255
spi-max-frequency = <84000000>;
256-
spi-tx-bus-width = <4>;
256+
spi-tx-bus-width = <1>;
257257
spi-rx-bus-width = <4>;
258258
};
259259
};

‎arch/arm64/boot/dts/freescale/imx8qm.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
};
197197

198198
clk: clock-controller {
199-
compatible = "fsl,imx8qxp-clk", "fsl,scu-clk";
199+
compatible = "fsl,imx8qm-clk", "fsl,scu-clk";
200200
#clock-cells = <2>;
201201
};
202202

‎drivers/bus/imx-weim.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,8 +352,7 @@ static int of_weim_notify(struct notifier_block *nb, unsigned long action,
352352

353353
pdev = of_find_device_by_node(rd->dn);
354354
if (!pdev) {
355-
dev_err(&pdev->dev,
356-
"Could not find platform device for '%pOF'\n",
355+
pr_err("Could not find platform device for '%pOF'\n",
357356
rd->dn);
358357

359358
ret = notifier_from_errno(-EINVAL);

‎drivers/soc/imx/imx8m-blk-ctrl.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ struct imx8m_blk_ctrl_domain_data {
5050
u32 mipi_phy_rst_mask;
5151
};
5252

53-
#define DOMAIN_MAX_CLKS 3
53+
#define DOMAIN_MAX_CLKS 4
5454

5555
struct imx8m_blk_ctrl_domain {
5656
struct generic_pm_domain genpd;

0 commit comments

Comments
 (0)