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 tag 'docs-5.11-2' of git://git.lwn.net/linux
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
am43x-epos-evm.dts
diff --git
a/arch/arm/boot/dts/am43x-epos-evm.dts
b/arch/arm/boot/dts/am43x-epos-evm.dts
index
de4fc78
..
f517d1e
100644
(file)
--- a/
arch/arm/boot/dts/am43x-epos-evm.dts
+++ b/
arch/arm/boot/dts/am43x-epos-evm.dts
@@
-550,29
+550,32
@@
cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
};
cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
};
-&mac {
+&mac
_sw
{
pinctrl-names = "default", "sleep";
pinctrl-0 = <&cpsw_default>;
pinctrl-1 = <&cpsw_sleep>;
status = "okay";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&cpsw_default>;
pinctrl-1 = <&cpsw_sleep>;
status = "okay";
- slaves = <1>;
};
};
-&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@16 {
reg = <16>;
};
};
ethphy0: ethernet-phy@16 {
reg = <16>;
};
};
-&cpsw_
emac0
{
+&cpsw_
port1
{
phy-handle = <ðphy0>;
phy-mode = "rmii";
phys = <&phy_gmii_sel 1 1>;
phy-handle = <ðphy0>;
phy-mode = "rmii";
phys = <&phy_gmii_sel 1 1>;
+ ti,dual-emac-pvid = <1>;
+};
+
+&cpsw_port2 {
+ status = "disabled";
};
&i2c0 {
};
&i2c0 {
@@
-833,6
+836,10
@@
status = "okay";
};
status = "okay";
};
+&rtc_target {
+ status = "disabled";
+};
+
&tscadc {
status = "okay";
&tscadc {
status = "okay";
@@
-948,7
+955,7
@@
};
&dss {
};
&dss {
- status = "ok";
+ status = "ok
ay
";
pinctrl-names = "default";
pinctrl-0 = <&dss_pins>;
pinctrl-names = "default";
pinctrl-0 = <&dss_pins>;