diff options
author | Tony Lindgren <tony@atomide.com> | 2021-01-18 10:03:24 +0200 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2021-01-18 10:03:24 +0200 |
commit | 87ab16b644f33620db395c1f569b0fca8768161a (patch) | |
tree | 31764e1de6544ddcac5a98371c0d36e7e9e36d26 /arch/arm/boot/dts/am335x-evmsk.dts | |
parent | 5c8fe583cce542aa0b84adc939ce85293de36e5e (diff) | |
parent | 4d4ce69f19d4991701e84d5eaa0fc0e506210042 (diff) |
Merge tag 'omap-for-v5.11/dt-late-signed' into omap-for-v5.12-dt
Late devicetree changes for omaps for v5.11 merge window
Here are few more late changes that would be nice to get into v5.11:
- More updates to use cpsw switchdev driver
- Enable gta04 PMIC power management
- Updates for dra7 for ECC support, 1.8GHz speed and keep the
ldo0 regulator always on as specified in the data manual
Diffstat (limited to 'arch/arm/boot/dts/am335x-evmsk.dts')
-rw-r--r-- | arch/arm/boot/dts/am335x-evmsk.dts | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts index b43b94122d3c..d5f8d5e2eb5d 100644 --- a/arch/arm/boot/dts/am335x-evmsk.dts +++ b/arch/arm/boot/dts/am335x-evmsk.dts @@ -596,19 +596,17 @@ }; }; -&mac { +&mac_sw { pinctrl-names = "default", "sleep"; pinctrl-0 = <&cpsw_default>; pinctrl-1 = <&cpsw_sleep>; - dual_emac = <1>; status = "okay"; }; -&davinci_mdio { +&davinci_mdio_sw { pinctrl-names = "default", "sleep"; pinctrl-0 = <&davinci_mdio_default>; pinctrl-1 = <&davinci_mdio_sleep>; - status = "okay"; ethphy0: ethernet-phy@0 { reg = <0>; @@ -619,16 +617,16 @@ }; }; -&cpsw_emac0 { +&cpsw_port1 { phy-handle = <ðphy0>; phy-mode = "rgmii-id"; - dual_emac_res_vlan = <1>; + ti,dual-emac-pvid = <1>; }; -&cpsw_emac1 { +&cpsw_port2 { phy-handle = <ðphy1>; phy-mode = "rgmii-id"; - dual_emac_res_vlan = <2>; + ti,dual-emac-pvid = <2>; }; &mmc1 { |