diff options
| -rw-r--r-- | config-arm-generic | 1 | ||||
| -rw-r--r-- | config-armv7-generic | 15 | ||||
| -rw-r--r-- | config-armv7-lpae | 2 | ||||
| -rw-r--r-- | config-generic | 8 | ||||
| -rw-r--r-- | kernel.spec | 4 |
5 files changed, 19 insertions, 11 deletions
diff --git a/config-arm-generic b/config-arm-generic index fa7df0ecd..783a69039 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -25,6 +25,7 @@ CONFIG_RESET_GPIO=y CONFIG_RCU_FANOUT_LEAF=16 CONFIG_BACKLIGHT_PWM=m +CONFIG_BACKLIGHT_GENERIC=m CONFIG_INPUT_PWM_BEEPER=m CONFIG_ARM_SP805_WATCHDOG=m CONFIG_ARM_ARCH_TIMER=y diff --git a/config-armv7-generic b/config-armv7-generic index a55789fe3..c3a3a3cd4 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -163,6 +163,7 @@ CONFIG_PL330_DMA=m CONFIG_AMBA_PL08X=y CONFIG_GPIO_PL061=y CONFIG_PL320_MBOX=y +CONFIG_SND_ARMAACI=m # highbank CONFIG_EDAC_HIGHBANK_MC=m @@ -233,6 +234,7 @@ CONFIG_MMC_DW_EXYNOS=m CONFIG_EXYNOS_IOMMU=y CONFIG_PCI_EXYNOS=y CONFIG_PHY_EXYNOS5_USBDRD=m +CONFIG_PHY_SAMSUNG_USB2=m CONFIG_USB_EHCI_EXYNOS=m CONFIG_USB_OHCI_EXYNOS=m CONFIG_USB_DWC3_EXYNOS=m @@ -246,10 +248,10 @@ CONFIG_REGULATOR_S2MPS11=m CONFIG_REGULATOR_S5M8767=m CONFIG_TCG_TIS_I2C_INFINEON=m CONFIG_RTC_DRV_S5M=m +CONFIG_RTC_DRV_S3C=m CONFIG_MFD_WM8994=m CONFIG_GPIO_WM8994=m CONFIG_REGULATOR_WM8994=m -# CONFIG_RTC_DRV_S3C is not set CONFIG_EXYNOS_VIDEO=y CONFIG_EXYNOS_MIPI_DSI=y @@ -614,15 +616,8 @@ CONFIG_DW_WATCHDOG=m CONFIG_PCIE_DW=y # Sound -CONFIG_SND_SPI=y CONFIG_SND_ARM=y -CONFIG_SND_ARMAACI=m -CONFIG_SND_COMPRESS_OFFLOAD=m -CONFIG_SND_DMAENGINE_PCM=m -CONFIG_SND_JACK=y -CONFIG_SND_SOC_ALL_CODECS=m -CONFIG_SND_SOC_DMIC=m -CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y +CONFIG_SND_SOC_AC97_BUS=y # Displays CONFIG_BACKLIGHT_TPS65217=m @@ -730,7 +725,7 @@ CONFIG_LCD_HX8357=m CONFIG_INPUT_GP2A=m CONFIG_INPUT_ARIZONA_HAPTICS=m CONFIG_INPUT_MC13783_PWRBUTTON=m -# CONFIG_INPUT_SOC_BUTTON_ARRAY is not set +CONFIG_INPUT_SOC_BUTTON_ARRAY=m CONFIG_TOUCHSCREEN_ADS7846=m CONFIG_TOUCHSCREEN_AD7877=m diff --git a/config-armv7-lpae b/config-armv7-lpae index 9eb8d8a95..c42b38c0c 100644 --- a/config-armv7-lpae +++ b/config-armv7-lpae @@ -62,6 +62,8 @@ CONFIG_SPI_DAVINCI=m CONFIG_TI_DAVINCI_MDIO=m CONFIG_KEYSTONE_IRQ=m CONFIG_PCI_KEYSTONE=y +CONFIG_MTD_NAND_DAVINCI=m +CONFIG_GPIO_SYSCON=m # Tegra (non A15 device options) # CONFIG_ARCH_TEGRA_2x_SOC is not set diff --git a/config-generic b/config-generic index 1aaa44d7c..38247db6d 100644 --- a/config-generic +++ b/config-generic @@ -3413,10 +3413,12 @@ CONFIG_SND=y CONFIG_SOUND_OSS_CORE_PRECLAIM=y # CONFIG_SND_DEBUG_VERBOSE is not set CONFIG_SND_VERBOSE_PROCFS=y -CONFIG_SND_SEQUENCER=y +CONFIG_SND_COMPRESS_OFFLOAD=m CONFIG_SND_HRTIMER=y +CONFIG_SND_JACK=y CONFIG_SND_SEQ_HRTIMER_DEFAULT=y CONFIG_SND_SEQ_DUMMY=m +CONFIG_SND_SEQUENCER=y CONFIG_SND_SEQUENCER_OSS=y CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y CONFIG_SND_OSSEMUL=y @@ -4793,8 +4795,12 @@ CONFIG_SND_INDIGODJX=m CONFIG_SND_SOC=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_DESIGNWARE_I2S=m +CONFIG_SND_SOC_ALL_CODECS=m +CONFIG_SND_SOC_DMIC=m CONFIG_SND_SOC_HDMI_CODEC=m CONFIG_SND_SOC_SPDIF=m +CONFIG_SND_DMAENGINE_PCM=m +CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y # CONFIG_SND_SOC_ADAU1701 is not set # CONFIG_SND_SOC_AK4104 is not set # CONFIG_SND_SOC_AK4554 is not set diff --git a/kernel.spec b/kernel.spec index ea1e61002..a4e3fada2 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2210,6 +2210,10 @@ fi # ||----w | # || || %changelog +* Thu Jan 29 2015 Peter Robinson <pbrobinson@fedoraproject.org> +- More ARMv7 updates +- A few more sound config cleanups + * Wed Jan 28 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.19.0-0.rc6.git2.1 - Linux v3.19-rc6-105-gc59c961ca511 |