Merge remote-tracking branch 'av-feat-tree/omap5_audio_video-3.8.y' into vayu_exp
authorArchit Taneja <archit@ti.com>
Thu, 30 May 2013 13:36:08 +0000 (19:06 +0530)
committerArchit Taneja <archit@ti.com>
Thu, 30 May 2013 13:36:08 +0000 (19:06 +0530)
Conflicts:
arch/arm/boot/dts/omap5-sevm.dts
arch/arm/boot/dts/omap5-uevm.dts
arch/arm/boot/dts/omap5.dtsi
arch/arm/configs/omap2plus_defconfig
arch/arm/mach-omap2/omap-mpuss-lowpower.c
arch/arm/mach-omap2/omap_hwmod_33xx_data.c

Signed-off-by: Archit Taneja <archit@ti.com>
13 files changed:
1  2 
arch/arm/boot/dts/omap3-beagle-xm.dts
arch/arm/boot/dts/omap4-sdp.dts
arch/arm/boot/dts/omap4.dtsi
arch/arm/boot/dts/omap5-sevm.dts
arch/arm/boot/dts/omap5-uevm.dts
arch/arm/boot/dts/omap5.dtsi
arch/arm/boot/dts/twl4030.dtsi
arch/arm/configs/omap2plus_defconfig
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/board-generic.c
arch/arm/mach-omap2/common.h
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/omap_hwmod.h

Simple merge
Simple merge
Simple merge
Simple merge
index ce2ac66a8e59707e0f9b4a7888c73deef2246a47,dd989c5e8e40e7ef3dc1a47a31d1566068c9f2a5..5e57049b7625af0c13c7fe02d3535b38a0a0e0f2
                        &dmic_pins
                        &mcbsp1_pins
                        &mcbsp2_pins
 +                      &palmas_pins
+                       &dss_hdmi_pins
+                       &tpd12s015_pins
+                       &tca6424a_pins
        >;
  
        twl6040_pins: pinmux_twl6040_pins {
                >;
        };
  
 +      palmas_pins: pinmux_palmas_pins {
 +              pinctrl-single,pins = <
 +                      0x140 0x11f     /* MSLEEP INPUT | PULLUP | MODE7 */
 +              >;
 +      };
++
+       dss_hdmi_pins: pinmux_dss_hdmi_pins {
+               pinctrl-single,pins = <
+                       0x0fc 0x118     /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */
+                       0x100 0x106     /* GPIO7_194, DDC-SCL */
+                       0x102 0x106     /* GPIO7_195, DDC-SDA */
+               >;
+       };
+       tpd12s015_pins: pinmux_tpd12s015_pins {
+               pinctrl-single,pins = <
+                       0x0fe 0x116     /* hdmi_hpd.gpio7_193 INPUT PULLDOWN | MODE6 */
+               >;
+       };
+       tca6424a_pins: pinmux_tca6424a_pins {
+               pinctrl-single,pins = <
+                       0x186 0x100     /* i2c5_scl.i2c5_scl INPUT | MODE0 */
+                       0x188 0x100     /* i2c5_sda.i2c5_sda INPUT | MODE0 */
+               >;
+       };
  };
  
  &mmc1 {
index 5ede6e1296a12f89b06a9b7b16eb321c20d04b6f,42facf861602da919f87ade672e2a0f6401aebd7..8f1b49b5c6a34c56f2f2f0727b274996c68d7655
                        interrupts = <0 80 0x4>;
                        ti,hwmods = "wd_timer2";
                };
 +              bandgap {
 +                      reg = <0x4a0021e0 0xc
 +                              0x4a00232c 0xc
 +                              0x4a002380 0x2c
 +                              0x4a0023C0 0x3c>;
 +                              interrupts = <0 126 4>; /* talert */
 +                      compatible = "ti,omap5430-bandgap";
 +              };
++
+               dss {
+                       compatible = "ti,omap4-dss";
+                       ti,hwmods = "dss_core";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       dispc {
+                               compatible = "ti,omap4-dispc";
+                               ti,hwmods = "dss_dispc";
+                       };
+                       dpi: dpi {
+                               compatible = "ti,omap4-dpi";
+                               video-source = <2>;
+                       };
+                       dsi1: dsi@1 {
+                               compatible = "ti,omap4-dsi";
+                               ti,hwmods = "dss_dsi1_a";
+                               reg = <0>;
+                               vdds_dsi-supply = <&ldo7_reg>;
+                               video-source = <0>;
+                       };
+                       dsi2: dsi@2 {
+                               compatible = "ti,omap4-dsi";
+                               ti,hwmods = "dss_dsi1_c";
+                               reg = <1>;
+                               vdds_dsi-supply = <&ldo7_reg>;
+                               video-source = <2>;
+                       };
+                       hdmi: hdmi {
+                               compatible = "ti,omap4-hdmi", "simple-bus";
+                               ti,hwmods = "dss_hdmi";
+                               vdda_hdmi_dac-supply = <&ldo7_reg>;
+                               video-source = <1>;
+                       };
+               };
        };
  };
Simple merge
index 64dc3c157327870fb6e6a6495d5f75c8589dbc70,470e35fc99163bb41c06e51eaa01e9959da1ad7f..6bf615c16e6bce72be8e150f2467b6467fa3647e
@@@ -243,11 -209,8 +243,13 @@@ CONFIG_RTC_DRV_PALMAS=
  CONFIG_DMADEVICES=y
  CONFIG_DMA_OMAP=y
  CONFIG_STAGING=y
 +CONFIG_TI_SOC_THERMAL=y
 +CONFIG_TI_THERMAL=y
 +CONFIG_OMAP4_THERMAL=y
 +CONFIG_OMAP5_THERMAL=y
 +CONFIG_DRA752_THERMAL=y
+ CONFIG_DRM_OMAP=y
+ CONFIG_DRM_OMAP_NUM_CRTCS=3
  CONFIG_EXT2_FS=y
  CONFIG_EXT3_FS=y
  # CONFIG_EXT3_FS_XATTR is not set
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge