X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=arch%2Farm%2Fboot%2Fdts%2Fam335x-moxa-uc-2100-common.dtsi;h=11e8f64b660646c92bc17cdc23a04ccfc7085f3f;hb=fba65f104ea83d188ef470a3f32c519a7f4b5796;hp=4e90f9c23d2e57eae56d93318319fcbf78b3edef;hpb=6f2f486d57c4d562cdf4932320b66fbb878ab1c4;p=linux-2.6-microblaze.git diff --git a/arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi b/arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi index 4e90f9c23d2e..11e8f64b6606 100644 --- a/arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi +++ b/arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi @@ -122,24 +122,24 @@ regulator-max-microvolt = <5000000>; }; -&mac { +&mac_sw { pinctrl-names = "default"; pinctrl-0 = <&cpsw_default>; status = "okay"; }; -&davinci_mdio { +&davinci_mdio_sw { pinctrl-names = "default"; pinctrl-0 = <&davinci_mdio_default>; status = "okay"; }; -&cpsw_emac0 { - status = "okay"; +&cpsw_port1 { + ti,dual-emac-pvid = <1>; }; -&cpsw_emac1 { - status = "okay"; +&cpsw_port2 { + ti,dual-emac-pvid = <2>; }; &sham { @@ -150,7 +150,7 @@ status = "okay"; }; -&gpio0 { +&gpio0_target { ti,no-reset-on-init; };