Commit 71fa4e04 authored by Shawn Guo's avatar Shawn Guo
Browse files

Merge tag 'imx-fixes-5.11-2' into imx/dt 

i.MX fixes for 5.11, round 2:

- Fix pcf2127 reset for imx7d-flex-concentrator board.
- Fix i.MX6 suspend with Thumb-2 kernel.
- Fix ethernet-phy address issue on imx6qdl-sr-som board.
- Fix GPIO3 `gpio-ranges` on i.MX8MP.
- Select SOC_BUS for IMX_SCU driver to fix build issue.
parents d36f964c 82c08278

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

+7 −0
Original line number Diff line number Diff line
@@ -16,6 +16,13 @@ chosen { 
		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 @@ reg_2p5v: ldo2 { 


			/* 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_out: endpoint { 


	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_lcd: i2c-gpio-lcd { 
		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_cam: i2c-gpio-cam { 
		i2c-gpio,delay-us = <2>; /* ~100 kHz */

		#address-cells = <1>;

		#size-cells = <0>;

		status = "disabld";

		status = "disabled";

	};

};

arch/arm/boot/dts/imx6qdl-sr-som.dtsi

+10 −2
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ vcc_3v3: regulator-vcc-3v3 { 
&fec {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_microsom_enet_ar8035>;

	phy-handle = <&phy>;

	phy-mode = "rgmii-id";

	phy-reset-duration = <2>;

	phy-reset-gpios = <&gpio4 15 GPIO_ACTIVE_LOW>;
@@ -63,10 +62,19 @@ mdio { 
		#address-cells = <1>;

		#size-cells = <0>;



		phy: ethernet-phy@0 {

		/*

		 * The PHY can appear at either address 0 or 4 due to the

		 * configuration (LED) pin not being pulled sufficiently.

		 */

		ethernet-phy@0 {

			reg = <0>;

			qca,clk-out-frequency = <125000000>;

		};



		ethernet-phy@4 {

			reg = <4>;

			qca,clk-out-frequency = <125000000>;

		};

	};

};

arch/arm/boot/dts/imx7d-flex-concentrator.dts

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ pcf2127: rtc@0 { 
		compatible = "nxp,pcf2127";

		reg = <0>;

		spi-max-frequency = <2000000>;

		reset-source;

	};

};