Unverified Commit f8d1fc05 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

i.MX fixes for 5.17:

- Fix sound card model for MBa8Mx board.
- Drop i.MX8MQ LCDIF port node unit-address to fix DTC warning.
- Add missing SD card detect line for imx6qdl-udoo board.
- Remove MX23_PAD_SSP1_DETECT from imx23-evk hog group. It fixes the
  broken SD ard support on the board.
- A couple of fixes from Martin Kepplinger to fix the MIPI_CSI port
  number on i.MX8MQ.
- Re-enable ftm_alarm0 device on ls1028a-kontron-sl28 board which was
  disabled accidentally.
- Fix 'assigned-clocks-parents' typo in i.MX7ULP watchdog device node.
- Disable GPU device on imx8mn-venice-gw7902 board, as it uses
  MIMX8MN5CVTI SoC which does not integrate a GPU.

* tag 'imx-fixes-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: dts: imx8mq: fix lcdif port node
  arm64: dts: imx8mq-librem5: fix mipi_csi1 port number to sensor
  arm64: dts: imx8mq: fix mipi_csi bidirectional port numbers
  ARM: dts: imx7ulp: Fix 'assigned-clocks-parents' typo
  arm64: dts: ls1028a: sl28: re-enable ftm_alarm0
  arm64: dts: freescale: Fix sound card model for MBa8Mx
  ARM: dts: imx23-evk: Remove MX23_PAD_SSP1_DETECT from hog group
  ARM: dts: imx6qdl-udoo: Properly describe the SD card detect
  arm64: dts: imx8mn-venice-gw7902: disable gpu

Link: https://lore.kernel.org/r/20220129073150.GZ4686@dragon


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents cc0def5b 91f6d5f1

arch/arm/boot/dts/imx23-evk.dts

+0 −1
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ 
						MX23_PAD_LCD_RESET__GPIO_1_18

						MX23_PAD_PWM3__GPIO_1_29

						MX23_PAD_PWM4__GPIO_1_30

						MX23_PAD_SSP1_DETECT__SSP1_DETECT

					>;

					fsl,drive-strength = <MXS_DRIVE_4mA>;

					fsl,voltage = <MXS_VOLTAGE_HIGH>;

arch/arm/boot/dts/imx6qdl-udoo.dtsi

+4 −1
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
 * Author: Fabio Estevam <fabio.estevam@freescale.com>

 */



#include <dt-bindings/gpio/gpio.h>



/ {

	aliases {

		backlight = &backlight;
@@ -226,6 +228,7 @@ 
				MX6QDL_PAD_SD3_DAT1__SD3_DATA1		0x17059

				MX6QDL_PAD_SD3_DAT2__SD3_DATA2		0x17059

				MX6QDL_PAD_SD3_DAT3__SD3_DATA3		0x17059

				MX6QDL_PAD_SD3_DAT5__GPIO7_IO00		0x1b0b0

			>;

		};
@@ -304,7 +307,7 @@ 
&usdhc3 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usdhc3>;

	non-removable;

	cd-gpios = <&gpio7 0 GPIO_ACTIVE_LOW>;

	status = "okay";

};

arch/arm/boot/dts/imx7ulp.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ 
			interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&pcc2 IMX7ULP_CLK_WDG1>;

			assigned-clocks = <&pcc2 IMX7ULP_CLK_WDG1>;

			assigned-clocks-parents = <&scg1 IMX7ULP_CLK_FIRC_BUS_CLK>;

			assigned-clock-parents = <&scg1 IMX7ULP_CLK_FIRC_BUS_CLK>;

			timeout-sec = <40>;

		};

arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts

+4 −0
Original line number Diff line number Diff line
@@ -157,6 +157,10 @@ 
	};

};



&ftm_alarm0 {

	status = "okay";

};



&gpio1 {

	gpio-line-names =

		"", "", "", "", "", "", "", "",

arch/arm64/boot/dts/freescale/imx8mn-venice-gw7902.dts

+12 −0
Original line number Diff line number Diff line
@@ -220,6 +220,10 @@ 
	};

};



&disp_blk_ctrl {

	status = "disabled";

};



/* off-board header */

&ecspi2 {

	pinctrl-names = "default";
@@ -251,6 +255,10 @@ 
	};

};



&gpu {

	status = "disabled";

};



&i2c1 {

	clock-frequency = <100000>;

	pinctrl-names = "default";
@@ -546,6 +554,10 @@ 
	status = "okay";

};



&pgc_gpumix {

	status = "disabled";

};



/* off-board header */

&sai3 {

	pinctrl-names = "default";