Commit d0a59944 authored by Arnd Bergmann's avatar Arnd Bergmann

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

Merge tag 'imx-fixes-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes

i.MX fixes for 6.8:

- A tqma8mpql device tree fix to correct audio codec iov-supply.
- A couple of USB-C connector DT description revert to fix regression
  on imx8mp-dhcom-pdk3 and imx8mn-var-som-symphony board.
- Fix valid range check for imx-weim bus driver.
- Disable UART4 on Data Modul i.MX8M Plus eDM SBC to avoid boot hang
  in case that RDC protection is in place.

* tag 'imx-fixes-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  bus: imx-weim: fix valid range check
  Revert "arm64: dts: imx8mn-var-som-symphony: Describe the USB-C connector"
  Revert "arm64: dts: imx8mp-dhcom-pdk3: Describe the USB-C connector"
  arm64: dts: tqma8mpql: fix audio codec iov-supply
  arm64: dts: imx8mp: Disable UART4 by default on Data Modul i.MX8M Plus eDM SBC

Link: https://lore.kernel.org/r/20240206151744.2459-1-shawnguo2@yeah.netSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents fdf87a0d 7bca405c
...@@ -128,14 +128,9 @@ extcon_usbotg1: typec@3d { ...@@ -128,14 +128,9 @@ extcon_usbotg1: typec@3d {
pinctrl-0 = <&pinctrl_ptn5150>; pinctrl-0 = <&pinctrl_ptn5150>;
status = "okay"; status = "okay";
connector { port {
compatible = "usb-c-connector"; typec1_dr_sw: endpoint {
label = "USB-C"; remote-endpoint = <&usb1_drd_sw>;
port {
typec1_dr_sw: endpoint {
remote-endpoint = <&usb1_drd_sw>;
};
}; };
}; };
}; };
......
...@@ -486,7 +486,7 @@ &uart3 { /* A53 Debug */ ...@@ -486,7 +486,7 @@ &uart3 { /* A53 Debug */
&uart4 { &uart4 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart4>; pinctrl-0 = <&pinctrl_uart4>;
status = "okay"; status = "disabled";
}; };
&usb3_phy0 { &usb3_phy0 {
......
...@@ -175,14 +175,10 @@ typec@3d { ...@@ -175,14 +175,10 @@ typec@3d {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ptn5150>; pinctrl-0 = <&pinctrl_ptn5150>;
connector { port {
compatible = "usb-c-connector";
label = "USB-C"; ptn5150_out_ep: endpoint {
remote-endpoint = <&dwc3_0_ep>;
port {
ptn5150_out_ep: endpoint {
remote-endpoint = <&dwc3_0_ep>;
};
}; };
}; };
}; };
......
...@@ -184,6 +184,13 @@ reg_vcc_12v0: regulator-12v0 { ...@@ -184,6 +184,13 @@ reg_vcc_12v0: regulator-12v0 {
enable-active-high; enable-active-high;
}; };
reg_vcc_1v8: regulator-1v8 {
compatible = "regulator-fixed";
regulator-name = "VCC_1V8";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
reg_vcc_3v3: regulator-3v3 { reg_vcc_3v3: regulator-3v3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "VCC_3V3"; regulator-name = "VCC_3V3";
...@@ -480,7 +487,7 @@ tlv320aic3x04: audio-codec@18 { ...@@ -480,7 +487,7 @@ tlv320aic3x04: audio-codec@18 {
clock-names = "mclk"; clock-names = "mclk";
clocks = <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI3_MCLK1>; clocks = <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI3_MCLK1>;
reset-gpios = <&gpio4 29 GPIO_ACTIVE_LOW>; reset-gpios = <&gpio4 29 GPIO_ACTIVE_LOW>;
iov-supply = <&reg_vcc_3v3>; iov-supply = <&reg_vcc_1v8>;
ldoin-supply = <&reg_vcc_3v3>; ldoin-supply = <&reg_vcc_3v3>;
}; };
......
...@@ -120,7 +120,7 @@ static int imx_weim_gpr_setup(struct platform_device *pdev) ...@@ -120,7 +120,7 @@ static int imx_weim_gpr_setup(struct platform_device *pdev)
i++; i++;
} }
if (i == 0 || i % 4) if (i == 0)
goto err; goto err;
for (i = 0; i < ARRAY_SIZE(gprvals); i++) { for (i = 0; i < ARRAY_SIZE(gprvals); i++) {
......
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