UBUNTU: Config align with omap2plus_defconfig

Signed-off-by: Xavier Boudet <x-boudet@ti.com>

1 files changed, 53 insertions, 25 deletions

diff --git a/debian.ti-omap5/config/config.common.ubuntu b/debian.ti-omap5/config/config.common.ubuntu
index 5be1e17c45d3..0dc61c378c33 100644
--- a/debian.ti-omap5/config/config.common.ubuntu
+++ b/debian.ti-omap5/config/config.common.ubuntu
@@ -127,6 +127,7 @@ CONFIG_ARM_UNWIND=y
 # CONFIG_ASYMMETRIC_KEY_TYPE is not set
 # CONFIG_ASYNC_TX_DMA is not set
 # CONFIG_AT76C50X_USB is not set
+# CONFIG_AT803X_PHY is not set
 CONFIG_ATA=y
 CONFIG_ATAGS=y
 CONFIG_ATAGS_PROC=y
@@ -683,6 +684,7 @@ CONFIG_GPIO_PCA953X=y
 # CONFIG_GPIO_SX150X is not set
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_TWL4030=y
+# CONFIG_GPIO_TWL6040 is not set
 # CONFIG_HAMRADIO is not set
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
@@ -730,10 +732,10 @@ CONFIG_HAVE_UID16=y
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_HFS_FS is not set
 CONFIG_HID=y
-# CONFIG_HIDRAW is not set
+CONFIG_HIDRAW=y
 # CONFIG_HID_A4TECH is not set
 # CONFIG_HID_ACRUX is not set
-# CONFIG_HID_APPLE is not set
+CONFIG_HID_APPLE=y
 # CONFIG_HID_AUREAL is not set
 # CONFIG_HID_BATTERY_STRENGTH is not set
 # CONFIG_HID_BELKIN is not set
@@ -797,7 +799,8 @@ CONFIG_HOTPLUG_CPU=y
 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
 # CONFIG_HWMON_VID is not set
-# CONFIG_HWSPINLOCK_OMAP is not set
+CONFIG_HWSPINLOCK=y
+CONFIG_HWSPINLOCK_OMAP=y
 CONFIG_HW_CONSOLE=y
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_HW_RANDOM=y
@@ -805,6 +808,7 @@ CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_EXYNOS is not set
 CONFIG_HW_RANDOM_OMAP=y
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
+# CONFIG_HW_RANDOM_VIRTIO is not set
 CONFIG_HZ=128
 CONFIG_I2C=y
 CONFIG_I2C_ALGOBIT=y
@@ -889,9 +893,11 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_INPUT_TWL4030_PWRBUTTON=y
 # CONFIG_INPUT_TWL4030_VIBRA is not set
+# CONFIG_INPUT_TWL6040_VIBRA is not set
 # CONFIG_INPUT_UINPUT is not set
 # CONFIG_INPUT_YEALINK is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
+CONFIG_IOMMU_API=y
 CONFIG_IOMMU_SUPPORT=y
 CONFIG_IOSCHED_CFQ=y
 CONFIG_IOSCHED_DEADLINE=y
@@ -1000,6 +1006,7 @@ CONFIG_KTIME_SCALAR=y
 CONFIG_LBDAF=y
 # CONFIG_LCD_AMS369FG06 is not set
 CONFIG_LCD_CLASS_DEVICE=y
+# CONFIG_LCD_ILI9320 is not set
 # CONFIG_LCD_L4F00242T03 is not set
 # CONFIG_LCD_LD9040 is not set
 # CONFIG_LCD_LMS283GF05 is not set
@@ -1157,10 +1164,11 @@ CONFIG_MFD_CORE=y
 # CONFIG_MFD_MAX8998 is not set
 # CONFIG_MFD_MC13XXX_I2C is not set
 # CONFIG_MFD_MC13XXX_SPI is not set
+CONFIG_MFD_OMAP_USB_HOST=y
 CONFIG_MFD_PALMAS=y
-# CONFIG_MFD_PALMAS_GPADC is not set
+CONFIG_MFD_PALMAS_GPADC=y
 # CONFIG_MFD_PALMAS_PWM is not set
-# CONFIG_MFD_PALMAS_RESOURCE is not set
+CONFIG_MFD_PALMAS_RESOURCE=y
 # CONFIG_MFD_PCF50633 is not set
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_SEC_CORE is not set
@@ -1179,7 +1187,7 @@ CONFIG_MFD_PALMAS=y
 # CONFIG_MFD_TPS65910 is not set
 # CONFIG_MFD_TPS65912_I2C is not set
 # CONFIG_MFD_TPS65912_SPI is not set
-CONFIG_MFD_TWL4030_AUDIO=y
+# CONFIG_MFD_TWL4030_AUDIO is not set
 # CONFIG_MFD_WL1273_CORE is not set
 # CONFIG_MFD_WM831X_I2C is not set
 # CONFIG_MFD_WM831X_SPI is not set
@@ -1485,8 +1493,11 @@ CONFIG_OMAP_DEBUG_DEVICES=y
 CONFIG_OMAP_DEBUG_LEDS=y
 CONFIG_OMAP_DM_TIMER=y
 CONFIG_OMAP_INTERCONNECT=y
-# CONFIG_OMAP_IOMMU is not set
-# CONFIG_OMAP_MBOX_FWK is not set
+CONFIG_OMAP_IOMMU=y
+CONFIG_OMAP_IOMMU_DEBUG=y
+CONFIG_OMAP_IOVMM=y
+CONFIG_OMAP_MBOX_FWK=y
+CONFIG_OMAP_MBOX_KFIFO_SIZE=256
 CONFIG_OMAP_MUX=y
 CONFIG_OMAP_MUX_DEBUG=y
 CONFIG_OMAP_MUX_WARNINGS=y
@@ -1499,6 +1510,7 @@ CONFIG_OMAP_PACKAGE_CUS=y
 CONFIG_OMAP_PACKAGE_ZAC=y
 CONFIG_OMAP_PACKAGE_ZAF=y
 CONFIG_OMAP_PM_NOOP=y
+# CONFIG_OMAP_REMOTEPROC is not set
 CONFIG_OMAP_RESET_CLOCKS=y
 # CONFIG_OMAP_USB2 is not set
 CONFIG_OMAP_WATCHDOG=y
@@ -1775,6 +1787,7 @@ CONFIG_SCSI_SCAN_ASYNC=y
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_SRP_ATTRS is not set
 # CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_VIRTIO is not set
 CONFIG_SDIO_UART=y
 # CONFIG_SECCOMP is not set
 CONFIG_SECURITY=y
@@ -1945,18 +1958,23 @@ CONFIG_SND_DEBUG_VERBOSE=y
 # CONFIG_SND_DESIGNWARE_I2S is not set
 CONFIG_SND_DRIVERS=y
 # CONFIG_SND_DUMMY is not set
-# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_DYNAMIC_MINORS=y
 # CONFIG_SND_EMU10K1_SEQ is not set
 # CONFIG_SND_HRTIMER is not set
 CONFIG_SND_JACK=y
-CONFIG_SND_MIXER_OSS=m
+# CONFIG_SND_MIXER_OSS is not set
 # CONFIG_SND_MPU401 is not set
 # CONFIG_SND_MTPAV is not set
 CONFIG_SND_OMAP_SOC=y
+CONFIG_SND_OMAP_SOC_ABE=y
 # CONFIG_SND_OMAP_SOC_AM3517EVM is not set
-CONFIG_SND_OMAP_SOC_MCBSP=m
+CONFIG_SND_OMAP_SOC_DMIC=y
+CONFIG_SND_OMAP_SOC_MCASP=y
+CONFIG_SND_OMAP_SOC_MCBSP=y
+CONFIG_SND_OMAP_SOC_MCPDM=y
 # CONFIG_SND_OMAP_SOC_N810 is not set
-CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
+# CONFIG_SND_OMAP_SOC_OMAP3_PANDORA is not set
+CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=y
 # CONFIG_SND_OMAP_SOC_OMAP_HDMI is not set
 # CONFIG_SND_OMAP_SOC_OMAP_TWL4030 is not set
 # CONFIG_SND_OMAP_SOC_RX51 is not set
@@ -1964,10 +1982,8 @@ CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
 # CONFIG_SND_OMAP_SOC_ZOOM2 is not set
 # CONFIG_SND_OPL3_LIB_SEQ is not set
 # CONFIG_SND_OPL4_LIB_SEQ is not set
-CONFIG_SND_OSSEMUL=y
 CONFIG_SND_PCM=y
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
+# CONFIG_SND_PCM_OSS is not set
 # CONFIG_SND_PCM_XRUN_DEBUG is not set
 # CONFIG_SND_RAWMIDI_SEQ is not set
 # CONFIG_SND_SBAWE_SEQ is not set
@@ -1977,8 +1993,10 @@ CONFIG_SND_PCM_OSS_PLUGINS=y
 CONFIG_SND_SOC=y
 # CONFIG_SND_SOC_ALL_CODECS is not set
 CONFIG_SND_SOC_DMAENGINE_PCM=y
+CONFIG_SND_SOC_DMIC=y
 CONFIG_SND_SOC_I2C_AND_SPI=y
-CONFIG_SND_SOC_TWL4030=m
+CONFIG_SND_SOC_SPDIF=y
+CONFIG_SND_SOC_TWL6040=y
 CONFIG_SND_SPI=y
 CONFIG_SND_SUPPORT_OLD_API=y
 CONFIG_SND_TIMER=y
@@ -1996,8 +2014,7 @@ CONFIG_SOC_TI81XX=y
 # CONFIG_SOFT_WATCHDOG is not set
 # CONFIG_SOLARIS_X86_PARTITION is not set
 CONFIG_SOUND=y
-CONFIG_SOUND_OSS_CORE=y
-CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+# CONFIG_SOUND_OSS_CORE is not set
 # CONFIG_SOUND_PRIME is not set
 CONFIG_SPARSE_IRQ=y
 # CONFIG_SPARSE_RCU_POINTER is not set
@@ -2142,7 +2159,7 @@ CONFIG_TWL4030_CORE=y
 CONFIG_TWL4030_POWER=y
 # CONFIG_TWL4030_USB is not set
 CONFIG_TWL4030_WATCHDOG=y
-# CONFIG_TWL6040_CORE is not set
+CONFIG_TWL6040_CORE=y
 # CONFIG_UACCESS_WITH_MEMCPY is not set
 CONFIG_UBIFS_FS=y
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
@@ -2188,7 +2205,11 @@ CONFIG_USB_DEBUG=y
 # CONFIG_USB_DUMMY_HCD is not set
 # CONFIG_USB_DWC3 is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_EHCI_HCD is not set
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_HCD_OMAP=y
+# CONFIG_USB_EHCI_HCD_PLATFORM is not set
+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+CONFIG_USB_EHCI_TT_NEWSCHED=y
 # CONFIG_USB_EMI26 is not set
 # CONFIG_USB_EMI62 is not set
 # CONFIG_USB_ENESTORAGE is not set
@@ -2216,7 +2237,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=2
 # CONFIG_USB_G_PRINTER is not set
 # CONFIG_USB_G_SERIAL is not set
 CONFIG_USB_HID=y
-# CONFIG_USB_HIDDEV is not set
+CONFIG_USB_HIDDEV=y
 # CONFIG_USB_IDMOUSE is not set
 # CONFIG_USB_IOWARRIOR is not set
 # CONFIG_USB_IPHETH is not set
@@ -2233,7 +2254,7 @@ CONFIG_USB_KC2190=y
 # CONFIG_USB_LEGOTOWER is not set
 CONFIG_USB_LIBCOMPOSITE=m
 # CONFIG_USB_M66592 is not set
-# CONFIG_USB_MASS_STORAGE is not set
+CONFIG_USB_MASS_STORAGE=m
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
 # CONFIG_USB_MIDI_GADGET is not set
@@ -2275,6 +2296,7 @@ CONFIG_USB_NET_ZAURUS=y
 # CONFIG_USB_SERIAL is not set
 # CONFIG_USB_SEVSEG is not set
 # CONFIG_USB_SIERRA_NET is not set
+# CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_SL811_HCD is not set
 CONFIG_USB_STORAGE=y
 # CONFIG_USB_STORAGE_ALAUDA is not set
@@ -2312,12 +2334,19 @@ CONFIG_USE_OF=y
 CONFIG_VECTORS_BASE=0xffff0000
 # CONFIG_VETH is not set
 CONFIG_VFAT_FS=y
+# CONFIG_VFIO is not set
 CONFIG_VFP=y
 CONFIG_VFPv3=y
 # CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_OUTPUT_CONTROL is not set
-# CONFIG_VIRTIO_MMIO is not set
-# CONFIG_VIRT_DRIVERS is not set
+CONFIG_VIRTIO=y
+# CONFIG_VIRTIO_BALLOON is not set
+# CONFIG_VIRTIO_BLK is not set
+# CONFIG_VIRTIO_CONSOLE is not set
+CONFIG_VIRTIO_MMIO=y
+# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+# CONFIG_VIRTIO_NET is not set
+CONFIG_VIRT_DRIVERS=y
 CONFIG_VIRT_TO_BUS=y
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_VLAN_8021Q is not set
@@ -2367,7 +2396,6 @@ CONFIG_WIRELESS_EXT=y
 CONFIG_WLAN=y
 # CONFIG_WL_TI is not set
 # CONFIG_X25 is not set
-# CONFIG_XEN is not set
 CONFIG_XFRM=y
 CONFIG_XFRM_ALGO=y
 CONFIG_XFRM_MIGRATE=y