Commit 238f636d authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'imx-fixes-6.10' of...

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@dragonSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 6ba59ff4 dfd239a0
...@@ -85,7 +85,7 @@ led-user { ...@@ -85,7 +85,7 @@ led-user {
}; };
}; };
panel { panel_dpi: panel {
compatible = "sii,43wvf1g"; compatible = "sii,43wvf1g";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_display_power>; pinctrl-0 = <&pinctrl_display_power>;
......
...@@ -10,8 +10,6 @@ ...@@ -10,8 +10,6 @@
/plugin/; /plugin/;
&{/} { &{/} {
/delete-node/ panel;
hdmi: connector-hdmi { hdmi: connector-hdmi {
compatible = "hdmi-connector"; compatible = "hdmi-connector";
label = "hdmi"; label = "hdmi";
...@@ -82,6 +80,10 @@ sii9022_out: endpoint { ...@@ -82,6 +80,10 @@ sii9022_out: endpoint {
}; };
}; };
&panel_dpi {
status = "disabled";
};
&tve { &tve {
status = "disabled"; status = "disabled";
}; };
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include <dt-bindings/phy/phy-imx8-pcie.h> #include <dt-bindings/phy/phy-imx8-pcie.h>
#include <dt-bindings/pwm/pwm.h> #include <dt-bindings/pwm/pwm.h>
#include "imx8mm.dtsi" #include "imx8mm.dtsi"
#include "imx8mm-overdrive.dtsi"
/ { / {
chosen { chosen {
...@@ -935,7 +936,7 @@ pinctrl_gpio8: gpio8grp { ...@@ -935,7 +936,7 @@ pinctrl_gpio8: gpio8grp {
/* Verdin GPIO_9_DSI (pulled-up as active-low) */ /* Verdin GPIO_9_DSI (pulled-up as active-low) */
pinctrl_gpio_9_dsi: gpio9dsigrp { pinctrl_gpio_9_dsi: gpio9dsigrp {
fsl,pins = 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) */ /* Verdin GPIO_10_DSI (pulled-up as active-low) */
......
...@@ -254,7 +254,7 @@ tc_bridge: bridge@f { ...@@ -254,7 +254,7 @@ tc_bridge: bridge@f {
<&clk IMX8MP_CLK_CLKOUT2>, <&clk IMX8MP_CLK_CLKOUT2>,
<&clk IMX8MP_AUDIO_PLL2_OUT>; <&clk IMX8MP_AUDIO_PLL2_OUT>;
assigned-clock-parents = <&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>; reset-gpios = <&gpio4 1 GPIO_ACTIVE_HIGH>;
status = "disabled"; status = "disabled";
......
...@@ -219,7 +219,7 @@ &uart3 { ...@@ -219,7 +219,7 @@ &uart3 {
bluetooth { bluetooth {
compatible = "brcm,bcm4330-bt"; compatible = "brcm,bcm4330-bt";
shutdown-gpios = <&gpio4 16 GPIO_ACTIVE_HIGH>; shutdown-gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
}; };
}; };
......
...@@ -36,7 +36,7 @@ reg_usdhc2_vmmc: usdhc2-vmmc { ...@@ -36,7 +36,7 @@ reg_usdhc2_vmmc: usdhc2-vmmc {
regulator-name = "SD1_SPWR"; regulator-name = "SD1_SPWR";
regulator-min-microvolt = <3000000>; regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>; regulator-max-microvolt = <3000000>;
gpio = <&lsio_gpio4 19 GPIO_ACTIVE_HIGH>; gpio = <&lsio_gpio4 7 GPIO_ACTIVE_HIGH>;
enable-active-high; enable-active-high;
}; };
......
...@@ -296,7 +296,6 @@ &usdhc2 { ...@@ -296,7 +296,6 @@ &usdhc2 {
vmmc-supply = <&reg_usdhc2_vmmc>; vmmc-supply = <&reg_usdhc2_vmmc>;
bus-width = <4>; bus-width = <4>;
status = "okay"; status = "okay";
no-sdio;
no-mmc; no-mmc;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment