diff options
| -rw-r--r-- | config-arm-generic | 2 | ||||
| -rw-r--r-- | config-armv7 | 97 | ||||
| -rw-r--r-- | config-armv7-generic | 2 | ||||
| -rw-r--r-- | config-generic | 2 | ||||
| -rw-r--r-- | kernel.spec | 3 |
5 files changed, 96 insertions, 10 deletions
diff --git a/config-arm-generic b/config-arm-generic index 2397c3758..6c070483a 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -410,7 +410,7 @@ CONFIG_IEEE802154_MRF24J40=m # CONFIG_PINCTRL_EXYNOS4 is not set # CONFIG_PINCTRL_EXYNOS5440 is not set -# CONFIG_AUTO_ZRELADDR is not set +CONFIG_AUTO_ZRELADDR=y # CONFIG_ASYMMETRIC_KEY_TYPE is not set # CONFIG_VFIO is not set diff --git a/config-armv7 b/config-armv7 index ffaf72eea..6c5ebce33 100644 --- a/config-armv7 +++ b/config-armv7 @@ -115,50 +115,89 @@ CONFIG_OMAP_RESET_CLOCKS=y CONFIG_OMAP_MUX=y CONFIG_OMAP_MUX_WARNINGS=y CONFIG_OMAP_32K_TIMER=y +CONFIG_OMAP_32K_TIMER_HZ=128 # CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set + +CONFIG_OMAP_MCBSP=y +CONFIG_OMAP_MBOX_FWK=m +CONFIG_OMAP_MBOX_KFIFO_SIZE=256 +CONFIG_OMAP_DM_TIMER=y +CONFIG_OMAP_PM_NOOP=y +CONFIG_OMAP_IOMMU=y CONFIG_OMAP3_EMU=y # CONFIG_OMAP3_SDRC_AC_TIMING is not set CONFIG_ARM_OMAP2PLUS_CPUFREQ=y + +CONFIG_TI_ST=m +CONFIG_TI_DAC7512=m CONFIG_TI_DAVINCI_EMAC=m CONFIG_TI_DAVINCI_MDIO=m CONFIG_TI_DAVINCI_CPDMA=m CONFIG_TI_CPSW=m CONFIG_TI_CPTS=y + +CONFIG_SERIAL_OMAP=y +CONFIG_SERIAL_OMAP_CONSOLE=y + CONFIG_GPIO_TWL4030=m CONFIG_GPIO_TWL6040=m CONFIG_CHARGER_TWL4030=m CONFIG_OMAP_WATCHDOG=m -CONFIG_TWL4030_WATCHDOG=m +CONFIG_TWL4030_CORE=y CONFIG_TWL4030_MADC=m +CONFIG_TWL4030_POWER=y +CONFIG_TWL4030_CODEC=y +CONFIG_TWL4030_WATCHDOG=m +CONFIG_TWL4030_USB=m +CONFIG_TWL6030_USB=m +CONFIG_TWL6030_PWM=m CONFIG_TWL6040_CORE=y +CONFIG_CLK_TWL6040=m CONFIG_MFD_OMAP_USB_HOST=y CONFIG_REGULATOR_TWL4030=y CONFIG_BACKLIGHT_PANDORA=m CONFIG_USB_EHCI_HCD_OMAP=y CONFIG_USB_OHCI_HCD_OMAP3=y +CONFIG_USB_MUSB_AM35X=m CONFIG_OMAP_CONTROL_USB=m CONFIG_NOP_USB_XCEIV=m -CONFIG_TWL4030_USB=m -CONFIG_TWL6030_USB=m -CONFIG_USB_MUSB_AM35X=m CONFIG_MMC_OMAP=y CONFIG_MMC_OMAP_HS=y CONFIG_RTC_DRV_MAX8907=m CONFIG_RTC_DRV_TWL92330=y CONFIG_RTC_DRV_TWL4030=y CONFIG_RTC_DRV_OMAP=y +# Note needs to be compiled in until we build MMC modular CONFIG_DMA_OMAP=y CONFIG_OMAP_IOVMM=m CONFIG_HWSPINLOCK_OMAP=m -CONFIG_OMAP_IOMMU=y CONFIG_SENSORS_TWL4030_MADC=m -CONFIG_TWL6040_CORE=m -CONFIG_CLK_TWL6040=m + +CONFIG_WL_TI=y +CONFIG_WLCORE_SDIO=m +CONFIG_WLCORE_SPI=m +CONFIG_WL1251_SPI=m +CONFIG_WL12XX_SPI=m +CONFIG_WL12XX_SDIO_TEST=m +CONFIG_WL18XX=m +CONFIG_WILINK_PLATFORM_DATA=y +CONFIG_MFD_WL1273_CORE=m +CONFIG_NFC_WILINK=m + +CONFIG_MTD_NAND_OMAP2=y +CONFIG_MTD_NAND_OMAP_PREFETCH=y +CONFIG_MTD_NAND_OMAP_PREFETCH_DMA=y +CONFIG_SPI_DAVINCI=m +CONFIG_SPI_OMAP24XX=y +CONFIG_MFD_TI_SSP=m +CONFIG_SPI_TI_SSP=m CONFIG_INPUT_TWL4030_PWRBUTTON=m CONFIG_INPUT_TWL4030_VIBRA=m CONFIG_INPUT_TWL6040_VIBRA=m +CONFIG_KEYBOARD_OMAP4=m CONFIG_KEYBOARD_TWL4030=m +CONFIG_TOUCHSCREEN_TI_TSCADC=m # OMAP thermal temp. Can likely be built as module but doesn't autoload so build in to ensure performance on PandaES CONFIG_OMAP_BANDGAP=y @@ -211,17 +250,59 @@ CONFIG_PANEL_TFP410=m CONFIG_PANEL_SHARP_LS037V7DW01=m CONFIG_PANEL_PICODLP=m CONFIG_PANEL_TAAL=m +CONFIG_PANEL_NEC_NL8048HL11_01B=m +CONFIG_PANEL_TPO_TD043MTEA1=m + +# Enable V4L2 drivers for OMAP2+ +CONFIG_MEDIA_CONTROLLER=y +CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_VIDEO_OMAP2_VOUT=m +CONFIG_VIDEO_OMAP3=m +CONFIG_VIDEO_VPFE_CAPTURE=m +# The ones below are for TI Davinci +# CONFIG_VIDEO_VPSS_SYSTEM is not set +# CONFIG_VIDEO_DM6446_CCDC is not set +# CONFIG_VIDEO_DM644X_VPBE is not set +# CONFIG_VIDEO_DM355_CCDC is not set +# CONFIG_VIDEO_ISIF is not set +# Also enable vivi driver - useful for testing a full kernelspace V4L2 driver +CONFIG_V4L_TEST_DRIVERS=y +CONFIG_VIDEO_VIVI=m + +CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m +CONFIG_SND_OMAP_SOC_OMAP_HDMI=m +CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m +CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m CONFIG_SND_OMAP_SOC=m +CONFIG_SND_SOC_I2C_AND_SPI=m CONFIG_SND_OMAP_SOC_AM3517EVM=m -CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m +CONFIG_SND_OMAP_SOC_DMIC=m +CONFIG_SND_OMAP_SOC_IGEP0020=m +CONFIG_SND_OMAP_SOC_MCBSP=m +CONFIG_SND_OMAP_SOC_MCPDM=m CONFIG_SND_OMAP_SOC_OMAP_HDMI=m +CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m +CONFIG_SND_OMAP_SOC_OMAP3EVM=m +CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=m CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m +CONFIG_SND_OMAP_SOC_OVERO=m +# CONFIG_SND_OMAP_SOC_RX51 is not set +CONFIG_SND_OMAP_SOC_SDP3430=m +CONFIG_SND_OMAP_SOC_SDP4430=m +CONFIG_SND_OMAP_SOC_ZOOM2=m +CONFIG_SND_SOC_TLV320AIC23=m +CONFIG_SND_SOC_TLV320AIC3X=m +CONFIG_SND_SOC_TWL4030=m +CONFIG_SND_SOC_TWL6040=m +CONFIG_RADIO_WL128X=m # CONFIG_OMAP2_DSS_DEBUGFS is not set # CONFIG_OMAP_IOMMU_DEBUG is not set # CONFIG_OMAP_MUX_DEBUG is not set +# CONFIG_VIDEO_OMAP3_DEBUG is not set # Allwinner a1x CONFIG_PINCTRL_SUNXI=y diff --git a/config-armv7-generic b/config-armv7-generic index 6012c3295..924b0239c 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -19,6 +19,7 @@ CONFIG_SWP_EMULATE=y CONFIG_CPU_BPREDICT_DISABLE=y CONFIG_CACHE_L2X0=y CONFIG_HIGHPTE=y +CONFIG_AUTO_ZRELADDR=y # CONFIG_OABI_COMPAT is not set # CONFIG_ATAGS is not set # CONFIG_ATAGS_PROC is not set @@ -31,7 +32,6 @@ CONFIG_HIGHPTE=y # CONFIG_THUMB2_KERNEL is not set # CONFIG_HVC_DCC is not set # CONFIG_XIP_KERNEL is not set -# CONFIG_AUTO_ZRELADDR is not set # errata # v5/v6 diff --git a/config-generic b/config-generic index b6e53f1d9..adfb0b221 100644 --- a/config-generic +++ b/config-generic @@ -596,6 +596,8 @@ CONFIG_DM_MULTIPATH=m CONFIG_DM_SNAPSHOT=y CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_CACHE=m +CONFIG_DM_CACHE_MQ=m +CONFIG_DM_CACHE_CLEANER=m # CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set # CONFIG_DM_DEBUG_SPACE_MAPS is not set CONFIG_DM_UEVENT=y diff --git a/kernel.spec b/kernel.spec index 1b5b80730..57fcf0cc5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2307,6 +2307,9 @@ fi # ||----w | # || || %changelog +* Thu Mar 28 2013 Peter Robinson <pbrobinson@fedoraproject.org> +- Update ARM unified config for OMAP + * Tue Mar 26 2013 Justin M. Forbes <jforbes@redhat.com> - Fix child thread introspection of of /proc/self/exe (rhbz 927469) |