Merge branch 'p-ti-linux-3.14.y-common' into p-ti-linux-3.14.y-android
authorVishal Mahaveer <vishalm@ti.com>
Wed, 27 May 2015 13:16:46 +0000 (08:16 -0500)
committerVishal Mahaveer <vishalm@ti.com>
Wed, 27 May 2015 13:16:46 +0000 (08:16 -0500)
* p-ti-linux-3.14.y-common:
  OMAPDSS: Reorder the Makefile so that LCD is loaded before HDMI
  Revert "TEMP: ARM: dts: dra7-evm: add i2c2 pinmux back in kernel"
  i2c: tvp5158: Enabling the enum_framesizes subdev op
  ARM: dts: dra7-evm: Add TVP5158 node
  ti_fragments: audio_display: Make VIP/VPE/TVP5158 a built-in
  i2c: tvp5158: Analog camera decoder driver

Change-Id: I14ac5fd2badd21d77a559e9ea76cba2a3a78190e
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
1  2 
arch/arm/boot/dts/dra7-evm.dts

index 22217410a145bd8bff4b3865272317fa5f7c796a,9c2a078e764a8f0ca7287772596b9c2b29f7f324..de17eb326edab8b52a3173519e86c95878f217f0
  };
  
  &dra7_pmx_core {
-       i2c2_pins: pinmux_i2c2_pins {
-               pinctrl-single,pins = <
-                       0x408 (PIN_INPUT | MUX_MODE0) /* i2c2_sda */
-                       0x40c (PIN_INPUT | MUX_MODE0) /* i2c2_scl */
-               >;
-       };
        dcan1_pins_default: dcan1_pins_default {
                pinctrl-single,pins = <
                        0x3d0   (PIN_OUTPUT_PULLUP | MUX_MODE0) /* dcan1_tx */
  
  i2c_p3_exp: &i2c2 {
        status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&i2c2_pins>;
        clock-frequency = <400000>;
  
        pcf_hdmi: gpio@26 {
  };
  
  &usb1 {
 -      dr_mode = "otg";
 +      dr_mode = "peripheral";
  };
  
  &usb2 {