target/linux/bcm53xx/patches-5.10/032-v5.14-0001-ARM-dts-BCM5301X-Fix-NAND-nodes-names.patch

   1 From b660269cba748dfd07eb5551a88ff34d5ea0b86e Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
   3 Date: Fri, 16 Apr 2021 15:37:48 +0200
   4 Subject: [PATCH] ARM: dts: BCM5301X: Fix NAND nodes names
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 This matches nand-controller.yaml requirements.
  10
  11 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
  12 Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
  13 ---
  14
  15 --- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
  16 +++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
  17 @@ -24,8 +24,8 @@
  18                 reg = <0x00000000 0x08000000>;
  19         };
  20
  21 -       nand: nand@18028000 {
  22 -               nandcs@0 {
  23 +       nand_controller: nand-controller@18028000 {
  24 +               nand@0 {
  25                         partitions {
  26                                 compatible = "fixed-partitions";
  27                                 #address-cells = <1>;
  28 --- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
  29 +++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
  30 @@ -25,8 +25,8 @@
  31                       <0x88000000 0x08000000>;
  32         };
  33
  34 -       nand: nand@18028000 {
  35 -               nandcs@0 {
  36 +       nand_controller: nand-controller@18028000 {
  37 +               nand@0 {
  38                         partitions {
  39                                 compatible = "fixed-partitions";
  40                                 #address-cells = <1>;
  41 --- a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
  42 +++ b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
  43 @@ -6,8 +6,8 @@
  44   */
  45
  46  / {
  47 -       nand@18028000 {
  48 -               nandcs: nandcs@0 {
  49 +       nand-controller@18028000 {
  50 +               nandcs: nand@0 {
  51                         compatible = "brcm,nandcs";
  52                         reg = <0>;
  53                         #address-cells = <1>;
  54 --- a/arch/arm/boot/dts/bcm5301x.dtsi
  55 +++ b/arch/arm/boot/dts/bcm5301x.dtsi
  56 @@ -503,7 +503,7 @@
  57                 reg = <0x18004000 0x14>;
  58         };
  59
  60 -       nand: nand@18028000 {
  61 +       nand_controller: nand-controller@18028000 {
  62                 compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1", "brcm,brcmnand";
  63                 reg = <0x18028000 0x600>, <0x1811a408 0x600>, <0x18028f00 0x20>;
  64                 reg-names = "nand", "iproc-idm", "iproc-ext";
  65 --- a/arch/arm/boot/dts/bcm953012k.dts
  66 +++ b/arch/arm/boot/dts/bcm953012k.dts
  67 @@ -49,8 +49,8 @@
  68         };
  69  };
  70
  71 -&nand {
  72 -       nandcs@0 {
  73 +&nand_controller {
  74 +       nand@0 {
  75                 compatible = "brcm,nandcs";
  76                 reg = <0>;
  77                 nand-on-flash-bbt;