projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'pm-cpufreq', 'pm-sleep' and 'pm-em'
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
am335x-cm-t335.dts
diff --git
a/arch/arm/boot/dts/am335x-cm-t335.dts
b/arch/arm/boot/dts/am335x-cm-t335.dts
index
688e14e
..
d9f003d
100644
(file)
--- a/
arch/arm/boot/dts/am335x-cm-t335.dts
+++ b/
arch/arm/boot/dts/am335x-cm-t335.dts
@@
-413,28
+413,31
@@
status = "okay";
status = "okay";
};
status = "okay";
};
-&mac {
+&mac
_sw
{
pinctrl-names = "default", "sleep";
pinctrl-0 = <&cpsw_default>;
pinctrl-1 = <&cpsw_sleep>;
pinctrl-names = "default", "sleep";
pinctrl-0 = <&cpsw_default>;
pinctrl-1 = <&cpsw_sleep>;
- slaves = <1>;
status = "okay";
};
status = "okay";
};
-&davinci_mdio {
+&davinci_mdio
_sw
{
pinctrl-names = "default", "sleep";
pinctrl-0 = <&davinci_mdio_default>;
pinctrl-1 = <&davinci_mdio_sleep>;
pinctrl-names = "default", "sleep";
pinctrl-0 = <&davinci_mdio_default>;
pinctrl-1 = <&davinci_mdio_sleep>;
- status = "okay";
ethphy0: ethernet-phy@0 {
reg = <0>;
};
};
ethphy0: ethernet-phy@0 {
reg = <0>;
};
};
-&cpsw_
emac0
{
+&cpsw_
port1
{
phy-handle = <ðphy0>;
phy-mode = "rgmii-txid";
phy-handle = <ðphy0>;
phy-mode = "rgmii-txid";
+ ti,dual-emac-pvid = <1>;
+};
+
+&cpsw_port2 {
+ status = "disabled";
};
&mmc1 {
};
&mmc1 {