diff options
| author | Tony Lindgren <tony@atomide.com> | 2017-02-28 17:46:30 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2017-02-28 17:46:30 +0100 |
| commit | 1bd49882d78a9b976fe7380ec1bdeb454d68a358 (patch) | |
| tree | c4a296bce07fe871c89d84ae66ac4bb53af29346 /arch/arm/boot/dts/am335x-wega.dtsi | |
| parent | ARM: omap2plus_defconfig: Enable INPUT_MOUSEDEV as loadable modules (diff) | |
| parent | ARM: dts: am335x-pcm953: Fix legacy wakeup source binding (diff) | |
| download | linux-1bd49882d78a9b976fe7380ec1bdeb454d68a358.tar.xz linux-1bd49882d78a9b976fe7380ec1bdeb454d68a358.zip | |
Merge branch 'gpio-key-wakeup-fix' into omap-for-v4.11/fixes
Diffstat (limited to 'arch/arm/boot/dts/am335x-wega.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/am335x-wega.dtsi | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/am335x-wega.dtsi b/arch/arm/boot/dts/am335x-wega.dtsi index 02c67365c4e1..8ce541739b24 100644 --- a/arch/arm/boot/dts/am335x-wega.dtsi +++ b/arch/arm/boot/dts/am335x-wega.dtsi @@ -119,11 +119,17 @@ }; &cpsw_emac1 { - phy_id = <&davinci_mdio>, <1>; + phy-handle = <&phy1>; phy-mode = "mii"; dual_emac_res_vlan = <2>; }; +&davinci_mdio { + phy1: ethernet-phy@1 { + reg = <1>; + }; +}; + &mac { slaves = <2>; pinctrl-names = "default"; @@ -206,7 +212,6 @@ }; &usb0 { - dr_mode = "peripheral"; status = "okay"; }; |