Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9b7128a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'davinci-for-v4.17/dt' of... 

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
parents fbefc532 25c88cb1

arch/arm/boot/dts/da850-evm.dts

+5 −0
Original line number Diff line number Diff line
@@ -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 {

arch/arm/boot/dts/da850-lego-ev3.dts

+18 −1
Original line number Diff line number Diff line
@@ -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>;