Merge branch 'omap5_audio_video-3.8.y' of git://git.ti.com/~a0393947/ti-linux-kernel...
authorDan Murphy <dmurphy@ti.com>
Fri, 31 May 2013 11:44:18 +0000 (06:44 -0500)
committerDan Murphy <dmurphy@ti.com>
Fri, 31 May 2013 11:44:18 +0000 (06:44 -0500)
TI-Feature: omap5_audio_video_base
TI-Tree: git://git.ti.com/~a0393947/ti-linux-kernel/audio-video-linux-feature-tree.git
TI-Branch: omap5_audio_video-3.8.y

* 'omap5_audio_video-3.8.y' of git://git.ti.com/~a0393947/ti-linux-kernel/audio-video-linux-feature-tree: (28 commits)
  arch: arm: configs: Add support for DRA7 evm in omap2plus_defconfig
  arm: dts: dra7-evm: Add pinmux configs needed for display
  HACK: pinctrl: pinctrl single: Make pinctrl-single init early
  OMAPDSS:HDMI: Change PLL calculations
  omapdss: hdmi: fix deepcolor mode configuration
  ARM: dts: DRA7x: Add DMM bindings
  omapdrm: hack: Assign managers/channel to outputs in a more trivial way
  gpu: drm: omap: Use bitmaps for placement
  drm/omap: Fix and improve crtc and overlay manager correlation
  drm/omap: fix modeset_init if a panel doesn't satisfy omapdrm requirements
  drm/omap: Take a fb reference in omap_plane_update()
  drm/omap: move out of staging
  Revert "gpu: drm: omap: Use bitmaps for placement"
  omapdss: hdmi: Add an i2c adapter node as a possible DT phandle
  HACK: omapdss: HDMI hacks for DRA7x
  omapdss: hdmi: Add support for DRA7xx SoCs
  HACK: omap_hwmod: enable DESHDCP clock before DSS module is enabled
  arm: dra7-evm dts: Add lcd panel support
  gpio: pcf857x: Convert to DT mode
  omapdss: displays: Add tfcs9700 DPI panel driver
  ...

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_hwmod_33xx_data.c

Signed-off-by: Dan Murphy <dmurphy@ti.com>
1  2 
arch/arm/configs/omap2plus_defconfig

index 6558691216c7e4f5430c341b3587348bceaef1f9,9dec6589f2594afeae8231d0fd0cdf6719a665c3..b94343fa51046f4b396357a4aea471d76b714317
@@@ -145,29 -138,22 +144,27 @@@ CONFIG_HW_RANDOM=
  CONFIG_I2C_CHARDEV=y
  CONFIG_SPI=y
  CONFIG_SPI_OMAP24XX=y
 +CONFIG_DEBUG_PINCTRL=y
 +CONFIG_PINCTRL_SINGLE=y
  CONFIG_DEBUG_GPIO=y
  CONFIG_GPIO_SYSFS=y
+ CONFIG_GPIO_PCF857X=y
  CONFIG_GPIO_TWL4030=y
  CONFIG_W1=y
  CONFIG_POWER_SUPPLY=y
  CONFIG_SENSORS_LM75=m
- CONFIG_WATCHDOG=y
  CONFIG_THERMAL=y
- CONFIG_THERMAL_HWMON=y
- CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
  CONFIG_THERMAL_GOV_FAIR_SHARE=y
- CONFIG_THERMAL_GOV_STEP_WISE=y
  CONFIG_THERMAL_GOV_USER_SPACE=y
  CONFIG_CPU_THERMAL=y
+ CONFIG_WATCHDOG=y
  CONFIG_OMAP_WATCHDOG=y
  CONFIG_TWL4030_WATCHDOG=y
 +CONFIG_PALMAS_WATCHDOG=y
  CONFIG_MFD_TPS65217=y
 -CONFIG_MFD_TPS65910=y
 +CONFIG_TWL6040_CORE=y
 +CONFIG_REGULATOR_TWL4030=y
 +CONFIG_MFD_PALMAS=y
  CONFIG_MFD_PALMAS_GPADC=y
  CONFIG_MFD_PALMAS_PWM=y
  CONFIG_MFD_PALMAS_RESOURCE=y
@@@ -176,19 -160,10 +173,21 @@@ CONFIG_MFD_TPS65910=
  CONFIG_REGULATOR_TPS65023=y
  CONFIG_REGULATOR_TPS6507X=y
  CONFIG_REGULATOR_TPS65217=y
 -CONFIG_REGULATOR_TWL4030=y
 +CONFIG_REGULATOR_TPS65910=y
 +CONFIG_MEDIA_SUPPORT=m
 +CONFIG_MEDIA_CAMERA_SUPPORT=y
 +CONFIG_VIDEO_DEV=m
 +CONFIG_VIDEO_V4L2=m
 +CONFIG_VIDEOBUF2_CORE=m
 +CONFIG_VIDEOBUF2_MEMOPS=m
 +CONFIG_VIDEOBUF2_VMALLOC=m
 +CONFIG_MEDIA_USB_SUPPORT=y
 +CONFIG_USB_VIDEO_CLASS=m
 +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 +CONFIG_USB_GSPCA=m
  CONFIG_DRM=y
+ CONFIG_DRM_OMAP=y
+ CONFIG_DRM_OMAP_NUM_CRTCS=3
  CONFIG_FIRMWARE_EDID=y
  CONFIG_FB_MODE_HELPERS=y
  CONFIG_FB_TILEBLITTING=y
@@@ -274,16 -234,13 +279,14 @@@ CONFIG_LEDS_TRIGGER_CPU=
  CONFIG_LEDS_TRIGGER_GPIO=y
  CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
  CONFIG_RTC_CLASS=y
- CONFIG_RTC_DRV_OMAP=y
+ CONFIG_RTC_DRV_PALMAS=y
  CONFIG_RTC_DRV_TWL92330=y
  CONFIG_RTC_DRV_TWL4030=y
- CONFIG_RTC_DRV_PALMAS=y
+ CONFIG_RTC_DRV_OMAP=y
  CONFIG_DMADEVICES=y
 +CONFIG_TI_EDMA=y
  CONFIG_DMA_OMAP=y
  CONFIG_STAGING=y
- CONFIG_DRM_OMAP=y
- CONFIG_DRM_OMAP_NUM_CRTCS=3
  CONFIG_TI_SOC_THERMAL=y
  CONFIG_TI_THERMAL=y
  CONFIG_OMAP4_THERMAL=y
@@@ -327,6 -284,3 +330,5 @@@ CONFIG_CRC_T10DIF=
  CONFIG_CRC_ITU_T=y
  CONFIG_CRC7=y
  CONFIG_LIBCRC32C=y
- CONFIG_SOC_DRA7XX=y
 +CONFIG_TI_DAVINCI_MDIO=y
 +CONFIG_TI_DAVINCI_CPDMA=y