0019-ARM-dts-gemini-Indent-DIR-685-partition-table.patch 2.9 KB

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