diff options
| author | Tom Rini <trini@konsulko.com> | 2021-06-10 13:27:14 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-06-10 13:27:14 -0400 |
| commit | cf066a20c3ec063d019a991cc32ba8ad95a39780 (patch) | |
| tree | e57916eaecbcd8c707407349ee3c18318a096ac5 /arch | |
| parent | 0008d8086649d3bb3afd0c4697f5b73ccf6f293d (diff) | |
| parent | c64e2bd55883ede3dc29421f1f297d741ae5b137 (diff) | |
| download | u-boot-cf066a20c3ec063d019a991cc32ba8ad95a39780.tar.gz u-boot-cf066a20c3ec063d019a991cc32ba8ad95a39780.tar.xz u-boot-cf066a20c3ec063d019a991cc32ba8ad95a39780.zip | |
Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- mvebu: Turris MOX misc updates (cmds, rescue mode, LED's etc)
(Marek)
- mvebu: correct Armada 8K addresses (Heinrich)
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/armada-3720-turris-mox.dts | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/arch/arm/dts/armada-3720-turris-mox.dts b/arch/arm/dts/armada-3720-turris-mox.dts index 8e0ebf508d..f47ced05c5 100644 --- a/arch/arm/dts/armada-3720-turris-mox.dts +++ b/arch/arm/dts/armada-3720-turris-mox.dts @@ -11,6 +11,8 @@ /dts-v1/; #include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include "armada-372x.dtsi" / { @@ -34,6 +36,28 @@ reg = <0x00000000 0x00000000 0x00000000 0x20000000>; }; + leds { + compatible = "gpio-leds"; + + led { + gpios = <&gpiosb 21 GPIO_ACTIVE_LOW>; + color = <LED_COLOR_ID_RED>; + function = LED_FUNCTION_ACTIVITY; + }; + }; + + gpio-keys { + compatible = "gpio-keys"; + + reset { + compatible = "gpio-keys"; + label = "reset"; + linux,code = <KEY_RESTART>; + gpios = <&gpiosb 20 GPIO_ACTIVE_LOW>; + debounce-interval = <60>; + }; + }; + reg_usb3_vbus: usb3_vbus@0 { compatible = "regulator-fixed"; regulator-name = "usb3-vbus"; @@ -140,6 +164,37 @@ reg = <0>; spi-max-frequency = <20000000>; m25p,fast-read; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "secure-firmware"; + reg = <0x0 0x20000>; + }; + + partition@20000 { + label = "a53-firmware"; + reg = <0x20000 0x160000>; + }; + + partition@180000 { + label = "u-boot-env"; + reg = <0x180000 0x10000>; + }; + + partition@190000 { + label = "Rescue system"; + reg = <0x190000 0x660000>; + }; + + partition@7f0000 { + label = "dtb"; + reg = <0x7f0000 0x10000>; + }; + }; }; moxtet@1 { |