diff options
| author | Olof Johansson <olof@lixom.net> | 2015-12-22 20:49:21 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-12-22 20:49:21 +0100 |
| commit | 8b9c13347a21aad4a35ac8b4214f55bc1e43ba16 (patch) | |
| tree | cd103d081e1e7d1a7370a8bd0ed832c4299b4f33 /arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | |
| parent | bus: sunxi-rsb: Fix peripheral IC mapping runtime address (diff) | |
| parent | ARM: dts: imx6: Fix Ethernet PHY mode on Ventana boards (diff) | |
| download | linux-8b9c13347a21aad4a35ac8b4214f55bc1e43ba16.tar.xz linux-8b9c13347a21aad4a35ac8b4214f55bc1e43ba16.zip | |
Merge tag 'imx-fixes-4.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes
The i.MX fixes for 4.4, 3rd round:
- Fix Ethernet PHY mode on i.MX6 Ventana boards, which can result in
a non-functional Ethernet when Marvell phy driver rather than generic
phy driver is selected.
- Fix an assigned-clock configuration bug on imx6qdl-sabreauto board
which was introduced by commit ed339363de1b ("ARM: dts:
imx6qdl-sabreauto: Allow HDMI and LVDS to work simultaneously").
* tag 'imx-fixes-4.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: dts: imx6: Fix Ethernet PHY mode on Ventana boards
ARM: dts: imx: Fix the assigned-clock mismatch issue on imx6q/dl
Diffstat (limited to 'arch/arm/boot/dts/imx6qdl-gw51xx.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi index 7b31fdb79ced..dc0cebfe22d7 100644 --- a/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi +++ b/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi @@ -94,7 +94,7 @@ &fec { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; - phy-mode = "rgmii"; + phy-mode = "rgmii-id"; phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>; status = "okay"; }; |