target/linux/gemini/patches-4.19/0019-ARM-dts-gemini-Indent-DIR-685-partition-table.patch

   1 From 4a228ecf553e879bae384e634bb6413438e81a0e Mon Sep 17 00:00:00 2001
   2 From: Linus Walleij <linus.walleij@linaro.org>
   3 Date: Mon, 11 Mar 2019 15:43:05 +0100
   4 Subject: [PATCH 1/2] ARM: dts: gemini: Indent DIR-685 partition table
   5
   6 It is discouraged to have OF partitions as subnodes directly
   7 under the device, create a "partitions" subnode and put the
   8 partitions inside it.
   9
  10 Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  11 ---
  12  arch/arm/boot/dts/gemini-dlink-dir-685.dts | 82 ++++++++++++----------
  13  1 file changed, 44 insertions(+), 38 deletions(-)
  14
  15 --- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts
  16 +++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
  17 @@ -267,44 +267,50 @@
  18                         /* 32MB of flash */
  19                         reg = <0x30000000 0x02000000>;
  20
  21 -                       /*
  22 -                        * This "RedBoot" is the Storlink derivative.
  23 -                        */
  24 -                       partition@0 {
  25 -                               label = "RedBoot";
  26 -                               reg = <0x00000000 0x00040000>;
  27 -                               read-only;
  28 -                       };
  29 -                       /*
  30 -                        * This firmware image contains the kernel catenated
  31 -                        * with the squashfs root filesystem. For some reason
  32 -                        * this is called "upgrade" on the vendor system.
  33 -                        */
  34 -                       partition@40000 {
  35 -                               label = "upgrade";
  36 -                               reg = <0x00040000 0x01f40000>;
  37 -                               read-only;
  38 -                       };
  39 -                       /* RGDB, Residental Gateway Database? */
  40 -                       partition@1f80000 {
  41 -                               label = "rgdb";
  42 -                               reg = <0x01f80000 0x00040000>;
  43 -                               read-only;
  44 -                       };
  45 -                       /*
  46 -                        * This partition contains MAC addresses for WAN,
  47 -                        * WLAN and LAN, and the country code (for wireless
  48 -                        * I guess).
  49 -                        */
  50 -                       partition@1fc0000 {
  51 -                               label = "nvram";
  52 -                               reg = <0x01fc0000 0x00020000>;
  53 -                               read-only;
  54 -                       };
  55 -                       partition@1fe0000 {
  56 -                               label = "LangPack";
  57 -                               reg = <0x01fe0000 0x00020000>;
  58 -                               read-only;
  59 +                       partitions {
  60 +                               compatible = "fixed-partitions";
  61 +                               #address-cells = <1>;
  62 +                               #size-cells = <1>;
  63 +
  64 +                               /*
  65 +                                * This "RedBoot" is the Storlink derivative.
  66 +                                */
  67 +                               partition@0 {
  68 +                                       label = "RedBoot";
  69 +                                       reg = <0x00000000 0x00040000>;
  70 +                                       read-only;
  71 +                               };
  72 +                               /*
  73 +                                * This firmware image contains the kernel catenated
  74 +                                * with the squashfs root filesystem. For some reason
  75 +                                * this is called "upgrade" on the vendor system.
  76 +                                */
  77 +                               partition@40000 {
  78 +                                       label = "upgrade";
  79 +                                       reg = <0x00040000 0x01f40000>;
  80 +                                       read-only;
  81 +                               };
  82 +                               /* RGDB, Residental Gateway Database? */
  83 +                               partition@1f80000 {
  84 +                                       label = "rgdb";
  85 +                                       reg = <0x01f80000 0x00040000>;
  86 +                                       read-only;
  87 +                               };
  88 +                               /*
  89 +                                * This partition contains MAC addresses for WAN,
  90 +                                * WLAN and LAN, and the country code (for wireless
  91 +                                * I guess).
  92 +                                */
  93 +                               partition@1fc0000 {
  94 +                                       label = "nvram";
  95 +                                       reg = <0x01fc0000 0x00020000>;
  96 +                                       read-only;
  97 +                               };
  98 +                               partition@1fe0000 {
  99 +                                       label = "LangPack";
 100 +                                       reg = <0x01fe0000 0x00020000>;
 101 +                                       read-only;
 102 +                               };
 103                         };
 104                 };
 105