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 'amlogic-arm64-dt-for-v5.15-v2' of git://git.kernel.org/pub/scm/linux/kerne...
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
am335x-moxa-uc-2100-common.dtsi
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
4e90f9c
..
11e8f64
100644
(file)
--- 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>;
};
regulator-max-microvolt = <5000000>;
};
-&mac {
+&mac
_sw
{
pinctrl-names = "default";
pinctrl-0 = <&cpsw_default>;
status = "okay";
};
pinctrl-names = "default";
pinctrl-0 = <&cpsw_default>;
status = "okay";
};
-&davinci_mdio {
+&davinci_mdio
_sw
{
pinctrl-names = "default";
pinctrl-0 = <&davinci_mdio_default>;
status = "okay";
};
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 {
};
&sham {
@@
-150,7
+150,7
@@
status = "okay";
};
status = "okay";
};
-&gpio0 {
+&gpio0
_target
{
ti,no-reset-on-init;
};
ti,no-reset-on-init;
};