Commit 8880bf6d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

i.MX fixes for 5.11:

- Fix backlight pwm on imx6qdl-kontron-samx6i which is lost from
  #pwm-cells conversion.
- Fix duplicated bus node name for i.MX8MN SoC.
- Fix reset register offset on LS1028A SoC.
- Rename MMC node aliases for imx6q-tbs2910 to keep the MMC device
  index consistent with previous kernel version.
- Selecting ARM_GIC_V3 on non-CP15 processors to fix one build failure
  with i.MX8M SoC driver.
- Fix typos with status property on imx6qdl-kontron-samx6i board.
- Fix duplicated regulator-name on imx6qdl-gw52xx board.

* tag 'imx-fixes-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx6qdl-gw52xx: fix duplicate regulator naming
  ARM: dts: imx6qdl-kontron-samx6i: fix i2c_lcd/cam default status
  ARM: imx: fix imx8m dependencies
  ARM: dts: tbs2910: rename MMC node aliases
  arm64: dts: ls1028a: fix the offset of the reset register
  arm64: dts: imx8mn: Fix duplicate node name
  ARM: dts: imx6qdl-kontron-samx6i: fix pwms for lcd-backlight

Link: https://lore.kernel.org/r/20210112131224.GI28365@dragon


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 7c53f6b6 5a22747b

arch/arm/boot/dts/imx6q-tbs2910.dts

+7 −0
Original line number Diff line number Diff line
@@ -16,6 +16,13 @@ 
		stdout-path = &uart1;

	};



	aliases {

		mmc0 = &usdhc2;

		mmc1 = &usdhc3;

		mmc2 = &usdhc4;

		/delete-property/ mmc3;

	};



	memory@10000000 {

		device_type = "memory";

		reg = <0x10000000 0x80000000>;

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

+1 −1
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ 


			/* VDD_AUD_1P8: Audio codec */

			reg_aud_1p8v: ldo3 {

				regulator-name = "vdd1p8";

				regulator-name = "vdd1p8a";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-boot-on;

arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ 


	lcd_backlight: lcd-backlight {

		compatible = "pwm-backlight";

		pwms = <&pwm4 0 5000000>;

		pwms = <&pwm4 0 5000000 0>;

		pwm-names = "LCD_BKLT_PWM";



		brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>;
@@ -167,7 +167,7 @@ 
		i2c-gpio,delay-us = <2>; /* ~100 kHz */

		#address-cells = <1>;

		#size-cells = <0>;

		status = "disabld";

		status = "disabled";

	};



	i2c_cam: i2c-gpio-cam {
@@ -179,7 +179,7 @@ 
		i2c-gpio,delay-us = <2>; /* ~100 kHz */

		#address-cells = <1>;

		#size-cells = <0>;

		status = "disabld";

		status = "disabled";

	};

};

arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ 
	reboot {

		compatible ="syscon-reboot";

		regmap = <&rst>;

		offset = <0xb0>;

		offset = <0>;

		mask = <0x02>;

	};

arch/arm64/boot/dts/freescale/imx8mn.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ 
			#size-cells = <1>;

			ranges;



			spba: bus@30000000 {

			spba: spba-bus@30000000 {

				compatible = "fsl,spba-bus", "simple-bus";

				#address-cells = <1>;

				#size-cells = <1>;