diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-03-07 17:25:14 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-03-07 17:25:14 +0300 |
| commit | f9b7128a30268f9484d4f75ed6349f23b57e9412 (patch) | |
| tree | 112c815da71e3892d04c04f7c6b14182404b73e5 | |
| parent | fbefc5321e327c708f9162dbed2a6c4d1490a703 (diff) | |
| parent | 25c88cb1c05856f365484c6647d8e17bfd7f3363 (diff) | |
| download | linux-f9b7128a30268f9484d4f75ed6349f23b57e9412.tar.xz | |
Merge tag 'davinci-for-v4.17/dt' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/dt
Pull "DaVinci DT support enhancements for v4.17" from Sekhar Nori:
* Lego EV3 gains firmware recovery mode support
* Miscellaneous non-critical clean-up
* tag 'davinci-for-v4.17/dt' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: dts: da850-evm: add chosen and SPI alias
ARM: dts: da850-lego-ev3: use a correct fallback for at24 compatible
ARM: dts: da850-lego-ev3: Add node for reboot modes
| -rw-r--r-- | arch/arm/boot/dts/da850-evm.dts | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/da850-lego-ev3.dts | 19 |
2 files changed, 23 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/da850-evm.dts b/arch/arm/boot/dts/da850-evm.dts index c75507922f7d..3962fa4b07f5 100644 --- a/arch/arm/boot/dts/da850-evm.dts +++ b/arch/arm/boot/dts/da850-evm.dts @@ -15,11 +15,16 @@ compatible = "ti,da850-evm", "ti,da850"; model = "DA850/AM1808/OMAP-L138 EVM"; + chosen { + stdout-path = &serial2; + }; + aliases { serial0 = &serial0; serial1 = &serial1; serial2 = &serial2; ethernet0 = ð0; + spi0 = &spi1; }; soc@1c00000 { diff --git a/arch/arm/boot/dts/da850-lego-ev3.dts b/arch/arm/boot/dts/da850-lego-ev3.dts index 81942ae83e1f..1ffd87796cac 100644 --- a/arch/arm/boot/dts/da850-lego-ev3.dts +++ b/arch/arm/boot/dts/da850-lego-ev3.dts @@ -184,6 +184,23 @@ io-channel-names = "voltage", "current"; rechargeable-gpios = <&gpio 136 GPIO_ACTIVE_LOW>; }; + + /* ARM local RAM */ + memory@ffff0000 { + compatible = "syscon", "simple-mfd"; + reg = <0xffff0000 0x2000>; /* 8k */ + + /* + * The I2C bootloader looks for this magic value to either + * boot normally or boot into a firmware update mode. + */ + reboot-mode { + compatible = "syscon-reboot-mode"; + offset = <0x1ffc>; + mode-normal = <0x00000000>; + mode-loader = <0x5555aaaa>; + }; + }; }; &pmx_core { @@ -293,7 +310,7 @@ * EEPROM contains the first stage bootloader, HW ID and Bluetooth MAC. */ eeprom@50 { - compatible = "microchip,24c128"; + compatible = "microchip,24c128", "atmel,24c128"; pagesize = <64>; read-only; reg = <0x50>; |