projects
/
openwrt
/
staging
/
hauke.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ipq806x: remove mac-address-increment
[openwrt/staging/hauke.git]
/
target
/
linux
/
ipq806x
/
files
/
arch
/
arm
/
boot
/
dts
/
qcom-ipq8068-mr52.dts
diff --git
a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-mr52.dts
b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-mr52.dts
index f81e3ef690dcc33193dc381d166faedccf30bf62..522fa12fd977aa95c69fe9a720d8308384ddbe80 100644
(file)
--- a/
target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-mr52.dts
+++ b/
target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-mr52.dts
@@
-80,7
+80,7
@@
phy-mode = "sgmii";
phy-handle = <&phy0>;
phy-mode = "sgmii";
phy-handle = <&phy0>;
- nvmem-cells = <&mac_address>;
+ nvmem-cells = <&mac_address
0
>;
nvmem-cell-names = "mac-address";
};
nvmem-cell-names = "mac-address";
};
@@
-93,9
+93,8
@@
phy-mode = "sgmii";
phy-handle = <&phy4>;
phy-mode = "sgmii";
phy-handle = <&phy4>;
- nvmem-cells = <&mac_address>;
+ nvmem-cells = <&mac_address
1
>;
nvmem-cell-names = "mac-address";
nvmem-cell-names = "mac-address";
- mac-address-increment = <1>;
};
&gsbi7 {
};
&gsbi7 {
@@
-142,11
+141,17
@@
pagesize = <32>;
reg = <0x52>;
read-only;
pagesize = <32>;
reg = <0x52>;
read-only;
- #address-cells = <1>;
- #size-cells = <1>;
- mac_address: mac-address@66 {
- reg = <0x66 0x6>;
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ mac_address: mac-address@66 {
+ compatible = "mac-base";
+ reg = <0x66 0x6>;
+ #nvmem-cell-cells = <1>;
+ };
};
};
};
};
};
};
@@
-212,21
+217,18
@@
};
&wifi0 {
};
&wifi0 {
- nvmem-cells = <&mac_address>;
+ nvmem-cells = <&mac_address
4
>;
nvmem-cell-names = "mac-address";
nvmem-cell-names = "mac-address";
- mac-address-increment = <4>;
};
&wifi1 {
};
&wifi1 {
- nvmem-cells = <&mac_address>;
+ nvmem-cells = <&mac_address
3
>;
nvmem-cell-names = "mac-address";
nvmem-cell-names = "mac-address";
- mac-address-increment = <3>;
};
&wifi2 {
};
&wifi2 {
- nvmem-cells = <&mac_address>;
+ nvmem-cells = <&mac_address
2
>;
nvmem-cell-names = "mac-address";
nvmem-cell-names = "mac-address";
- mac-address-increment = <2>;
};
&hs_phy_0 {
};
&hs_phy_0 {