Skip to content

Commit

Permalink
Merge tag 'imx-fixes-6.10' into imx/dt64
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Shawn Guo committed Jul 1, 2024
2 parents 2f8405f + dfd239a commit d77a66c
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/nxp/imx/imx53-qsb-common.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
};
};

panel {
panel_dpi: panel {
compatible = "sii,43wvf1g";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_display_power>;
Expand Down
6 changes: 4 additions & 2 deletions arch/arm/boot/dts/nxp/imx/imx53-qsb-hdmi.dtso
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
/plugin/;

&{/} {
/delete-node/ panel;

hdmi: connector-hdmi {
compatible = "hdmi-connector";
label = "hdmi";
Expand Down Expand Up @@ -82,6 +80,10 @@
};
};

&panel_dpi {
status = "disabled";
};

&tve {
status = "disabled";
};
3 changes: 2 additions & 1 deletion arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <dt-bindings/phy/phy-imx8-pcie.h>
#include <dt-bindings/pwm/pwm.h>
#include "imx8mm.dtsi"
#include "imx8mm-overdrive.dtsi"

/ {
chosen {
Expand Down Expand Up @@ -935,7 +936,7 @@
/* Verdin GPIO_9_DSI (pulled-up as active-low) */
pinctrl_gpio_9_dsi: gpio9dsigrp {
fsl,pins =
<MX8MM_IOMUXC_NAND_RE_B_GPIO3_IO15 0x146>; /* SODIMM 17 */
<MX8MM_IOMUXC_NAND_RE_B_GPIO3_IO15 0x1c6>; /* SODIMM 17 */
};

/* Verdin GPIO_10_DSI (pulled-up as active-low) */
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/freescale/imx8mp-dhcom-som.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@
<&clk IMX8MP_CLK_CLKOUT2>,
<&clk IMX8MP_AUDIO_PLL2_OUT>;
assigned-clock-parents = <&clk IMX8MP_AUDIO_PLL2_OUT>;
assigned-clock-rates = <13000000>, <13000000>, <156000000>;
assigned-clock-rates = <13000000>, <13000000>, <208000000>;
reset-gpios = <&gpio4 1 GPIO_ACTIVE_HIGH>;
status = "disabled";

Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/freescale/imx8mp-venice-gw73xx.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@

bluetooth {
compatible = "brcm,bcm4330-bt";
shutdown-gpios = <&gpio4 16 GPIO_ACTIVE_HIGH>;
shutdown-gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
};
};

Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/freescale/imx8qm-mek.dts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
regulator-name = "SD1_SPWR";
regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>;
gpio = <&lsio_gpio4 19 GPIO_ACTIVE_HIGH>;
gpio = <&lsio_gpio4 7 GPIO_ACTIVE_HIGH>;
enable-active-high;
};

Expand Down
1 change: 0 additions & 1 deletion arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,6 @@
vmmc-supply = <&reg_usdhc2_vmmc>;
bus-width = <4>;
status = "okay";
no-sdio;
no-mmc;
};

Expand Down

0 comments on commit d77a66c

Please sign in to comment.