diff options
| author | Olof Johansson <olof@lixom.net> | 2019-04-28 13:24:29 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-04-28 13:24:29 -0700 |
| commit | f1e776420a3f56e794f2b41e81446fe756ecb04c (patch) | |
| tree | 8d6d4bd5de0e05cfddb6a1d2cbdbde02fc3f0199 /arch/arm/boot/dts/imx6q-marsboard.dts | |
| parent | 085b7755808aa11f78ab9377257e1dad2e6fa4bb (diff) | |
| parent | 7aedca875074b33795bc77066b325898b1eb8032 (diff) | |
Merge tag 'imx-fixes-5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes
i.MX fixes for 5.1, round 2:
- A couple of imx6q-logicpd device tree fixes to reduce inrush current,
so that the board can always work properly.
- Fix buggy device trees that use AR803X to set up phy-mode as
rgmii-id. These device trees are broken since day one, and the bug
gets exposed by the AR803X phy driver changes. i.MX community agreed
to fix those broken device trees rather than supporting messy back
compatibility in driver code.
* tag 'imx-fixes-5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: dts: imx6q-logicpd: Reduce inrush current on USBH1
ARM: dts: imx6q-logicpd: Reduce inrush current on start
ARM: dts: imx: Fix the AR803X phy-mode
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/imx6q-marsboard.dts')
| -rw-r--r-- | arch/arm/boot/dts/imx6q-marsboard.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6q-marsboard.dts b/arch/arm/boot/dts/imx6q-marsboard.dts index d8ccb533b6b7..84b30bd6908f 100644 --- a/arch/arm/boot/dts/imx6q-marsboard.dts +++ b/arch/arm/boot/dts/imx6q-marsboard.dts @@ -110,7 +110,7 @@ &fec { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; - phy-mode = "rgmii"; + phy-mode = "rgmii-id"; phy-reset-gpios = <&gpio3 31 GPIO_ACTIVE_LOW>; status = "okay"; }; |