Merge branch 'audio-display-ti-linux-3.14.y' of git://git.ti.com/~darrene/ti-linux...

TI-Feature: audio-display
TI-Tree: git://git.ti.com/~darrene/ti-linux-kernel/audio-display-linux-feature-tree.git
TI-Branch: audio-display-ti-linux-3.14.y

* 'audio-display-ti-linux-3.14.y' of git://git.ti.com/~darrene/ti-linux-kernel/audio-display-linux-feature-tree:
  drm/omap: stop connector polling during suspend
  drm/omap: remove dummy PM functions
  ARM: DTS: am57xx-beagle-x15: Enable analog audio support
  ARM: DTS: am57xx-beagle-x15: Add node for tlv320aic3104 codec
  ARM: DTS: am57xx-beagle-x15: Enable McASP3
  ARM: DTS: am57xx-beagle-x15: Add new fixed regulator for aic3104 DVDD
  ARM: DTS: am57xx-beagle-x15: Pinctrl entry for mcasp3 pins
  ARM: DTS: am57xx-beagle-x15: Pinctrl entry for xref_clk0.clkout2
  ARM: DTS: am57xx-beagle-x15: No need to include ti-dra7-atl.h
  ARM: DTS: dra7xx-clocks: Add gate clock for CLKOUT2

Conflicts:
	arch/arm/boot/dts/am57xx-beagle-x15.dts

Signed-off-by: Dan Murphy <DMurphy@ti.com>

diff --cc arch/arm/boot/dts/am57xx-beagle-x15.dts
index 0ff5fd1,091344d..122d9a2
--- 1/arch/arm/boot/dts/am57xx-beagle-x15.dts
--- 2/arch/arm/boot/dts/am57xx-beagle-x15.dts
+++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts
@@@ -404,24 -416,35 +425,53 @@@
                >;
        };
  
 +      usb1_pins: pinmux_usb1_pins {
 +              pinctrl-single,pins = <
 +                      0x280 (PIN_INPUT_SLEW | MUX_MODE0) /* usb1_drvvbus */
 +              >;
 +      };
 +
 +      usb2_pins: pinmux_usb2_pins {
 +              pinctrl-single,pins = <
 +                      0x284 (PIN_INPUT_SLEW | MUX_MODE0) /* usb2_drvvbus */
 +              >;
 +      };
 +
 +      extcon_pins_default:  extcon_pins_default {
 +              pinctrl-single,pins = <
 +                      0x3e8 (PIN_INPUT | MUX_MODE14) /* uart1_ctsn.gpio7_24 */
 +              >;
 +      };
 +
+       clkout2_pins_default: clkout2_pins_default {
+               pinctrl-single,pins = <
+                       0x294 (PIN_OUTPUT_PULLDOWN | MUX_MODE9) /* xref_clk0.clkout2 */
+               >;
+       };
+ 
+       clkout2_pins_sleep: clkout2_pins_sleep {
+               pinctrl-single,pins = <
+                       0x294 (PIN_INPUT | MUX_MODE15)  /* xref_clk0.clkout2 */
+               >;
+       };
+ 
+       mcasp3_pins_default: mcasp3_pins_default {
+               pinctrl-single,pins = <
+                       0x324 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp3_aclkx.mcasp3_aclkx */
+                       0x328 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp3_fsx.mcasp3_fsx */
+                       0x32c (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mcasp3_axr0.mcasp3_axr0 */
+                       0x330 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp3_axr1.mcasp3_axr1 */
+               >;
+       };
+ 
+       mcasp3_pins_sleep: mcasp3_pins_sleep {
+               pinctrl-single,pins = <
+                       0x324 (PIN_INPUT | MUX_MODE15)
+                       0x328 (PIN_INPUT | MUX_MODE15)
+                       0x32c (PIN_INPUT | MUX_MODE15)
+                       0x330 (PIN_INPUT | MUX_MODE15)
+               >;
+       };
  };
  
  &i2c1 {
@@@ -787,22 -825,16 +852,36 @@@
        timers = <&timer6>;
  };
  
 +&usb1 {
 +      dr_mode = "host";
 +      pinctrl-names = "default";
 +      pinctrl-0 = <&usb1_pins>;
 +};
 +
 +&omap_dwc3_2 {
 +      extcon = <&extcon>;
 +};
 +
 +&usb2 {
 +      /*
 +       * NOTE(rev A1+): Assumes R321 is populated(default).
 +       * If R321 is DNI and R320 is populated, this should be "host"
 +       */
 +      dr_mode = "peripheral";
 +      pinctrl-names = "default";
 +      pinctrl-0 = <&usb2_pins>;
 +};
++
+ &mcasp3 {
+       pinctrl-names = "default", "sleep";
+       pinctrl-0 = <&mcasp3_pins_default>;
+       pinctrl-1 = <&mcasp3_pins_sleep>;
+       status = "okay";
+ 
+       op-mode = <0>;  /* MCASP_IIS_MODE */
+       tdm-slots = <2>;
+       /* 4 serializers */
+       serial-dir = <  /* 0: INACTIVE, 1: TX, 2: RX */
+               1 2 0 0
+       >;
+ };

diff --cc arch/arm/boot/dts/dra7xx-clocks.dtsi
Simple merge