Unverified Commit 15eaaa71 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-fixes-6.15-2' of... 

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

i.MX fixes for 6.15, 2nd round:

- One more i.MX8MP nominal drive mode DT fix from Ahmad Fatoum to use
  800MHz NoC OPP
- A imx8mp-var-som DT change from Himanshu Bhavani to fix SD card
  timeout caused by LDO5

* tag 'imx-fixes-6.15-2' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: dts: imx8mp-var-som: Fix LDO5 shutdown causing SD card timeout
  arm64: dts: imx8mp: use 800MHz NoC OPP for nominal drive mode

Link: https://lore.kernel.org/r/aB6h/woeyG1bSo12@dragon


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 09acc326 c6888983

arch/arm64/boot/dts/freescale/imx8mp-nominal.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -88,3 +88,5 @@ &media_blk_ctrl { 
			       <0>, <0>, <400000000>,

			       <1039500000>;

};



/delete-node/ &{noc_opp_table/opp-1000000000};

arch/arm64/boot/dts/freescale/imx8mp-var-som.dtsi

+11 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ memory@40000000 { 
		      <0x1 0x00000000 0 0xc0000000>;

	};





	reg_usdhc2_vmmc: regulator-usdhc2-vmmc {

	        compatible = "regulator-fixed";

	        regulator-name = "VSD_3V3";
@@ -46,6 +45,16 @@ reg_usdhc2_vmmc: regulator-usdhc2-vmmc { 
	        startup-delay-us = <100>;

	        off-on-delay-us = <12000>;

	};



	reg_usdhc2_vqmmc: regulator-usdhc2-vqmmc {

		compatible = "regulator-gpio";

		regulator-name = "VSD_VSEL";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <3300000>;

		gpios = <&gpio2 12 GPIO_ACTIVE_HIGH>;

		states = <3300000 0x0 1800000 0x1>;

		vin-supply = <&ldo5>;

	};

};



&A53_0 {
@@ -205,6 +214,7 @@ &usdhc2 { 
        pinctrl-2 = <&pinctrl_usdhc2_200mhz>, <&pinctrl_usdhc2_gpio>;

        cd-gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;

        vmmc-supply = <&reg_usdhc2_vmmc>;

	vqmmc-supply = <&reg_usdhc2_vqmmc>;

        bus-width = <4>;

        status = "okay";

};

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

+6 −0
Original line number Diff line number Diff line
@@ -1645,6 +1645,12 @@ opp-200000000 { 
					opp-hz = /bits/ 64 <200000000>;

				};



				/* Nominal drive mode maximum */

				opp-800000000 {

					opp-hz = /bits/ 64 <800000000>;

				};



				/* Overdrive mode maximum */

				opp-1000000000 {

					opp-hz = /bits/ 64 <1000000000>;

				};