Merge tag 'davinci-for-v4.9/dts' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/boot/dts/da850-evm.dts
index 5fd4c37,eedcc59..41de15f
--- 1/arch/arm/boot/dts/da850-evm.dts
--- 2/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>;