github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 02:53:36 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

i.MX fixes for 5.8, round 3:

Browse Source 
- 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.
 -----BEGIN PGP SIGNATURE-----
 
 iQFIBAABCgAyFiEEFmJXigPl4LoGSz08UFdYWoewfM4FAl8VFn0UHHNoYXduZ3Vv
 QGtlcm5lbC5vcmcACgkQUFdYWoewfM52gQf+OGrSQq1t77ltL5EKeeV8f+PCu7UP
 X7I2IJY+9FIYA1wuu0/AuhHaJ9NR0hN2mZVT+ktmxIDMVuHZJpAuHRfGp7anfVKr
 vo1JgT9CbVZ/kD0n5a6TN28Kb7DVkIM4QGcEJuCD2mb1UJarlVX8YHg9Otv7b26p
 3arPLR8eocPh2jNNdYnwSoZ8Li7Dm1SQloRAoCJOHAgAuSAdhG15rJBG70zX0F7d
 QEWu6tNjN8FSrWeT1GLlzywYxGp1t592yuUpKAoppuJgxyUPIYA15vRB0d/KRqUL
 CWYrDNh/dAvafI9HfeQQK5BjQhW58gy2c38s+bR9iPGoy88GzZiy+AatYQ==
 =NlnX
 -----END PGP SIGNATURE-----

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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2020-07-22 21:41:36 +02:00
commit 7c8c70ba5c
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/boot/dts/imx6qdl-icore.dtsi
View File

@ -397,7 +397,7 @@ MX6QDL_PAD_SD4_DAT1__PWM3_OUT 0x1b0b1
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_DAT0__SD1_DATA0 0x17070
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
>;
};

2
arch/arm/boot/dts/imx6sx-sabreauto.dts
View File

@ -99,7 +99,7 @@ ethphy1: ethernet-phy@1 {
&fec2 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet2>;
phy-mode = "rgmii";
phy-mode = "rgmii-id";
phy-handle = <&ethphy0>;
fsl,magic-packet;
status = "okay";

2
arch/arm/boot/dts/imx6sx-sdb.dtsi
View File

@ -213,7 +213,7 @@ ethphy2: ethernet-phy@2 {
&fec2 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet2>;
phy-mode = "rgmii";
phy-mode = "rgmii-id";
phy-handle = <&ethphy2>;
status = "okay";
};