From: Arnd Bergmann <arnd@arndb.de>
Date: Sun, 24 Apr 2016 21:43:56 +0000 (+0200)
Subject: Merge tag 'omap-for-v4.7/dt-part1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1ea7c8b6fb23f5a8afec7c7ddc5776550331a2bf;p=linux-beck.git

Merge tag 'omap-for-v4.7/dt-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Merge "First set of device tree changes for omaps for v4.7 merge window" from Tony Lindgren:

- Two sets of name and unit address check fixes for dts files.

- DMA, McASP, and timer and regulator related dts changes for dra7

- Add more devices for Nokia N9/N950

- Initial support for am335x ICEv2

- Initial support for am572x-IDK

- Pinctrl changes for am335x-baltos-ir5221

- Initial support for Amazon Kindle Fire (first generation)

- A series of changes to add GPIO controller support for the
  GPMC driver. The driver changes will be merged separately.

- Support for am43xx clkout1

- Pinctrl and RTC changes for am335x-chili

- Add support for dra72-evm rev C (SR2.0)

* tag 'omap-for-v4.7/dt-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (61 commits)
  ARM: dts: Add support for dra72-evm rev C (SR2.0)
  ARM: dts: am335x-chilisom: Enable poweroff PMIC sequence using RTC signal
  ARM: dts: am335x-chili*: Move Ethernet MAC description from SOM to board
  ARM: dts: am335x-chili*: Move uart0 description from SOM to board
  ARM: dts: am43xx: add support for clkout1 clock
  ARM: dts: omap3-beagle: Provide NAND ready pin
  ARM: dts: am335x: Provide NAND ready pin
  ARM: dts: am437x: Provide NAND ready pin
  ARM: dts: dra7x-evm: Provide NAND ready pin
  ARM: dts: dm816x: Enable gpio controller for GPMC
  ARM: dts: dm814x: Enable gpio controller for GPMC
  ARM: dts: omap3: Enable gpio controller for GPMC
  ARM: dts: am4372: Enable gpio controller for GPMC
  ARM: dts: am335x: Enable gpio controller for GPMC
  ARM: dts: dra7: Enable gpio controller for GPMC
  ARM: dts: omap5: Enable gpio and interrupt controller for GPMC
  ARM: dts: omap4: Enable gpio and interrupt controller for GPMC
  ARM: dts: omap24xx: Enable gpio and interrupt controller for GPMC
  ARM: dts: omap4-kc1: Power off support
  ARM: dts: omap4-kc1: LEDs support
  ...
---

1ea7c8b6fb23f5a8afec7c7ddc5776550331a2bf
diff --cc arch/arm/boot/dts/Makefile
index a2bb8324cae3,e32392228748..6001ff695d6c
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -543,10 -528,11 +545,12 @@@ dtb-$(CONFIG_SOC_DRA7XX) += 
  	am57xx-beagle-x15.dtb \
  	am57xx-cl-som-am57x.dtb \
  	am57xx-sbc-am57x.dtb \
+ 	am572x-idk.dtb \
  	dra7-evm.dtb \
- 	dra72-evm.dtb
+ 	dra72-evm.dtb \
+ 	dra72-evm-revc.dtb
  dtb-$(CONFIG_ARCH_ORION5X) += \
 +	orion5x-kuroboxpro.dtb \
  	orion5x-lacie-d2-network.dtb \
  	orion5x-lacie-ethernet-disk-mini-v2.dtb \
  	orion5x-linkstation-lsgl.dtb \
diff --cc arch/arm/boot/dts/da850.dtsi
index c9bf27d5ee9c,c3910e285dde..c7e357ee2998
--- a/arch/arm/boot/dts/da850.dtsi
+++ b/arch/arm/boot/dts/da850.dtsi
@@@ -261,13 -247,13 +261,13 @@@
  			dma-names = "rx", "tx";
  			status = "disabled";
  		};
- 		ehrpwm0: ehrpwm@300000 {
 -		ehrpwm0: pwm@01f00000 {
++		ehrpwm0: pwm@300000 {
  			compatible = "ti,da850-ehrpwm", "ti,am33xx-ehrpwm";
  			#pwm-cells = <3>;
  			reg = <0x300000 0x2000>;
  			status = "disabled";
  		};
- 		ehrpwm1: ehrpwm@302000 {
 -		ehrpwm1: pwm@01f02000 {
++		ehrpwm1: pwm@302000 {
  			compatible = "ti,da850-ehrpwm", "ti,am33xx-ehrpwm";
  			#pwm-cells = <3>;
  			reg = <0x302000 0x2000>;