ARM: OMAP: android_omap_defconfig: Sync omap2plus_defconfig
authorPraneeth Bajjuri <praneeth@ti.com>
Tue, 16 Apr 2013 23:10:03 +0000 (18:10 -0500)
committerPraneeth Bajjuri <praneeth@ti.com>
Tue, 16 Apr 2013 23:17:26 +0000 (18:17 -0500)
part-1:

Sync omap2plus_defconfig:
This picks up the below patches to android_omap_defconfig

1)
commit b09f88c2d2c6aa6847e5c9d6efe0a700a08f9f85
Revert "ARM: OMAP4+: omap2plus_defconfig: Enable audio via TWL6040 as module"
2)
commit 1ccfc404ff4d00c1ac82674d29589d626dedfbd1
arm: configs: disable unused sata configs
3)
e04bc502311d83435d164149318bb651bb766ebc
ARM: omap2plus_defconfig: Enable USB Video class drivers
4)
commit 4404b635bd7b41815647a7225734ac1408bd391f
ARM: OMAP2+: omap2plus_defconfig: Enable RTC support
5)
commit 3dec7e931e13a3ce5b95b4bb135e75d53706c38e
ARM: OMAP2+: Enable cpufreq-cpu0 Config options for cpufreq
6)
commit 16697b9e2cddf4750574f14d72178ed86d579642
ARM: OMAP2+: Enable DSS and OMAPDRM

--

part-2:

This patch also updates android_omap_defconfig cleanly
according to "make savedefconfig"

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
arch/arm/configs/android_omap_defconfig

index 7abbe8a54ab09847f9ec3bceb962aa9c95a38750..0cf8ea2a0d86948a5d6c749dce0649301c0ba4bc 100644 (file)
@@ -33,6 +33,11 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200 androidboot.console=ttyO2"
 CONFIG_KEXEC=y
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_GENERIC_CPUFREQ_CPU0=y
+# CONFIG_ARM_OMAP2PLUS_CPUFREQ is not set
 CONFIG_FPE_NWFPE=y
 CONFIG_BINFMT_MISC=y
 CONFIG_PM_DEBUG=y
@@ -88,7 +93,9 @@ CONFIG_BLK_DEV_SD=y
 CONFIG_SCSI_MULTI_LUN=y
 CONFIG_SCSI_SCAN_ASYNC=y
 CONFIG_ATA=y
+# CONFIG_SATA_PMP is not set
 CONFIG_SATA_AHCI_PLATFORM=m
+# CONFIG_ATA_SFF is not set
 CONFIG_MD=y
 CONFIG_NETDEVICES=y
 CONFIG_KS8851=y
@@ -128,7 +135,6 @@ 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_TWL4030=y
@@ -143,21 +149,23 @@ CONFIG_MFD_TPS65910=y
 CONFIG_MFD_PALMAS_GPADC=y
 CONFIG_MFD_PALMAS_PWM=y
 CONFIG_MFD_PALMAS_RESOURCE=y
-CONFIG_REGULATOR_PALMAS=y
 CONFIG_REGULATOR_TPS65023=y
 CONFIG_REGULATOR_TPS6507X=y
 CONFIG_REGULATOR_TPS65217=y
 CONFIG_REGULATOR_TPS65910=y
 CONFIG_REGULATOR_TWL4030=y
-CONFIG_FB=y
+CONFIG_MEDIA_SUPPORT=m
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_USB_SUPPORT=y
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_DRM=y
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_TILEBLITTING=y
-CONFIG_OMAP2_DSS=m
+CONFIG_OMAP2_DSS=y
 CONFIG_OMAP2_DSS_RFBI=y
 CONFIG_OMAP2_DSS_SDI=y
 CONFIG_OMAP2_DSS_DSI=y
-CONFIG_FB_OMAP2=m
 CONFIG_PANEL_GENERIC_DPI=m
 CONFIG_PANEL_SHARP_LS037V7DW01=m
 CONFIG_PANEL_NEC_NL8048HL11_01B=m
@@ -224,10 +232,13 @@ CONFIG_RTC_CLASS=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_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_ASHMEM=y