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

Pull "Device tree changes for omaps for v4.14 merge window" from Tony Lindgren:

- A series of changes for dra7 and am572 to use generic
  MMC vqmmc regulator

- Clean-up tps65217 internal interrupts to define them
  only in tps65217.dtsi

- Add dra7 iodelay pinctrl driver configuration

- Add buzzer support for am437x-gp-evm

- Disable HDMI CEC internal pull-ups as it seems that
  all boards have an external pull for these

- Remove unnecessary interrupt-parent for omap3

- Configure droid 4 vaudio regulator initial mode and
  add vibrator

- Enable NAND dma prefetch for am335x-evm, am437x and dra7

- Add pcie1 dt node for EP mode for am57x and dra7

- Add support for new dra76x SoCs and dra76x-evm

* tag 'omap-for-v4.14/dt-v3-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (25 commits)
  ARM: dts: nokia n900: update dts with camera support
  ARM: dts: Add support for dra76-evm
  ARM: dts: Add support for dra76x family of devices
  ARM: dts: DRA7: Add pcie1 dt node for EP mode
  ARM: dts: am335x: add support for Moxa UC-8100-ME-T open platform
  ARM: dts: dra7xx: Enable NAND dma prefetch by default
  ARM: dts: am437xx: Enable NAND dma prefetch by default
  ARM: dts: am335x-evm: Enable NAND dma prefetch by default
  ARM: dts: omap4-droid4: Add vibrator
  ARM: dts: motorola-cpcap-mapphone: set initial mode for vaudio
  ARM: dts: omap3: Remove needless interrupt-parent property
  ARM: dts: Disable HDMI CEC internal pull-ups
  ARM: dts: am437x-gp-evm: Add support for buzzer
  ARM: dts: Add dra7 iodelay configuration
  ARM: dts: tps65217: Add power button interrupt to the common tps65217.dtsi file
  ARM: dts: tps65217: Add charger interrupts to the common tps65217.dtsi file
  ARM: dts: omap*: Replace deprecated "vmmc_aux" with "vqmmc"
  ARM: dts: am572x-idk: Fix GPIO polarity for MMC1 card detect
  ARM: dts: am571x-idk: Fix GPIO polarity for MMC1 card detect
  ARM: dts: dra7: Add "max-frequency" property to MMC dt nodes
  ...

1 files changed, 15 insertions, 1 deletions

diff --git a/arch/arm/boot/dts/dra71-evm.dts b/arch/arm/boot/dts/dra71-evm.dts
index a6298eb56978..8b1722301c9a 100644
--- a/arch/arm/boot/dts/dra71-evm.dts
+++ b/arch/arm/boot/dts/dra71-evm.dts
@@ -32,6 +32,16 @@
 			  3000000 0x1>;
 	};
 
+	evm_1v8_sw: fixedregulator-evm_1v8 {
+		compatible = "regulator-fixed";
+		regulator-name = "evm_1v8";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		vin-supply = <&lp8732_buck0_reg>;
+		regulator-always-on;
+		regulator-boot-on;
+	};
+
 	poweroff: gpio-poweroff {
 		compatible = "gpio-poweroff";
 		gpios = <&gpio7 30 GPIO_ACTIVE_HIGH>;
@@ -162,7 +172,11 @@
 };
 
 &mmc1 {
-	vmmc_aux-supply = <&vpo_sd_1v8_3v3>;
+	vqmmc-supply = <&vpo_sd_1v8_3v3>;
+};
+
+&mmc2 {
+	vmmc-supply = <&evm_1v8_sw>;
 };
 
 &mac {