diff options
author | Rafał Miłecki <rafal@milecki.pl> | 2021-08-29 22:53:55 +0200 |
---|---|---|
committer | Rafał Miłecki <rafal@milecki.pl> | 2021-12-13 14:01:14 +0100 |
commit | 67978e4ce53cc373365776c05ab748b7bcc43576 (patch) | |
tree | 7ae799dbcc46e2e4c4c84c6347e367b82959199e /target/linux/bcm53xx/patches-5.4/036-v5.14-0001-ARM-dts-BCM5301X-Fix-NAND-nodes-names.patch | |
parent | 6f9e9d978a69b4dc6366300d05dec98b9aebd229 (diff) | |
download | upstream-67978e4ce53cc373365776c05ab748b7bcc43576.tar.gz upstream-67978e4ce53cc373365776c05ab748b7bcc43576.tar.bz2 upstream-67978e4ce53cc373365776c05ab748b7bcc43576.zip |
bcm53xx: backport the latest upstream DT changes
This includes:
1. BCM5301X changes from 5.14 and queued 5.15 stuff
2. NSP changes from 5.11 - 5.15 for kernel 5.10
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit bce00f47e5d67e5a33e9d7fa137cbe0a5d3d334b)
Diffstat (limited to 'target/linux/bcm53xx/patches-5.4/036-v5.14-0001-ARM-dts-BCM5301X-Fix-NAND-nodes-names.patch')
-rw-r--r-- | target/linux/bcm53xx/patches-5.4/036-v5.14-0001-ARM-dts-BCM5301X-Fix-NAND-nodes-names.patch | 77 |
1 files changed, 77 insertions, 0 deletions
diff --git a/target/linux/bcm53xx/patches-5.4/036-v5.14-0001-ARM-dts-BCM5301X-Fix-NAND-nodes-names.patch b/target/linux/bcm53xx/patches-5.4/036-v5.14-0001-ARM-dts-BCM5301X-Fix-NAND-nodes-names.patch new file mode 100644 index 0000000000..ac45409c63 --- /dev/null +++ b/target/linux/bcm53xx/patches-5.4/036-v5.14-0001-ARM-dts-BCM5301X-Fix-NAND-nodes-names.patch @@ -0,0 +1,77 @@ +From b660269cba748dfd07eb5551a88ff34d5ea0b86e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl> +Date: Fri, 16 Apr 2021 15:37:48 +0200 +Subject: [PATCH] ARM: dts: BCM5301X: Fix NAND nodes names +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This matches nand-controller.yaml requirements. + +Signed-off-by: Rafał Miłecki <rafal@milecki.pl> +Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> +--- + +--- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts ++++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts +@@ -24,8 +24,8 @@ + reg = <0x00000000 0x08000000>; + }; + +- nand: nand@18028000 { +- nandcs@0 { ++ nand_controller: nand-controller@18028000 { ++ nand@0 { + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; +--- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts ++++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts +@@ -25,8 +25,8 @@ + <0x88000000 0x08000000>; + }; + +- nand: nand@18028000 { +- nandcs@0 { ++ nand_controller: nand-controller@18028000 { ++ nand@0 { + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; +--- a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi ++++ b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi +@@ -6,8 +6,8 @@ + */ + + / { +- nand@18028000 { +- nandcs: nandcs@0 { ++ nand-controller@18028000 { ++ nandcs: nand@0 { + compatible = "brcm,nandcs"; + reg = <0>; + #address-cells = <1>; +--- a/arch/arm/boot/dts/bcm5301x.dtsi ++++ b/arch/arm/boot/dts/bcm5301x.dtsi +@@ -502,7 +502,7 @@ + reg = <0x18004000 0x14>; + }; + +- nand: nand@18028000 { ++ nand_controller: nand-controller@18028000 { + compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1", "brcm,brcmnand"; + reg = <0x18028000 0x600>, <0x1811a408 0x600>, <0x18028f00 0x20>; + reg-names = "nand", "iproc-idm", "iproc-ext"; +--- a/arch/arm/boot/dts/bcm953012k.dts ++++ b/arch/arm/boot/dts/bcm953012k.dts +@@ -49,8 +49,8 @@ + }; + }; + +-&nand { +- nandcs@0 { ++&nand_controller { ++ nand@0 { + compatible = "brcm,nandcs"; + reg = <0>; + nand-on-flash-bbt; |