mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-13 10:38:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'davinci-for-v4.17/dt' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/dt

Browse Source 
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
This commit is contained in:
Arnd Bergmann
2018-03-07 15:25:14 +01:00
parent fbefc5321e 25c88cb1c0
commit f9b7128a30
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/boot/dts/da850-evm.dts
View File

@@ -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 = &eth0;
spi0 = &spi1;
};
soc@1c00000 {

19
arch/arm/boot/dts/da850-lego-ev3.dts
View File

@@ -184,6 +184,23 @@ battery {
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 @@ &i2c0 {
* 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>;