diff options
| author | Lech Perczak | 2024-10-20 22:58:21 +0000 |
|---|---|---|
| committer | Hauke Mehrtens | 2024-10-21 22:39:32 +0000 |
| commit | 8d7c08f884c68fecf2dd49c756b3c16e8acdb9de (patch) | |
| tree | 77095eac69138408bb3486d73aedc2d8de011705 | |
| parent | 3bd129f8e00bdf3599b919d24e984d7cb325f833 (diff) | |
| download | openwrt-8d7c08f884c68fecf2dd49c756b3c16e8acdb9de.tar.gz | |
bcm53xx: meraki: backport NVMEM layout syntax patch
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>
| -rw-r--r-- | target/linux/bcm53xx/patches-6.6/040-v6.11-ARM-dts-broadcom-convert-NVMEM-content-to-layout-syntax.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/target/linux/bcm53xx/patches-6.6/040-v6.11-ARM-dts-broadcom-convert-NVMEM-content-to-layout-syntax.patch b/target/linux/bcm53xx/patches-6.6/040-v6.11-ARM-dts-broadcom-convert-NVMEM-content-to-layout-syntax.patch new file mode 100644 index 0000000000..864fd01629 --- /dev/null +++ b/target/linux/bcm53xx/patches-6.6/040-v6.11-ARM-dts-broadcom-convert-NVMEM-content-to-layout-syntax.patch @@ -0,0 +1,64 @@ +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>; ++ }; + }; + }; + }; |