Commit 62a23bb0 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-fixes-5.0-3' of... 

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

i.MX fixes for 5.0, 3rd round:

It contains a fix for i.MX8MQ EVK board device tree, which makes the
broken eMMC support work as expected.

* tag 'imx-fixes-5.0-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: dts: imx8mq: Fix boot from eMMC
parents d6780626 f2ce6ed3

arch/arm64/boot/dts/freescale/imx8mq-evk.dts

+22 −22
Original line number Diff line number Diff line
@@ -227,34 +227,34 @@ 


	pinctrl_usdhc1_100mhz: usdhc1-100grp {

		fsl,pins = <

			MX8MQ_IOMUXC_SD1_CLK_USDHC1_CLK			0x85

			MX8MQ_IOMUXC_SD1_CMD_USDHC1_CMD			0xc5

			MX8MQ_IOMUXC_SD1_DATA0_USDHC1_DATA0		0xc5

			MX8MQ_IOMUXC_SD1_DATA1_USDHC1_DATA1		0xc5

			MX8MQ_IOMUXC_SD1_DATA2_USDHC1_DATA2		0xc5

			MX8MQ_IOMUXC_SD1_DATA3_USDHC1_DATA3		0xc5

			MX8MQ_IOMUXC_SD1_DATA4_USDHC1_DATA4		0xc5

			MX8MQ_IOMUXC_SD1_DATA5_USDHC1_DATA5		0xc5

			MX8MQ_IOMUXC_SD1_DATA6_USDHC1_DATA6		0xc5

			MX8MQ_IOMUXC_SD1_DATA7_USDHC1_DATA7		0xc5

			MX8MQ_IOMUXC_SD1_STROBE_USDHC1_STROBE		0x85

			MX8MQ_IOMUXC_SD1_CLK_USDHC1_CLK			0x8d

			MX8MQ_IOMUXC_SD1_CMD_USDHC1_CMD			0xcd

			MX8MQ_IOMUXC_SD1_DATA0_USDHC1_DATA0		0xcd

			MX8MQ_IOMUXC_SD1_DATA1_USDHC1_DATA1		0xcd

			MX8MQ_IOMUXC_SD1_DATA2_USDHC1_DATA2		0xcd

			MX8MQ_IOMUXC_SD1_DATA3_USDHC1_DATA3		0xcd

			MX8MQ_IOMUXC_SD1_DATA4_USDHC1_DATA4		0xcd

			MX8MQ_IOMUXC_SD1_DATA5_USDHC1_DATA5		0xcd

			MX8MQ_IOMUXC_SD1_DATA6_USDHC1_DATA6		0xcd

			MX8MQ_IOMUXC_SD1_DATA7_USDHC1_DATA7		0xcd

			MX8MQ_IOMUXC_SD1_STROBE_USDHC1_STROBE		0x8d

			MX8MQ_IOMUXC_SD1_RESET_B_USDHC1_RESET_B		0xc1

		>;

	};



	pinctrl_usdhc1_200mhz: usdhc1-200grp {

		fsl,pins = <

			MX8MQ_IOMUXC_SD1_CLK_USDHC1_CLK			0x87

			MX8MQ_IOMUXC_SD1_CMD_USDHC1_CMD			0xc7

			MX8MQ_IOMUXC_SD1_DATA0_USDHC1_DATA0		0xc7

			MX8MQ_IOMUXC_SD1_DATA1_USDHC1_DATA1		0xc7

			MX8MQ_IOMUXC_SD1_DATA2_USDHC1_DATA2		0xc7

			MX8MQ_IOMUXC_SD1_DATA3_USDHC1_DATA3		0xc7

			MX8MQ_IOMUXC_SD1_DATA4_USDHC1_DATA4		0xc7

			MX8MQ_IOMUXC_SD1_DATA5_USDHC1_DATA5		0xc7

			MX8MQ_IOMUXC_SD1_DATA6_USDHC1_DATA6		0xc7

			MX8MQ_IOMUXC_SD1_DATA7_USDHC1_DATA7		0xc7

			MX8MQ_IOMUXC_SD1_STROBE_USDHC1_STROBE		0x87

			MX8MQ_IOMUXC_SD1_CLK_USDHC1_CLK			0x9f

			MX8MQ_IOMUXC_SD1_CMD_USDHC1_CMD			0xdf

			MX8MQ_IOMUXC_SD1_DATA0_USDHC1_DATA0		0xdf

			MX8MQ_IOMUXC_SD1_DATA1_USDHC1_DATA1		0xdf

			MX8MQ_IOMUXC_SD1_DATA2_USDHC1_DATA2		0xdf

			MX8MQ_IOMUXC_SD1_DATA3_USDHC1_DATA3		0xdf

			MX8MQ_IOMUXC_SD1_DATA4_USDHC1_DATA4		0xdf

			MX8MQ_IOMUXC_SD1_DATA5_USDHC1_DATA5		0xdf

			MX8MQ_IOMUXC_SD1_DATA6_USDHC1_DATA6		0xdf

			MX8MQ_IOMUXC_SD1_DATA7_USDHC1_DATA7		0xdf

			MX8MQ_IOMUXC_SD1_STROBE_USDHC1_STROBE		0x9f

			MX8MQ_IOMUXC_SD1_RESET_B_USDHC1_RESET_B		0xc1

		>;

	};

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

+2 −0
Original line number Diff line number Diff line
@@ -360,6 +360,8 @@ 
				         <&clk IMX8MQ_CLK_NAND_USDHC_BUS>,

				         <&clk IMX8MQ_CLK_USDHC1_ROOT>;

				clock-names = "ipg", "ahb", "per";

				assigned-clocks = <&clk IMX8MQ_CLK_USDHC1>;

				assigned-clock-rates = <400000000>;

				fsl,tuning-start-tap = <20>;

				fsl,tuning-step = <2>;

				bus-width = <4>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE