diff --git a/config-arm-generic b/config-arm-generic index f1306225b..7951f541f 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -38,6 +38,7 @@ CONFIG_ARM_ERRATA_742231=y CONFIG_ARM_ERRATA_754327=y CONFIG_ARM_ERRATA_764369=y CONFIG_ARM_ERRATA_775420=y +CONFIG_PL310_ERRATA_753970=y # Generic ARM config options CONFIG_ZBOOT_ROM_TEXT=0 @@ -54,6 +55,8 @@ CONFIG_PL330_DMA=y # CONFIG_PID_IN_CONTEXTIDR is not set # Generic options we want for ARM that aren't defualt +CONFIG_EARLY_PRINTK=y + CONFIG_HIGHMEM=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y @@ -121,6 +124,7 @@ CONFIG_SND_DESIGNWARE_I2S=m CONFIG_SND_SIMPLE_CARD=m # CONFIG_SND_SOC_CACHE_LZO is not set CONFIG_SND_SOC_ALL_CODECS=m +CONFIG_SND_SPI=y CONFIG_AX88796=m CONFIG_AX88796_93CX6=y @@ -153,6 +157,7 @@ CONFIG_MMC_SDHCI_PXAV2=m # CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set +CONFIG_SPI=y # Generic GPIO options CONFIG_GENERIC_GPIO=y @@ -217,6 +222,10 @@ CONFIG_MTD_NAND_ORION=m # CONFIG_MTD_PLATRAM is not set # CONFIG_MTD_PHRAM is not set # CONFIG_MTD_SLRAM is not set +CONFIG_MTD_DATAFLASH=m +CONFIG_MTD_DATAFLASH_WRITE_VERIFY=y +CONFIG_MTD_DATAFLASH_OTP=y +CONFIG_MTD_SST25L=m CONFIG_MTD_UBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MTD_UBI_BEB_RESERVE=1 @@ -258,6 +267,7 @@ CONFIG_OF=y CONFIG_USE_OF=y CONFIG_OF_DEVICE=y CONFIG_OF_IRQ=y +CONFIG_OF_GPIO=y CONFIG_ARM_ATAG_DTB_COMPAT=y CONFIG_ARM_APPENDED_DTB=y CONFIG_PROC_DEVICETREE=y @@ -280,25 +290,77 @@ CONFIG_EDAC_MM_EDAC=m CONFIG_EDAC_LEGACY_SYSFS=y CONFIG_RTC_DRV_88PM80X=m +CONFIG_RTC_DRV_DS1305=m +CONFIG_RTC_DRV_DS1390=m +CONFIG_RTC_DRV_DS3234=m +CONFIG_RTC_DRV_M41T93=m +CONFIG_RTC_DRV_M41T94=m +CONFIG_RTC_DRV_MAX6902=m +CONFIG_RTC_DRV_MC13XXX=m +CONFIG_RTC_DRV_PCF2123=m CONFIG_RTC_DRV_PL030=m CONFIG_RTC_DRV_PL031=m +CONFIG_RTC_DRV_R9701=m +CONFIG_RTC_DRV_RS5C348=m CONFIG_RTC_DRV_SNVS=m + CONFIG_RFKILL_REGULATOR=m CONFIG_INPUT_88PM80X_ONKEY=y CONFIG_INPUT_GP2A=m CONFIG_INPUT_GPIO_TILT_POLLED=m CONFIG_INPUT_PWM_BEEPER=m +CONFIG_INPUT_ARIZONA_HAPTICS=m +CONFIG_INPUT_MC13783_PWRBUTTON=m + CONFIG_SERIAL_AMBA_PL010=m CONFIG_SERIAL_AMBA_PL011=m -CONFIG_GPIO_PL061=y -CONFIG_GPIO_MCP23S08=m +CONFIG_SERIAL_MAX3100=m +CONFIG_SERIAL_MAX310X=y +CONFIG_SERIAL_IFX6X60=m + +CONFIG_GPIO_74X164=m CONFIG_GPIO_ADNP=m -CONFIG_PL310_ERRATA_753970=y +CONFIG_GPIO_ARIZONA=m +CONFIG_GPIO_MAX7301=m +CONFIG_GPIO_MC33880=m +CONFIG_GPIO_MCP23S08=m +CONFIG_GPIO_PL061=y + +CONFIG_SPI_ALTERA=m +CONFIG_SPI_BITBANG=m +CONFIG_SPI_BUTTERFLY=m +CONFIG_SPI_DW_MMIO=m +CONFIG_SPI_GPIO=m +CONFIG_SPI_LM70_LLP=m +CONFIG_SPI_OC_TINY=m +CONFIG_SPI_PL022=m +CONFIG_SPI_SC18IS602=m +CONFIG_SPI_XCOMM=m +CONFIG_SPI_XILINX=m +CONFIG_SPI_DESIGNWARE=m +CONFIG_SPI_SPIDEV=m +CONFIG_SPI_TLE62X0=m +CONFIG_BMP085_SPI=m +CONFIG_BMP085_SPI=m +CONFIG_EEPROM_AT25=m +CONFIG_EEPROM_93XX46=m +CONFIG_KS8851=m +CONFIG_MICREL_KS8995MA=m +CONFIG_LIBERTAS_SPI=m +CONFIG_P54_SPI=m +CONFIG_P54_SPI_DEFAULT_EEPROM=y CONFIG_MFD_CORE=m CONFIG_MFD_88PM800=m CONFIG_MFD_88PM805=m +CONFIG_MFD_ARIZONA_SPI=m +CONFIG_MFD_MC13XXX_SPI=m CONFIG_MFD_SYSCON=y +# CONFIG_MFD_WM5102 is not set +# CONFIG_MFD_WM5110 is not set +# CONFIG_MFD_TPS65912_SPI is not set +# CONFIG_MFD_DA9052_SPI is not set +# CONFIG_MFD_WM831X_SPI is not set # CONFIG_MFD_TPS80031 is not set # CONFIG_MFD_AS3711 is not set # CONFIG_MFD_SMSC is not set @@ -311,6 +373,7 @@ CONFIG_REGULATOR_USERSPACE_CONSUMER=m CONFIG_REGULATOR_GPIO=m CONFIG_REGULATOR_AD5398=m CONFIG_REGULATOR_ANATOP=m +CONFIG_REGULATOR_ARIZONA=m CONFIG_REGULATOR_FAN53555=m CONFIG_REGULATOR_ISL6271A=m CONFIG_REGULATOR_LP3972=m @@ -319,14 +382,28 @@ CONFIG_REGULATOR_MAX8649=m CONFIG_REGULATOR_MAX8660=m CONFIG_REGULATOR_MAX8952=m CONFIG_REGULATOR_MAX8973=m +CONFIG_REGULATOR_MC13783=m +CONFIG_REGULATOR_MC13892=m CONFIG_REGULATOR_LP3971=m CONFIG_REGULATOR_TPS51632=m CONFIG_REGULATOR_TPS62360=m CONFIG_REGULATOR_TPS65023=m +CONFIG_REGULATOR_TPS6524X=m CONFIG_REGULATOR_TPS6507X=m CONFIG_CHARGER_MANAGER=y CONFIG_EXTCON_GPIO=m +CONFIG_SENSORS_AD7314=m +CONFIG_SENSORS_ADCXX=m +CONFIG_SENSORS_LM70=m +CONFIG_SENSORS_MAX1111=m +CONFIG_SENSORS_MC13783_ADC=m +CONFIG_SENSORS_ADS7871=m +CONFIG_SENSORS_LIS3_SPI=m + +CONFIG_IEEE802154_AT86RF230=m +CONFIG_IEEE802154_MRF24J40=m + # CONFIG_ARM_VIRT_EXT is not set # CONFIG_PINCTRL_EXYNOS4 is not set # CONFIG_PINCTRL_EXYNOS5440 is not set @@ -346,6 +423,9 @@ CONFIG_EXTCON_GPIO=m # CONFIG_GPIO_EM is not set # CONFIG_HVC_DCC is not set # CONFIG_LEDS_RENESAS_TPU is not set +CONFIG_LEDS_DAC124S085=m +CONFIG_LEDS_MC13783=m + # CONFIG_VIRTIO_CONSOLE is not set # Possibly part of Snowball @@ -388,16 +468,40 @@ CONFIG_EXTCON_GPIO=m # CONFIG_DRM_NOUVEAU is not set # CONFIG_MLX4_EN is not set +CONFIG_TOUCHSCREEN_ADS7846=m +CONFIG_TOUCHSCREEN_AD7877=m +CONFIG_TOUCHSCREEN_TSC2005=m +CONFIG_TOUCHSCREEN_MC13783=m + # drivers/input/touchscreen/eeti_ts.c:65:2: error: implicit declaration of function 'irq_to_gpio' [-Werror=implicit-function-declaration] # CONFIG_TOUCHSCREEN_EETI is not set # CONFIG_TOUCHSCREEN_EGALAX is not set # CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set -# + +# CONFIG_PANEL_LGPHILIPS_LB035Q02 is not set +# CONFIG_PANEL_ACX565AKM is not set +# CONFIG_PANEL_N8X0 is not set + +# CONFIG_LCD_L4F00242T03 is not set +# CONFIG_LCD_LMS283GF05 is not set +# CONFIG_LCD_LTV350QV is not set +# CONFIG_LCD_ILI9320 is not set +# CONFIG_LCD_TDO24M is not set +# CONFIG_LCD_VGG2432A4 is not set +# CONFIG_LCD_S6E63M0 is not set +# CONFIG_LCD_LD9040 is not set +# CONFIG_LCD_AMS369FG06 is not set + # CONFIG_FB_MX3 is not set # CONFIG_MX3_IPU is not set # CONFIG_MX3_IPU_IRQS is not set # CONFIG_NET_VENDOR_CIRRUS is not set +# CONFIG_NET_VENDOR_MICROCHIP is not set # CONFIG_CS89x0 is not set # CONFIG_DVB_USB_PCTV452E is not set # CONFIG_PINCTRL_EXYNOS is not set + +# CONFIG_EZX_PCAP is not set + +# CONFIG_EXTCON_ARIZONA is not set diff --git a/config-arm-kirkwood b/config-arm-kirkwood index f4fea2955..9f80aaf4a 100644 --- a/config-arm-kirkwood +++ b/config-arm-kirkwood @@ -43,6 +43,7 @@ CONFIG_MACH_TS219_DT=y CONFIG_MACH_TS41X=y CONFIG_MACH_T5325=y +# CONFIG_SPI is not set CONFIG_CACHE_FEROCEON_L2=y CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH=y CONFIG_MTD_NAND_ORION=m diff --git a/config-arm-omap b/config-arm-omap index a53983357..976d4381d 100644 --- a/config-arm-omap +++ b/config-arm-omap @@ -103,7 +103,6 @@ CONFIG_OUTER_CACHE_SYNC=y CONFIG_CACHE_L2X0=y CONFIG_CACHE_PL310=y CONFIG_ARM_DMA_MEM_BUFFERABLE=y -CONFIG_CPU_HAS_PMU=y CONFIG_ARM_ERRATA_430973=y # CONFIG_ARM_ERRATA_458693 is not set # CONFIG_ARM_ERRATA_460075 is not set @@ -133,7 +132,6 @@ CONFIG_CMDLINE="" # CONFIG_AUTO_ZRELADDR is not set CONFIG_VFPv3=y CONFIG_NEON=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_BINFMT_MISC=m CONFIG_PM_DEBUG=y # CONFIG_PM_ADVANCED_DEBUG is not set @@ -143,6 +141,8 @@ CONFIG_PM_SLEEP_SMP=y CONFIG_ARCH_HAS_OPP=y CONFIG_PM_OPP=y +# 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 CONFIG_OMAP4_THERMAL=y CONFIG_OMAP5_THERMAL=y @@ -151,7 +151,9 @@ CONFIG_OMAP5_THERMAL=y # CONFIG_WL_TI=y CONFIG_WLCORE_SDIO=m +CONFIG_WLCORE_SPI=m CONFIG_TI_ST=m +CONFIG_TI_DAC7512=m # CONFIG_TI_CPSW is not set CONFIG_MTD_NAND_OMAP2=y CONFIG_MTD_NAND_OMAP_PREFETCH=y @@ -160,6 +162,10 @@ CONFIG_WL1251_SPI=m CONFIG_WL12XX_SPI=m CONFIG_WL12XX_SDIO_TEST=m CONFIG_WL18XX=m +CONFIG_SPI_DAVINCI=m +CONFIG_SPI_OMAP24XX=y +CONFIG_MFD_TI_SSP=m +CONFIG_SPI_TI_SSP=m CONFIG_NFC_WILINK=m CONFIG_INPUT_TWL4030_PWRBUTTON=m CONFIG_INPUT_TWL4030_VIBRA=m @@ -192,7 +198,6 @@ CONFIG_LEDS_LP8788=m CONFIG_MTD_ONENAND_OMAP2=y CONFIG_HDQ_MASTER_OMAP=m CONFIG_I2C_OMAP=m -CONFIG_SPI_OMAP24XX=m CONFIG_MFD_OMAP_USB_HOST=y CONFIG_MFD_WL1273_CORE=m CONFIG_MFD_LP8788=y @@ -329,7 +334,6 @@ CONFIG_PWM_TWL_LED=m # CONFIG_TIDSPBRIDGE_BACKTRACE is not set # CONFIG_OMAP_REMOTEPROC is not set -# CONFIG_OMAP_BANDGAP is not set # CONFIG_OMAP_IOVMM is not set CONFIG_CRYPTO_DEV_OMAP_SHAM=m diff --git a/config-arm-tegra b/config-arm-tegra index 869b1728a..80a15dda4 100644 --- a/config-arm-tegra +++ b/config-arm-tegra @@ -40,6 +40,8 @@ CONFIG_TEGRA_SYSTEM_DMA=y CONFIG_TEGRA_EMC_SCALING_ENABLE=y CONFIG_TEGRA_AHB=y CONFIG_TEGRA20_APB_DMA=y +CONFIG_SPI_TEGRA20_SFLASH=m +CONFIG_SPI_TEGRA20_SLINK=m CONFIG_ARM_THUMBEE=y CONFIG_SWP_EMULATE=y # CONFIG_CPU_BPREDICT_DISABLE is not set @@ -64,6 +66,8 @@ CONFIG_ARM_ERRATA_720789=y CONFIG_GPIO_GENERIC_PLATFORM=y # CONFIG_GPIO_MCP23S08 is not set # CONFIG_KEYBOARD_TEGRA is not set +CONFIG_PINCTRL_TEGRA=y +CONFIG_PINCTRL_TEGRA20=y CONFIG_USB_EHCI_TEGRA=y CONFIG_RTC_DRV_TEGRA=y @@ -107,3 +111,6 @@ CONFIG_OF_PCI=y CONFIG_OF_PCI_IRQ=y # CONFIG_DRM_TEGRA_DEBUG is not set +# CONFIG_TI_DAC7512 is not set +# CONFIG_SPI_TOPCLIFF_PCH is not set +# CONFIG_SPI_DW_PCI is not set diff --git a/config-armv7 b/config-armv7 index c3af272a1..d59ab36be 100644 --- a/config-armv7 +++ b/config-armv7 @@ -121,10 +121,6 @@ CONFIG_CC_STACKPROTECTOR=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 -# CONFIG_UTS_NS is not set -# CONFIG_IPC_NS is not set -# CONFIG_PID_NS is not set -# CONFIG_NET_NS is not set CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y @@ -200,7 +196,6 @@ CONFIG_MVNETA=m CONFIG_SATA_MV=m CONFIG_MARVELL_PHY=m CONFIG_RTC_DRV_S35390A=y -CONFIG_USB_EHCI_MV=m # Allwinner a1x # CONFIG_SUNXI_RFKILL=y @@ -275,9 +270,9 @@ CONFIG_ARM_APPENDED_DTB=y CONFIG_PROC_DEVICETREE=y # CONFIG_OF_SELFTEST is not set CONFIG_SERIAL_OF_PLATFORM=y -CONFIG_OF_GPIO=y CONFIG_OF_PCI=y CONFIG_OF_PCI_IRQ=y +CONFIG_OF_GPIO=y CONFIG_I2C_MUX_PINCTRL=m CONFIG_OF_MDIO=m diff --git a/config-nodebug b/config-nodebug index c471b853e..f5cbe10b9 100644 --- a/config-nodebug +++ b/config-nodebug @@ -114,3 +114,5 @@ CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y # CONFIG_MAC80211_MESSAGE_TRACING is not set # CONFIG_EDAC_DEBUG is not set + +# CONFIG_SPI_DEBUG is not set diff --git a/kernel.spec b/kernel.spec index 022a5c699..8be5db7c6 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2320,6 +2320,9 @@ fi # ||----w | # || || %changelog +* Thu Feb 28 2013 Peter Robinson +- Update ARM config for 3.8 + * Thu Feb 28 2013 Dave Jones - Remove no longer needed E1000 hack.