diff options
| author | Christian Lamparter <chunkeey@gmail.com> | 2023-07-21 16:44:11 +0200 |
|---|---|---|
| committer | Christian Lamparter <chunkeey@gmail.com> | 2023-10-20 18:13:37 +0200 |
| commit | 0ba5c0bdc1ebddb50ab34806343d77baf54044be (patch) | |
| tree | 900cd57390021f62d18ccf9734a0415748a09acc /target/linux | |
| parent | d82c5884c6164856e830894d9bfacd218d430ba4 (diff) | |
| download | upstream-0ba5c0bdc1ebddb50ab34806343d77baf54044be.tar.gz upstream-0ba5c0bdc1ebddb50ab34806343d77baf54044be.tar.bz2 upstream-0ba5c0bdc1ebddb50ab34806343d77baf54044be.zip | |
ath79: AP105: use fixed layout cell "mac-base"
This drops a use of the deprecated "mac-address-increment".
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/ath79/dts/ar7161_aruba_ap-105.dts | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/target/linux/ath79/dts/ar7161_aruba_ap-105.dts b/target/linux/ath79/dts/ar7161_aruba_ap-105.dts index 949d70ec07a..32d403fe6cd 100644 --- a/target/linux/ath79/dts/ar7161_aruba_ap-105.dts +++ b/target/linux/ath79/dts/ar7161_aruba_ap-105.dts @@ -96,9 +96,8 @@ ath9k0: wifi@0,11 { /* 2.4 GHz */ compatible = "pci168c,0029"; - nvmem-cells = <&macaddr_hwinfo_1c>; + nvmem-cells = <&macaddr_hwinfo_1c 1>; nvmem-cell-names = "mac-address"; - mac-address-increment = <1>; reg = <0x8800 0 0 0 0>; #gpio-cells = <2>; gpio-controller; @@ -106,9 +105,8 @@ ath9k1: wifi@0,12 { /* 5 GHz */ compatible = "pci168c,0029"; - nvmem-cells = <&macaddr_hwinfo_1c>; + nvmem-cells = <&macaddr_hwinfo_1c 2>; nvmem-cell-names = "mac-address"; - mac-address-increment = <2>; reg = <0x9000 0 0 0 0>; #gpio-cells = <2>; gpio-controller; @@ -125,7 +123,7 @@ ð0 { status = "okay"; - nvmem-cells = <&macaddr_hwinfo_1c>; + nvmem-cells = <&macaddr_hwinfo_1c 0>; nvmem-cell-names = "mac-address"; pll-data = <0x00110000 0x00001099 0x00991099>; @@ -160,9 +158,22 @@ }; hwinfo: partition@fe0000 { - label = "hwinfo"; reg = <0xfe0000 0x10000>; + compatible = "nvmem-cells"; + label = "hwinfo"; read-only; + + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; + + macaddr_hwinfo_1c: mac-address@1c { + compatible = "mac-base"; + reg = <0x1c 0x6>; + #nvmem-cell-cells = <1>; + }; + }; }; partition@ff0000 { @@ -173,13 +184,3 @@ }; }; }; - -&hwinfo { - compatible = "nvmem-cells"; - #address-cells = <1>; - #size-cells = <1>; - - macaddr_hwinfo_1c: macaddr@1c { - reg = <0x1c 0x6>; - }; -}; |