Skip to content

Commit 238f636

Browse files
committed
Merge tag 'imx-fixes-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes
i.MX fixes for 6.10: - Fix GPIO number for reg_usdhc2_vmmc on imx8qm-mek board. - Enable hysteresis for SODIMM_17 pin on imx8mm-verdin board to increase immunity against noise. - Remove 'no-sdio' property for uSDHC2 on imx93-11x11-evk board, so that SDIO cards could also work. - Fix BT shutdown GPIO for imx8mp-venice-gw73xx-2x board. - Fix panel node deleting on imx53-qsb-hdmi, as /delete-node/ directive doesn't really delete a node in a DT overlay. - Fix TC9595 input clock on DH i.MX8M Plus DHCOM SoM. - Fix GPU speed for imx8mm-verdin board by enabling overdrive mode in the SOM dtsi. * tag 'imx-fixes-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: arm64: dts: imx8qm-mek: fix gpio number for reg_usdhc2_vmmc arm64: dts: freescale: imx8mm-verdin: enable hysteresis on slow input pin arm64: dts: imx93-11x11-evk: Remove the 'no-sdio' property arm64: dts: freescale: imx8mp-venice-gw73xx-2x: fix BT shutdown GPIO arm: dts: imx53-qsb-hdmi: Disable panel instead of deleting node arm64: dts: imx8mp: Fix TC9595 input clock on DH i.MX8M Plus DHCOM SoM arm64: dts: freescale: imx8mm-verdin: Fix GPU speed Link: https://lore.kernel.org/r/Zm+xVUmFtaOnYBb4@dragon Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 6ba59ff + dfd239a commit 238f636

File tree

7 files changed

+10
-8
lines changed

7 files changed

+10
-8
lines changed

arch/arm/boot/dts/nxp/imx/imx53-qsb-common.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
};
8686
};
8787

88-
panel {
88+
panel_dpi: panel {
8989
compatible = "sii,43wvf1g";
9090
pinctrl-names = "default";
9191
pinctrl-0 = <&pinctrl_display_power>;

arch/arm/boot/dts/nxp/imx/imx53-qsb-hdmi.dtso

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
/plugin/;
1111

1212
&{/} {
13-
/delete-node/ panel;
14-
1513
hdmi: connector-hdmi {
1614
compatible = "hdmi-connector";
1715
label = "hdmi";
@@ -82,6 +80,10 @@
8280
};
8381
};
8482

83+
&panel_dpi {
84+
status = "disabled";
85+
};
86+
8587
&tve {
8688
status = "disabled";
8789
};

arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <dt-bindings/phy/phy-imx8-pcie.h>
77
#include <dt-bindings/pwm/pwm.h>
88
#include "imx8mm.dtsi"
9+
#include "imx8mm-overdrive.dtsi"
910

1011
/ {
1112
chosen {
@@ -935,7 +936,7 @@
935936
/* Verdin GPIO_9_DSI (pulled-up as active-low) */
936937
pinctrl_gpio_9_dsi: gpio9dsigrp {
937938
fsl,pins =
938-
<MX8MM_IOMUXC_NAND_RE_B_GPIO3_IO15 0x146>; /* SODIMM 17 */
939+
<MX8MM_IOMUXC_NAND_RE_B_GPIO3_IO15 0x1c6>; /* SODIMM 17 */
939940
};
940941

941942
/* Verdin GPIO_10_DSI (pulled-up as active-low) */

arch/arm64/boot/dts/freescale/imx8mp-dhcom-som.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@
254254
<&clk IMX8MP_CLK_CLKOUT2>,
255255
<&clk IMX8MP_AUDIO_PLL2_OUT>;
256256
assigned-clock-parents = <&clk IMX8MP_AUDIO_PLL2_OUT>;
257-
assigned-clock-rates = <13000000>, <13000000>, <156000000>;
257+
assigned-clock-rates = <13000000>, <13000000>, <208000000>;
258258
reset-gpios = <&gpio4 1 GPIO_ACTIVE_HIGH>;
259259
status = "disabled";
260260

arch/arm64/boot/dts/freescale/imx8mp-venice-gw73xx.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@
219219

220220
bluetooth {
221221
compatible = "brcm,bcm4330-bt";
222-
shutdown-gpios = <&gpio4 16 GPIO_ACTIVE_HIGH>;
222+
shutdown-gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
223223
};
224224
};
225225

arch/arm64/boot/dts/freescale/imx8qm-mek.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
regulator-name = "SD1_SPWR";
3737
regulator-min-microvolt = <3000000>;
3838
regulator-max-microvolt = <3000000>;
39-
gpio = <&lsio_gpio4 19 GPIO_ACTIVE_HIGH>;
39+
gpio = <&lsio_gpio4 7 GPIO_ACTIVE_HIGH>;
4040
enable-active-high;
4141
};
4242

arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,6 @@
296296
vmmc-supply = <&reg_usdhc2_vmmc>;
297297
bus-width = <4>;
298298
status = "okay";
299-
no-sdio;
300299
no-mmc;
301300
};
302301

0 commit comments

Comments
 (0)