target/linux/oxnas/patches-4.14/0001-ARM-dts-rename-oxnas-dts-files.patch

   1 From a9d2b105ccd23e07e3dd99d010a34bd5d1c95b42 Mon Sep 17 00:00:00 2001
   2 From: Daniel Golle <daniel@makrotopia.org>
   3 Date: Sat, 13 Jan 2018 18:35:59 +0100
   4 Subject: [PATCH 1/3] ARM: dts: rename oxnas dts files
   5
   6 Other platforms' device-tree files start with a platform prefix, such as
   7 sun7i-a20-*.dts or at91-*.dts.
   8 This naming scheme turns out to be handy when using multi-platform build
   9 systems such as OpenWrt.
  10 Prepend oxnas files with their platform prefix to comply with the naming
  11 scheme already used for most other platforms.
  12
  13 Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  14 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  15 ---
  16  arch/arm/boot/dts/Makefile                                    | 4 ++--
  17  arch/arm/boot/dts/{wd-mbwe.dts => ox810se-wd-mbwe.dts}        | 0
  18  ...-series-3.dts => ox820-cloudengines-pogoplug-series-3.dts} | 0
  19  3 files changed, 2 insertions(+), 2 deletions(-)
  20  rename arch/arm/boot/dts/{wd-mbwe.dts => ox810se-wd-mbwe.dts} (100%)
  21  rename arch/arm/boot/dts/{cloudengines-pogoplug-series-3.dts => ox820-cloudengines-pogoplug-series-3.dts} (100%)
  22
  23 --- a/arch/arm/boot/dts/Makefile
  24 +++ b/arch/arm/boot/dts/Makefile
  25 @@ -685,8 +685,8 @@ dtb-$(CONFIG_ARCH_ACTIONS) += \
  26  dtb-$(CONFIG_ARCH_PRIMA2) += \
  27         prima2-evb.dtb
  28  dtb-$(CONFIG_ARCH_OXNAS) += \
  29 -       wd-mbwe.dtb \
  30 -       cloudengines-pogoplug-series-3.dtb
  31 +       ox810se-wd-mbwe.dtb \
  32 +       ox820-cloudengines-pogoplug-series-3.dtb
  33  dtb-$(CONFIG_ARCH_QCOM) += \
  34         qcom-apq8060-dragonboard.dtb \
  35         qcom-apq8064-arrow-sd-600eval.dtb \
  36 --- a/arch/arm/boot/dts/cloudengines-pogoplug-series-3.dts
  37 +++ /dev/null
  38 @@ -1,94 +0,0 @@
  39 -/*
  40 - * cloudengines-pogoplug-series-3.dtsi - Device tree file for Cloud Engines PogoPlug Series 3
  41 - *
  42 - * Copyright (C) 2016 Neil Armstrong <narmstrong@baylibre.com>
  43 - *
  44 - * Licensed under GPLv2 or later
  45 - */
  46 -
  47 -/dts-v1/;
  48 -#include "ox820.dtsi"
  49 -
  50 -/ {
  51 -       model = "Cloud Engines PogoPlug Series 3";
  52 -
  53 -       compatible = "cloudengines,pogoplugv3", "oxsemi,ox820";
  54 -
  55 -       chosen {
  56 -               bootargs = "earlyprintk";
  57 -               stdout-path = "serial0:115200n8";
  58 -       };
  59 -
  60 -       memory {
  61 -               /* 128Mbytes DDR */
  62 -               reg = <0x60000000 0x8000000>;
  63 -       };
  64 -
  65 -       aliases {
  66 -               serial0 = &uart0;
  67 -               gpio0 = &gpio0;
  68 -               gpio1 = &gpio1;
  69 -       };
  70 -
  71 -       leds {
  72 -               compatible = "gpio-leds";
  73 -
  74 -               blue {
  75 -                       label = "pogoplug:blue";
  76 -                       gpios = <&gpio0 2 0>;
  77 -                       default-state = "keep";
  78 -               };
  79 -
  80 -               orange {
  81 -                       label = "pogoplug:orange";
  82 -                       gpios = <&gpio1 16 1>;
  83 -                       default-state = "keep";
  84 -               };
  85 -
  86 -               green {
  87 -                       label = "pogoplug:green";
  88 -                       gpios = <&gpio1 17 1>;
  89 -                       default-state = "keep";
  90 -               };
  91 -       };
  92 -};
  93 -
  94 -&uart0 {
  95 -       status = "okay";
  96 -
  97 -       pinctrl-names = "default";
  98 -       pinctrl-0 = <&pinctrl_uart0>;
  99 -};
 100 -
 101 -&nandc {
 102 -       status = "okay";
 103 -
 104 -       pinctrl-names = "default";
 105 -       pinctrl-0 = <&pinctrl_nand>;
 106 -
 107 -       nand@0 {
 108 -               reg = <0>;
 109 -               #address-cells = <1>;
 110 -               #size-cells = <1>;
 111 -               nand-ecc-mode = "soft";
 112 -               nand-ecc-algo = "hamming";
 113 -
 114 -               partition@0 {
 115 -                       label = "boot";
 116 -                       reg = <0x00000000 0x00e00000>;
 117 -                       read-only;
 118 -               };
 119 -
 120 -               partition@e00000 {
 121 -                       label = "ubi";
 122 -                       reg = <0x00e00000 0x07200000>;
 123 -               };
 124 -       };
 125 -};
 126 -
 127 -&etha {
 128 -       status = "okay";
 129 -
 130 -       pinctrl-names = "default";
 131 -       pinctrl-0 = <&pinctrl_etha_mdio>;
 132 -};
 133 --- /dev/null
 134 +++ b/arch/arm/boot/dts/ox810se-wd-mbwe.dts
 135 @@ -0,0 +1,112 @@
 136 +/*
 137 + * wd-mbwe.dtsi - Device tree file for Western Digital My Book World Edition
 138 + *
 139 + * Copyright (C) 2016 Neil Armstrong <narmstrong@baylibre.com>
 140 + *
 141 + * Licensed under GPLv2 or later
 142 + */
 143 +
 144 +/dts-v1/;
 145 +#include "ox810se.dtsi"
 146 +
 147 +/ {
 148 +       model = "Western Digital My Book World Edition";
 149 +
 150 +       compatible = "wd,mbwe", "oxsemi,ox810se";
 151 +
 152 +       chosen {
 153 +               bootargs = "console=ttyS1,115200n8 earlyprintk=serial";
 154 +       };
 155 +
 156 +       memory {
 157 +               /* 128Mbytes DDR */
 158 +               reg = <0x48000000 0x8000000>;
 159 +       };
 160 +
 161 +       aliases {
 162 +               serial1 = &uart1;
 163 +               gpio0 = &gpio0;
 164 +               gpio1 = &gpio1;
 165 +       };
 166 +
 167 +       gpio-keys-polled {
 168 +               compatible = "gpio-keys-polled";
 169 +               #address-cells = <1>;
 170 +               #size-cells = <0>;
 171 +               poll-interval = <100>;
 172 +
 173 +               power {
 174 +                       label = "power";
 175 +                       gpios = <&gpio0 0 1>;
 176 +                       linux,code = <0x198>;
 177 +               };
 178 +
 179 +               recovery {
 180 +                       label = "recovery";
 181 +                       gpios = <&gpio0 4 1>;
 182 +                       linux,code = <0xab>;
 183 +               };
 184 +       };
 185 +
 186 +       leds {
 187 +               compatible = "gpio-leds";
 188 +
 189 +               a0 {
 190 +                       label = "activity0";
 191 +                       gpios = <&gpio0 25 0>;
 192 +                       default-state = "keep";
 193 +               };
 194 +
 195 +               a1 {
 196 +                       label = "activity1";
 197 +                       gpios = <&gpio0 26 0>;
 198 +                       default-state = "keep";
 199 +               };
 200 +
 201 +               a2 {
 202 +                       label = "activity2";
 203 +                       gpios = <&gpio0 5 0>;
 204 +                       default-state = "keep";
 205 +               };
 206 +
 207 +               a3 {
 208 +                       label = "activity3";
 209 +                       gpios = <&gpio0 6 0>;
 210 +                       default-state = "keep";
 211 +               };
 212 +
 213 +               a4 {
 214 +                       label = "activity4";
 215 +                       gpios = <&gpio0 7 0>;
 216 +                       default-state = "keep";
 217 +               };
 218 +
 219 +               a5 {
 220 +                       label = "activity5";
 221 +                       gpios = <&gpio1 2 0>;
 222 +                       default-state = "keep";
 223 +               };
 224 +       };
 225 +
 226 +       i2c-gpio {
 227 +               compatible = "i2c-gpio";
 228 +               gpios = <&gpio0 3 0 /* sda */
 229 +                        &gpio0 2 0 /* scl */
 230 +                        >;
 231 +               i2c-gpio,delay-us = <2>;        /* ~100 kHz */
 232 +               #address-cells = <1>;
 233 +               #size-cells = <0>;
 234 +
 235 +               rtc0: rtc@48 {
 236 +                       compatible = "st,m41t00";
 237 +                       reg = <0x68>;
 238 +               };
 239 +       };
 240 +};
 241 +
 242 +&uart1 {
 243 +       status = "okay";
 244 +
 245 +       pinctrl-names = "default";
 246 +       pinctrl-0 = <&pinctrl_uart1>;
 247 +};
 248 --- /dev/null
 249 +++ b/arch/arm/boot/dts/ox820-cloudengines-pogoplug-series-3.dts
 250 @@ -0,0 +1,94 @@
 251 +/*
 252 + * cloudengines-pogoplug-series-3.dtsi - Device tree file for Cloud Engines PogoPlug Series 3
 253 + *
 254 + * Copyright (C) 2016 Neil Armstrong <narmstrong@baylibre.com>
 255 + *
 256 + * Licensed under GPLv2 or later
 257 + */
 258 +
 259 +/dts-v1/;
 260 +#include "ox820.dtsi"
 261 +
 262 +/ {
 263 +       model = "Cloud Engines PogoPlug Series 3";
 264 +
 265 +       compatible = "cloudengines,pogoplugv3", "oxsemi,ox820";
 266 +
 267 +       chosen {
 268 +               bootargs = "earlyprintk";
 269 +               stdout-path = "serial0:115200n8";
 270 +       };
 271 +
 272 +       memory {
 273 +               /* 128Mbytes DDR */
 274 +               reg = <0x60000000 0x8000000>;
 275 +       };
 276 +
 277 +       aliases {
 278 +               serial0 = &uart0;
 279 +               gpio0 = &gpio0;
 280 +               gpio1 = &gpio1;
 281 +       };
 282 +
 283 +       leds {
 284 +               compatible = "gpio-leds";
 285 +
 286 +               blue {
 287 +                       label = "pogoplug:blue";
 288 +                       gpios = <&gpio0 2 0>;
 289 +                       default-state = "keep";
 290 +               };
 291 +
 292 +               orange {
 293 +                       label = "pogoplug:orange";
 294 +                       gpios = <&gpio1 16 1>;
 295 +                       default-state = "keep";
 296 +               };
 297 +
 298 +               green {
 299 +                       label = "pogoplug:green";
 300 +                       gpios = <&gpio1 17 1>;
 301 +                       default-state = "keep";
 302 +               };
 303 +       };
 304 +};
 305 +
 306 +&uart0 {
 307 +       status = "okay";
 308 +
 309 +       pinctrl-names = "default";
 310 +       pinctrl-0 = <&pinctrl_uart0>;
 311 +};
 312 +
 313 +&nandc {
 314 +       status = "okay";
 315 +
 316 +       pinctrl-names = "default";
 317 +       pinctrl-0 = <&pinctrl_nand>;
 318 +
 319 +       nand@0 {
 320 +               reg = <0>;
 321 +               #address-cells = <1>;
 322 +               #size-cells = <1>;
 323 +               nand-ecc-mode = "soft";
 324 +               nand-ecc-algo = "hamming";
 325 +
 326 +               partition@0 {
 327 +                       label = "boot";
 328 +                       reg = <0x00000000 0x00e00000>;
 329 +                       read-only;
 330 +               };
 331 +
 332 +               partition@e00000 {
 333 +                       label = "ubi";
 334 +                       reg = <0x00e00000 0x07200000>;
 335 +               };
 336 +       };
 337 +};
 338 +
 339 +&etha {
 340 +       status = "okay";
 341 +
 342 +       pinctrl-names = "default";
 343 +       pinctrl-0 = <&pinctrl_etha_mdio>;
 344 +};
 345 --- a/arch/arm/boot/dts/wd-mbwe.dts
 346 +++ /dev/null
 347 @@ -1,112 +0,0 @@
 348 -/*
 349 - * wd-mbwe.dtsi - Device tree file for Western Digital My Book World Edition
 350 - *
 351 - * Copyright (C) 2016 Neil Armstrong <narmstrong@baylibre.com>
 352 - *
 353 - * Licensed under GPLv2 or later
 354 - */
 355 -
 356 -/dts-v1/;
 357 -#include "ox810se.dtsi"
 358 -
 359 -/ {
 360 -       model = "Western Digital My Book World Edition";
 361 -
 362 -       compatible = "wd,mbwe", "oxsemi,ox810se";
 363 -
 364 -       chosen {
 365 -               bootargs = "console=ttyS1,115200n8 earlyprintk=serial";
 366 -       };
 367 -
 368 -       memory {
 369 -               /* 128Mbytes DDR */
 370 -               reg = <0x48000000 0x8000000>;
 371 -       };
 372 -
 373 -       aliases {
 374 -               serial1 = &uart1;
 375 -               gpio0 = &gpio0;
 376 -               gpio1 = &gpio1;
 377 -       };
 378 -
 379 -       gpio-keys-polled {
 380 -               compatible = "gpio-keys-polled";
 381 -               #address-cells = <1>;
 382 -               #size-cells = <0>;
 383 -               poll-interval = <100>;
 384 -
 385 -               power {
 386 -                       label = "power";
 387 -                       gpios = <&gpio0 0 1>;
 388 -                       linux,code = <0x198>;
 389 -               };
 390 -
 391 -               recovery {
 392 -                       label = "recovery";
 393 -                       gpios = <&gpio0 4 1>;
 394 -                       linux,code = <0xab>;
 395 -               };
 396 -       };
 397 -
 398 -       leds {
 399 -               compatible = "gpio-leds";
 400 -
 401 -               a0 {
 402 -                       label = "activity0";
 403 -                       gpios = <&gpio0 25 0>;
 404 -                       default-state = "keep";
 405 -               };
 406 -
 407 -               a1 {
 408 -                       label = "activity1";
 409 -                       gpios = <&gpio0 26 0>;
 410 -                       default-state = "keep";
 411 -               };
 412 -
 413 -               a2 {
 414 -                       label = "activity2";
 415 -                       gpios = <&gpio0 5 0>;
 416 -                       default-state = "keep";
 417 -               };
 418 -
 419 -               a3 {
 420 -                       label = "activity3";
 421 -                       gpios = <&gpio0 6 0>;
 422 -                       default-state = "keep";
 423 -               };
 424 -
 425 -               a4 {
 426 -                       label = "activity4";
 427 -                       gpios = <&gpio0 7 0>;
 428 -                       default-state = "keep";
 429 -               };
 430 -
 431 -               a5 {
 432 -                       label = "activity5";
 433 -                       gpios = <&gpio1 2 0>;
 434 -                       default-state = "keep";
 435 -               };
 436 -       };
 437 -
 438 -       i2c-gpio {
 439 -               compatible = "i2c-gpio";
 440 -               gpios = <&gpio0 3 0 /* sda */
 441 -                        &gpio0 2 0 /* scl */
 442 -                        >;
 443 -               i2c-gpio,delay-us = <2>;        /* ~100 kHz */
 444 -               #address-cells = <1>;
 445 -               #size-cells = <0>;
 446 -
 447 -               rtc0: rtc@48 {
 448 -                       compatible = "st,m41t00";
 449 -                       reg = <0x68>;
 450 -               };
 451 -       };
 452 -};
 453 -
 454 -&uart1 {
 455 -       status = "okay";
 456 -
 457 -       pinctrl-names = "default";
 458 -       pinctrl-0 = <&pinctrl_uart1>;
 459 -};