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

Device tree changes for omaps for v4.6 merge window. Mostly just
adding board specific devices and few new boards:

- N900 improvments for adp1653 and gpio keys

- Add missing bandgap data for omap3

- Add more devices for compulab cm-t335

- Add n950 WLAN support, enable modem, add pinctrl for SSI

- Correct dm814x and dra62x auxclk rate, add support for GPMC and NAND

- Add syscon node for PHY's on dra7

- Add support more devices on logicpd torpedo

- Add USB host support for igep and specify boot console

- Fix audio clock for am335x-sl50 and specify boot console

- Remove deprecated tx-fifo-resize for dwc3 that was only used on
  omap5 es1.0

- Add dra7 thermal data

- Update am43x-epos-evm compatible string to am438

- Add support for logicpd dm3730 som-lv

* tag 'omap-for-v4.6/dt-pt1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (38 commits)
  ARM: dts: am57xx-beagle-x15: Add eeprom information
  ARM: dts: Add HSUSB2 EHCI Support to Logic PD DM37xx SOM-LV
  ARM: dts: n900: Use linux input defines instead hardcoded constants
  ARM: DTS: Add minimal Support for Logic PD DM3730 SOM-LV
  ARM: dts: omap3logic: Add PWM-Backlight
  ARM: dts: omap3-n900: Allow gpio keys to be disabled
  ARM: dts: am43x-epos-evm: Add the am438 compatible string
  ARM: dts: DRA7: Add missing IVA and DSPEVE thermal domain data
  ARM: dts: DRA7: Add IVA thermal data
  ARM: dts: DRA7: Add DSPEVE thermal data
  ARM: dts: remove deprecated property dwc3
  ARM: dts: OMAP3-N950-N9: Add ssi idle pinctrl state
  ARM: dts: am335x-sl50: Fix audio codec setup.
  ARM: dts: am335x-sl50: Specify the device to be used for boot console output.
  ARM: dts: omap3-igep0030-common: Add USB Host support
  ARM: dts: igep00x0: Specify the device to be used for boot console output.
  ARM: dts: LogicPD Torpedo: Set HSUSB0 Pin Mux
  ARM: dts: OMAP3-N950-N9: Enable modem
  ARM: dts: OMAP3-N950-N9: Enable SSI module
  ARM: dts: LogicPD Torpedo: Add SPI EEPROM
  ...

1 files changed, 2 insertions, 14 deletions

diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
index 92068fbf8b57..8b13a782cafb 100644
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -897,18 +897,6 @@
 			status = "disabled";
 		};
 
-		am43xx_control_usb2phy1: control-phy@44e10620 {
-			compatible = "ti,control-phy-usb2-am437";
-			reg = <0x44e10620 0x4>;
-			reg-names = "power";
-		};
-
-		am43xx_control_usb2phy2: control-phy@0x44e10628 {
-			compatible = "ti,control-phy-usb2-am437";
-			reg = <0x44e10628 0x4>;
-			reg-names = "power";
-		};
-
 		ocp2scp0: ocp2scp@483a8000 {
 			compatible = "ti,am437x-ocp2scp", "ti,omap-ocp2scp";
 			#address-cells = <1>;
@@ -919,7 +907,7 @@
 			usb2_phy1: phy@483a8000 {
 				compatible = "ti,am437x-usb2";
 				reg = <0x483a8000 0x8000>;
-				ctrl-module = <&am43xx_control_usb2phy1>;
+				syscon-phy-power = <&scm_conf 0x620>;
 				clocks = <&usb_phy0_always_on_clk32k>,
 					 <&usb_otg_ss0_refclk960m>;
 				clock-names = "wkupclk", "refclk";
@@ -938,7 +926,7 @@
 			usb2_phy2: phy@483e8000 {
 				compatible = "ti,am437x-usb2";
 				reg = <0x483e8000 0x8000>;
-				ctrl-module = <&am43xx_control_usb2phy2>;
+				syscon-phy-power = <&scm_conf 0x628>;
 				clocks = <&usb_phy1_always_on_clk32k>,
 					 <&usb_otg_ss1_refclk960m>;
 				clock-names = "wkupclk", "refclk";