Unverified Commit d0a59944 authored Feb 20, 2024 by 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.net


Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents fdf87a0d 7bca405c

arch/arm64/boot/dts/freescale/imx8mn-var-som-symphony.dts

+3 −8

Original line number	Diff line number	Diff line
		@@ -128,10 +128,6 @@ extcon_usbotg1: typec@3d {
		pinctrl-0 = <&pinctrl_ptn5150>;
		status = "okay";

		connector {
		compatible = "usb-c-connector";
		label = "USB-C";

		port {
		typec1_dr_sw: endpoint {
		remote-endpoint = <&usb1_drd_sw>;
		@@ -139,7 +135,6 @@ typec1_dr_sw: endpoint {
		};
		};
		};
		};

		&i2c3 {
		/* Capacitive touch controller */

arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -486,7 +486,7 @@ &uart3 { /* A53 Debug */
		&uart4 {
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_uart4>;
		status = "okay";
		status = "disabled";
		};

		&usb3_phy0 {

arch/arm64/boot/dts/freescale/imx8mp-dhcom-pdk3.dts

+4 −8

Original line number	Diff line number	Diff line
		@@ -175,17 +175,13 @@ typec@3d {
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_ptn5150>;

		connector {
		compatible = "usb-c-connector";
		label = "USB-C";

		port {

		ptn5150_out_ep: endpoint {
		remote-endpoint = <&dwc3_0_ep>;
		};
		};
		};
		};

		power-sensor@40 {
		compatible = "ti,ina238";

arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts

+8 −1

Original line number	Diff line number	Diff line
		@@ -184,6 +184,13 @@ reg_vcc_12v0: regulator-12v0 {
		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 {
		compatible = "regulator-fixed";
		regulator-name = "VCC_3V3";
		@@ -480,7 +487,7 @@ tlv320aic3x04: audio-codec@18 {
		clock-names = "mclk";
		clocks = <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI3_MCLK1>;
		reset-gpios = <&gpio4 29 GPIO_ACTIVE_LOW>;
		iov-supply = <&reg_vcc_3v3>;
		iov-supply = <&reg_vcc_1v8>;
		ldoin-supply = <&reg_vcc_3v3>;
		};

drivers/bus/imx-weim.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -120,7 +120,7 @@ static int imx_weim_gpr_setup(struct platform_device *pdev)
		i++;
		}

		if (i == 0 \|\| i % 4)
		if (i == 0)
		goto err;

		for (i = 0; i < ARRAY_SIZE(gprvals); i++) {