Commit 7c8c70ba authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

i.MX fixes for 5.8, round 3:

- A couple of FEC2 phy-mode fixes on imx6sx-sabreauto and imx6sx-sdb
  board.
- One fix on imx6qdl-icore pin muxing to get USB OTG_ID and SD card
  detect work correctly.

* tag 'imx-fixes-5.8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx6qdl-icore: Fix OTG_ID pin and sdcard detect
  ARM: dts: imx6sx-sabreauto: Fix the phy-mode on fec2
  ARM: dts: imx6sx-sdb: Fix the phy-mode on fec2

Link: https://lore.kernel.org/r/20200720040148.GA20462@dragon


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 21a59e0b 4a601da9

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

+2 −1
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ 


	pinctrl_usbotg: usbotggrp {

		fsl,pins = <

			MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059

			MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059

		>;

	};
@@ -409,6 +409,7 @@ 
			MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x17070

			MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x17070

			MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x17070

			MX6QDL_PAD_GPIO_1__GPIO1_IO01  0x1b0b0

		>;

	};

arch/arm/boot/dts/imx6sx-sabreauto.dts

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ 
&fec2 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_enet2>;

	phy-mode = "rgmii";

	phy-mode = "rgmii-id";

	phy-handle = <&ethphy0>;

	fsl,magic-packet;

	status = "okay";

arch/arm/boot/dts/imx6sx-sdb.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ 
&fec2 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_enet2>;

	phy-mode = "rgmii";

	phy-mode = "rgmii-id";

	phy-handle = <&ethphy2>;

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE