From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 15 Sep 2016 09:44:02 +0000 (+0200)
Subject: Merge tag 'davinci-for-v4.9/dts' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9b81a8ceea415808018ede67a09ab8c4963b584d;p=linux.git

Merge tag 'davinci-for-v4.9/dts' of git://git./linux/kernel/git/nsekhar/linux-davinci into next/dt

Pull "DaVinci DA850 device-tree enhancements include" from Sekhar Nori:

- Support for new board OMAP-L138 LCDK
- Add AEMIF node on DA850 EVM and use it for NAND
- Audio support for LCDK
- Cleanups for PWM and UART

* tag 'davinci-for-v4.9/dts' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: dts: da850-lcdk: Audio support via simple-card
  ARM: dts: da850,da850-evm: Add an aemif node and use it for the NAND
  ARM: dts: da850: Add basic DTS for the LCDK
  ARM: dts: da850: Add missing pin muxing for the UARTs
  ARM: dts: da850: Add new ECAP and EPWM bindings
---

9b81a8ceea415808018ede67a09ab8c4963b584d
diff --cc arch/arm/boot/dts/da850-evm.dts
index 5fd4c37680fd5,eedcc592ba51d..41de15fe15a2f
--- a/arch/arm/boot/dts/da850-evm.dts
+++ b/arch/arm/boot/dts/da850-evm.dts
@@@ -131,12 -145,7 +145,7 @@@
  			status = "okay";
  		};
  	};
- 	nand_cs3@62000000 {
- 		status = "okay";
- 		pinctrl-names = "default";
- 		pinctrl-0 = <&nand_cs3_pins>;
- 	};
 -	vbat: fixedregulator@0 {
 +	vbat: fixedregulator0 {
  		compatible = "regulator-fixed";
  		regulator-name = "vbat";
  		regulator-min-microvolt = <5000000>;