mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 01:28:59 +00:00
8d7c08f884
This patch is required to support reading MAC address on Meraki MX64/65 line of devices, but also touches MR32, so let's backport it first. Signed-off-by: Lech Perczak <lech.perczak@gmail.com> Link: https://github.com/openwrt/openwrt/pull/16634 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
65 lines
1.8 KiB
Diff
65 lines
1.8 KiB
Diff
From ed0d78c75ca93c9f1d7f0d08ac5abe0de71fe312 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
|
Date: Thu, 16 May 2024 10:47:37 +0200
|
|
Subject: [PATCH] ARM: dts: broadcom: convert NVMEM content to layout syntax
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Use cleaner (and non-deprecated) bindings syntax. See commit
|
|
bd912c991d2e ("dt-bindings: nvmem: layouts: add fixed-layout") for
|
|
details.
|
|
|
|
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
|
Link: https://lore.kernel.org/r/20240516084737.2789-1-zajec5@gmail.com
|
|
Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
|
|
---
|
|
arch/arm/boot/dts/broadcom/bcm53016-meraki-mr32.dts | 12 ++++++++----
|
|
.../dts/broadcom/bcm958625-meraki-mx6x-common.dtsi | 12 ++++++++----
|
|
2 files changed, 16 insertions(+), 8 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/broadcom/bcm53016-meraki-mr32.dts
|
|
+++ b/arch/arm/boot/dts/broadcom/bcm53016-meraki-mr32.dts
|
|
@@ -223,11 +223,15 @@
|
|
reg = <0x50>;
|
|
pagesize = <32>;
|
|
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 {
|
|
+ reg = <0x66 0x6>;
|
|
+ };
|
|
};
|
|
};
|
|
};
|
|
--- a/arch/arm/boot/dts/broadcom/bcm958625-meraki-mx6x-common.dtsi
|
|
+++ b/arch/arm/boot/dts/broadcom/bcm958625-meraki-mx6x-common.dtsi
|
|
@@ -55,11 +55,15 @@
|
|
reg = <0x50>;
|
|
pagesize = <32>;
|
|
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 {
|
|
+ reg = <0x66 0x6>;
|
|
+ };
|
|
};
|
|
};
|
|
};
|