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

Commit 29b48f98 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'lpc18xx_dts_for_4.9_part2' of https://github.com/manabian/linux-lpc into next/dt 

Pull "Device Tree clean up for LPC18xx platform" from Joachim Eastwood:

* Removal of skeleton.dtsi from the common armv7-m dtsi together
  with lpc18xx and efm32 platforms.

* Fix for unit address warnings from the dtc on lpc18xx/efm32.
  That is made possible with skeleton.dtsi gone.

* tag 'lpc18xx_dts_for_4.9_part2' of https://github.com/manabian/linux-lpc:
  ARM: dts: efm32: remove skeleton.dtsi include and fix unit address warnings
  ARM: dts: lpc18xx: remove skeleton.dtsi include and fix unit address warnings
  ARM: dts: armv7-m: remove skeleton.dtsi include
parents 72f61d2e 83640746

arch/arm/boot/dts/armv7-m.dtsi

+0 −2
Original line number Diff line number Diff line 
#include "skeleton.dtsi"



/ {

	nvic: interrupt-controller@e000e100  {

		compatible = "arm,armv7m-nvic";

arch/arm/boot/dts/efm32gg-dk3750.dts

+3 −2
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ 
		bootargs = "console=ttyefm4,115200 init=/linuxrc ignore_loglevel ihash_entries=64 dhash_entries=64 earlyprintk uclinux.physaddr=0x8c400000 root=/dev/mtdblock0";

	};



	memory {

	memory@88000000 {

		device_type = "memory";

		reg = <0x88000000 0x400000>;

	};
@@ -74,7 +75,7 @@ 
			status = "ok";

		};



		boardfpga: boardfpga {

		boardfpga: boardfpga@80000000 {

			compatible = "efm32board";

			reg = <0x80000000 0x400>;

			irq-gpios = <&gpio 64 1>;

arch/arm/boot/dts/efm32gg.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -4,10 +4,14 @@ 
 * Documentation available from

 * http://www.silabs.com/Support%20Documents/TechnicalDocs/EFM32GG-RM.pdf

 */



#include "armv7-m.dtsi"

#include "dt-bindings/clock/efm32-cmu.h"



/ {

	#address-cells = <1>;

	#size-cells = <1>;



	aliases {

		i2c0 = &i2c0;

		i2c1 = &i2c1;

arch/arm/boot/dts/lpc18xx.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ 
#define LPC_GPIO(port, pin)	(port * 32 + pin)



/ {

	#address-cells = <1>;

	#size-cells = <1>;



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;

arch/arm/boot/dts/lpc4337-ciaa.dts

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
		stdout-path = &uart2;

	};



	memory {

	memory@28000000 {

		device_type = "memory";

		reg = <0x28000000 0x0800000>; /* 8 MB */

	};