From b562782bb5e604682abc360990b2f17ecceea5d8 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 8 Oct 2013 12:40:07 +0100 Subject: [PATCH] * General ARM config cleanups - Remove old/dupe ARM config options - Enable external connectors on ARM - Enable i.MX RNG driver - ARM MFD and REGULATOR changes and cleanups - Enable console for Zynq-7xxx SoCs --- config-arm-generic | 6 +++ config-arm64 | 3 -- config-armv7 | 117 +++++++++++++++++++++---------------------- config-armv7-generic | 46 ++++++++++++----- kernel.spec | 8 +++ 5 files changed, 103 insertions(+), 77 deletions(-) diff --git a/config-arm-generic b/config-arm-generic index b0558ff9a..738bfa148 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -26,6 +26,7 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIO_AMBAKMI=y CONFIG_OC_ETM=y +CONFIG_FB_ARMCLCD=y # ARM VExpress CONFIG_ARCH_VEXPRESS=y @@ -56,6 +57,11 @@ CONFIG_OF_PCI=m # CONFIG_OF_SELFTEST is not set CONFIG_SERIAL_OF_PLATFORM=y +# External Connectors +CONFIG_EXTCON=m +CONFIG_OF_EXTCON=m +CONFIG_EXTCON_GPIO=m + # MTD CONFIG_MTD_BLKDEVS=m CONFIG_MTD_BLOCK=m diff --git a/config-arm64 b/config-arm64 index 78dd575d1..02730203c 100644 --- a/config-arm64 +++ b/config-arm64 @@ -22,7 +22,6 @@ CONFIG_CMDLINE="console=ttyAMA0" # CONFIG_CMDLINE_FORCE is not set CONFIG_CONSOLE_TRANSLATIONS=y -CONFIG_FB_ARMCLCD=y CONFIG_GENERIC_ACL=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -35,8 +34,6 @@ CONFIG_GPIO_DEVRES=y CONFIG_HAVE_64BIT_ALIGNED_ACCESS=y CONFIG_HAVE_ARCH_PFN_VALID=y CONFIG_HAVE_ARCH_TRACEHOOK=y -CONFIG_HAVE_CLK_PREPARE=y -CONFIG_HAVE_CLK=y CONFIG_HAVE_MEMORY_PRESENT=y CONFIG_HAVE_NET_DSA=y # CONFIG_HUGETLB_PAGE is not set diff --git a/config-armv7 b/config-armv7 index 3d8de4d2f..533b1be01 100644 --- a/config-armv7 +++ b/config-armv7 @@ -22,16 +22,6 @@ CONFIG_ARCH_ZYNQ=y # Generic CONFIG_REMOTEPROC=m -# FIXME should be generic (I think it's enabled by default) -CONFIG_FB=y -CONFIG_FB_ARMCLCD=m -CONFIG_FB_CFB_COPYAREA=m -CONFIG_FB_CFB_FILLRECT=m -CONFIG_FB_CFB_IMAGEBLIT=m -CONFIG_TOUCHSCREEN_ADS7846=m - -CONFIG_OC_ETM=y - # mvebu CONFIG_MACH_ARMADA_370_XP=y CONFIG_MACH_ARMADA_370=y @@ -125,7 +115,6 @@ CONFIG_TWL4030_WATCHDOG=m CONFIG_TI_ST=m CONFIG_TI_EDMA=y -CONFIG_TI_SOC_THERMAL=m CONFIG_TI_DAC7512=m CONFIG_TI_DAVINCI_EMAC=m CONFIG_TI_DAVINCI_MDIO=m @@ -133,10 +122,7 @@ CONFIG_TI_DAVINCI_CPDMA=m CONFIG_TI_CPSW=m CONFIG_TI_CPTS=y CONFIG_TI_EMIF=m -CONFIG_MFD_TPS65217=m CONFIG_REGULATOR_TI_ABB=y -CONFIG_REGULATOR_TPS65217=m -CONFIG_BACKLIGHT_TPS65217=m CONFIG_SERIAL_OMAP=y CONFIG_SERIAL_OMAP_CONSOLE=y @@ -156,7 +142,6 @@ CONFIG_TWL6030_PWM=m CONFIG_TWL6040_CORE=y CONFIG_CLK_TWL6040=m CONFIG_OMAP_INTERCONNECT=m -# CONFIG_MFD_TPS80031 is not set CONFIG_MFD_TI_AM335X_TSCADC=m CONFIG_MFD_OMAP_USB_HOST=y CONFIG_MTD_ONENAND_OMAP2=m @@ -184,6 +169,14 @@ CONFIG_RTC_DRV_TWL4030=y CONFIG_RTC_DRV_OMAP=y CONFIG_SENSORS_TWL4030_MADC=m +# OMAP5 (possibly other devices too) +CONFIG_MFD_PALMAS=y +CONFIG_PINCTRL_PALMAS=y +CONFIG_EXTCON_PALMAS=m +CONFIG_RTC_DRV_PALMAS=m +CONFIG_REGULATOR_PALMAS=m +CONFIG_GPIO_PALMAS=y + CONFIG_WL_TI=y CONFIG_WLCORE_SDIO=m CONFIG_WLCORE_SPI=m @@ -210,6 +203,8 @@ 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 +CONFIG_TI_SOC_THERMAL=m +CONFIG_TI_THERMAL=y CONFIG_OMAP4_THERMAL=y CONFIG_OMAP5_THERMAL=y @@ -293,11 +288,6 @@ CONFIG_V4L_PLATFORM_DRIVERS=y 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 @@ -347,12 +337,13 @@ CONFIG_SUN4I_EMAC=m # imx CONFIG_MXC_IRQ_PRIOR=y # CONFIG_MXC_DEBUG_BOARD is not set -CONFIG_MACH_IMX51_DT=y -# CONFIG_MACH_MX51_BABBAGE is not set -# CONFIG_MACH_EUKREA_CPUIMX51SD is not set CONFIG_SOC_IMX53=y CONFIG_SOC_IMX6Q=y CONFIG_SOC_IMX6SL=y +CONFIG_MACH_IMX51_DT=y +# CONFIG_MACH_MX51_BABBAGE is not set +# CONFIG_MACH_EUKREA_CPUIMX51SD is not set +CONFIG_ARM_IMX6Q_CPUFREQ=m CONFIG_PATA_IMX=m CONFIG_USB_CHIPIDEA=m CONFIG_USB_CHIPIDEA_UDC=y @@ -370,8 +361,10 @@ CONFIG_MFD_MC13XXX_SPI=m CONFIG_W1_MASTER_MXC=m CONFIG_IMX_WEIM=y CONFIG_IMX2_WDT=m +CONFIG_HW_RANDOM_MXC_RNGA=m CONFIG_CRYPTO_DEV_SAHARA=m # CONFIG_FB_MX3 is not set + CONFIG_SND_IMX_SOC=m CONFIG_SND_SOC_FSL_SSI=m CONFIG_SND_SOC_FSL_UTILS=m @@ -382,9 +375,11 @@ CONFIG_SND_SOC_IMX_PCM_DMA=m CONFIG_SND_SOC_IMX_SGTL5000=m CONFIG_SND_SOC_IMX_WM8962=m CONFIG_SND_SOC_IMX_MC13783=m + CONFIG_USB_EHCI_MXC=m CONFIG_USB_IMX21_HCD=m CONFIG_USB_MXS_PHY=m +CONFIG_MMC_DW_SOCFPGA=m CONFIG_MMC_SDHCI_ESDHC_IMX=m CONFIG_MMC_MXC=m CONFIG_SPI_MXS=m @@ -396,6 +391,7 @@ CONFIG_IMX_SDMA=m CONFIG_IMX_DMA=m CONFIG_AHCI_IMX=m # CONFIG_MXS_DMA is not set + CONFIG_PWM_IMX=m CONFIG_BACKLIGHT_PWM=m CONFIG_DRM_IMX=m @@ -406,7 +402,10 @@ CONFIG_DRM_IMX_IPUV3=m CONFIG_DRM_IMX_PARALLEL_DISPLAY=m CONFIG_DRM_IMX_TVE=m CONFIG_VIDEO_CODA=m + +CONFIG_MFD_SYSCON=y CONFIG_SENSORS_MC13783_ADC=m +CONFIG_REGULATOR_ANATOP=m CONFIG_REGULATOR_MC13783=m CONFIG_REGULATOR_MC13892=m CONFIG_LEDS_MC13783=m @@ -415,6 +414,27 @@ CONFIG_RTC_DRV_MC13XXX=m CONFIG_INPUT_PWM_BEEPER=m CONFIG_INPUT_88PM80X_ONKEY=m +# i.MX6Q (and likely Samsung among others) +CONFIG_MFD_DA9052_I2C=y +CONFIG_MFD_DA9052_SPI=y +CONFIG_MFD_DA9055=y +CONFIG_TOUCHSCREEN_DA9052=m +CONFIG_INPUT_DA9052_ONKEY=m +CONFIG_INPUT_DA9055_ONKEY=m +CONFIG_GPIO_DA9052=m +CONFIG_GPIO_DA9055=m +CONFIG_BATTERY_DA9052=m +CONFIG_SENSORS_DA9052_ADC=m +CONFIG_SENSORS_DA9055=m +CONFIG_DA9052_WATCHDOG=m +CONFIG_DA9055_WATCHDOG=m +CONFIG_BACKLIGHT_DA9052=m +CONFIG_LEDS_DA9052=m +CONFIG_RTC_DRV_DA9052=m +CONFIG_RTC_DRV_DA9055=m +CONFIG_REGULATOR_DA9052=m +CONFIG_REGULATOR_DA9055=m + # exynos # CONFIG_DRM_EXYNOS is not set # CONFIG_PINCTRL_EXYNOS5440 is not set @@ -489,6 +509,7 @@ CONFIG_TEGRA20_APB_DMA=y CONFIG_SPI_TEGRA20_SFLASH=m CONFIG_SPI_TEGRA20_SLINK=m +CONFIG_MFD_MAX8907=m CONFIG_KEYBOARD_TEGRA=m CONFIG_PINCTRL_TEGRA=y CONFIG_PINCTRL_TEGRA20=y @@ -518,7 +539,6 @@ CONFIG_NVEC_LEDS=y CONFIG_NVEC_PAZ00=y CONFIG_MFD_TPS6586X=y CONFIG_GPIO_TPS6586X=y -CONFIG_REGULATOR_TPS6586X=m CONFIG_RTC_DRV_TPS6586X=m CONFIG_PWM_TEGRA=m @@ -533,12 +553,15 @@ CONFIG_DRM_TEGRA=y CONFIG_CRYPTO_DEV_TEGRA_AES=m CONFIG_LEDS_RENESAS_TPU=y +CONFIG_GPIO_PCA953X=m # OLPC XO CONFIG_SERIO_OLPC_APSP=m # Zynq-7xxx # likely needs usb/mmc still +CONFIG_SERIAL_UARTLITE=y +CONFIG_SERIAL_UARTLITE_CONSOLE=y CONFIG_SERIAL_XILINX_PS_UART=y CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y CONFIG_COMMON_CLK_AXI_CLKGEN=m @@ -550,41 +573,29 @@ CONFIG_GPIO_XILINX=y CONFIG_I2C_XILINX=m CONFIG_SPI_XILINX=m -# MMC/SD -CONFIG_MMC_TMIO=m -CONFIG_MMC_SDHCI_PXAV3=m -CONFIG_MMC_SDHCI_PXAV2=m - # Multi function devices CONFIG_MFD_88PM800=m CONFIG_MFD_88PM805=m CONFIG_MFD_T7L66XB=y CONFIG_MFD_TC6387XB=y +# Generic drivers + # Regulator drivers CONFIG_REGULATOR_FAN53555=m -# CONFIG_CHARGER_MANAGER is not set -# CONFIG_REGULATOR_DUMMY is not set -# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set -# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set +# CONFIG_REGULATOR_88PM800 is not set CONFIG_REGULATOR_AD5398=m CONFIG_REGULATOR_ISL6271A=m +CONFIG_REGULATOR_LP3971=m +CONFIG_REGULATOR_LP3972=m +CONFIG_REGULATOR_LP872X=y +CONFIG_REGULATOR_LP8755=m CONFIG_REGULATOR_MAX1586=m CONFIG_REGULATOR_MAX8649=m CONFIG_REGULATOR_MAX8660=m +CONFIG_REGULATOR_MAX8907=m CONFIG_REGULATOR_MAX8952=m CONFIG_REGULATOR_MAX8973=m -CONFIG_REGULATOR_LP3971=m -CONFIG_REGULATOR_LP3972=m -CONFIG_REGULATOR_TPS51632=m -CONFIG_REGULATOR_TPS62360=m -CONFIG_REGULATOR_TPS65023=m -CONFIG_REGULATOR_TPS6524X=m -CONFIG_REGULATOR_TPS6507X=m -CONFIG_REGULATOR_TPS65912=m -CONFIG_REGULATOR_MAX8907=m -CONFIG_REGULATOR_LP872X=y -CONFIG_REGULATOR_LP8755=m # usb gadget CONFIG_USB_GADGET=m @@ -615,8 +626,6 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 # CONFIG_USB_ETH_EEM is not set # Needs work/investigation - -# CONFIG_ARM_CHARLCD is not set # CONFIG_MTD_AFS_PARTS is not set # CONFIG_IP_PNP_RARP is not set # CONFIG_PID_IN_CONTEXTIDR is not set @@ -626,33 +635,22 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 # Defined config options we don't use yet # CONFIG_PINCTRL_IMX35 is not set -# CONFIG_REGULATOR_ANATOP is not set # CONFIG_BATTERY_RX51 is not set # CONFIG_IR_RX51 is not set # CONFIG_GENERIC_CPUFREQ_CPU0 is not set # CONFIG_MFD_SMSC is not set # CONFIG_MFD_SEC_CORE is not set -# CONFIG_MFD_DA9055 is not set # CONFIG_MFD_LP8788 is not set -# CONFIG_MFD_MAX8907 is not set -# CONFIG_MFD_TPS65912_I2C is not set -# CONFIG_MFD_DA9052_I2C is not set # CONFIG_MFD_MAX77686 is not set # CONFIG_MFD_MAX77693 is not set # CONFIG_MFD_MAX8997 is not set -# CONFIG_MFD_TPS65090 is not set # CONFIG_MFD_AAT2870_CORE is not set # CONFIG_MFD_RC5T583 is not set -# CONFIG_MFD_PALMAS is not set -# CONFIG_MFD_DA9055 is not set # CONFIG_MFD_SMSC is not set -# CONFIG_MFD_TPS65910 is not set # CONFIG_MFD_AS3711 is not set # CONFIG_PMIC_DA903X is not set # CONFIG_PMIC_ADP5520 is not set -# CONFIG_REGULATOR_LP3972 is not set -# CONFIG_REGULATOR_LP872X is not set # CONFIG_DVB_USB_PCTV452E is not set # We need to fix these as they should be either generic includes or kconfig fixes @@ -664,7 +662,6 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 # CONFIG_VIRTUALIZATION is not set # CONFIG_CHARGER_MANAGER is not set # CONFIG_POWER_RESET_QNAP is not set -# CONFIG_POWER_RESET_RESTART is not set # CONFIG_OMAP2_DSS_DEBUG is not set # CONFIG_DRM_TEGRA_DEBUG is not set # CONFIG_CRYPTO_DEV_UX500_DEBUG is not set @@ -672,6 +669,4 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 # CONFIG_SOC_VF610 is not set # CONFIG_ARM_CCI is not set -# CONFIG_GPIO_XILINX is not set -# CONFIG_SERIAL_UARTLITE is not set - +# CONFIG_MMC_TMIO is not set diff --git a/config-armv7-generic b/config-armv7-generic index 59ccbb1f2..d16b7ea2e 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -156,7 +156,6 @@ CONFIG_PL330_DMA=m CONFIG_AMBA_PL08X=y CONFIG_ARM_SP805_WATCHDOG=m CONFIG_GPIO_PL061=y -CONFIG_FB_ARMCLCD=m # usb CONFIG_USB_OTG=y @@ -169,7 +168,11 @@ CONFIG_USB_ISP1760_HCD=m # CONFIG_USB_EHCI_HCD_ORION is not set # Multifunction Devices -CONFIG_MFD_SYSCON=y +CONFIG_MFD_TPS65090=y +CONFIG_MFD_TPS65217=y +CONFIG_MFD_TPS65910=y +CONFIG_MFD_TPS65912=y +CONFIG_MFD_TPS65912_I2C=y CONFIG_MFD_TPS65912_SPI=y # CONFIG_MFD_DA9052_SPI is not set # CONFIG_MFD_ARIZONA_SPI is not set @@ -186,7 +189,6 @@ CONFIG_PINCTRL_SINGLE=y # GPIO CONFIG_GPIO_GENERIC_PLATFORM=m -CONFIG_EXTCON_GPIO=m # CONFIG_GPIO_EM is not set CONFIG_GPIO_ADNP=m CONFIG_GPIO_MCP23S08=m @@ -199,11 +201,13 @@ CONFIG_LEDS_GPIO=m CONFIG_GPIO_MAX7301=m CONFIG_GPIO_MC33880=m CONFIG_GPIO_74X164=m +CONFIG_GPIO_TPS65910=y CONFIG_GPIO_TPS65912=m # CONFIG_GPIO_RCAR is not set CONFIG_W1_MASTER_GPIO=m CONFIG_CHARGER_GPIO=m +# SPI CONFIG_SPI=y CONFIG_SPI_MASTER=y CONFIG_SPI_GPIO=m @@ -224,6 +228,10 @@ CONFIG_SPI_TLE62X0=m CONFIG_NFC_NCI_SPI=y +# i2c +CONFIG_I2C_DESIGNWARE_CORE=m +CONFIG_I2C_DESIGNWARE_PLATFORM=m + # HW crypto and rng CONFIG_CRYPTO_SHA1_ARM=m CONFIG_CRYPTO_AES_ARM=m @@ -260,7 +268,7 @@ CONFIG_MMC_DW_PLTFM=m CONFIG_MMC_DW_PCI=m CONFIG_SPI_DW_MMIO=m CONFIG_SPI_DW_PCI=m -CONFIG_MMC_DW_SOCFPGA=m +# CONFIG_MMC_DW_SOCFPGA is not set # CONFIG_MMC_DW_EXYNOS is not set # CONFIG_MMC_DW_IDMAC is not set CONFIG_USB_DWC2=m @@ -282,46 +290,57 @@ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y # CONFIG_SND_ATMEL_SOC is not set # Displays +CONFIG_BACKLIGHT_TPS65217=m # RTC -CONFIG_RTC_DRV_M41T93=m -CONFIG_RTC_DRV_M41T94=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_PCF2123=m CONFIG_RTC_DRV_R9701=m CONFIG_RTC_DRV_RS5C348=m -CONFIG_RTC_DRV_DS3234=m -CONFIG_RTC_DRV_PCF2123=m CONFIG_RTC_DRV_RX4581=m +CONFIG_RTC_DRV_TPS65910=m +CONFIG_RTC_DRV_TPS80031=m # Regulators -CONFIG_REGULATOR=y +ONFIG_REGULATOR=y CONFIG_RFKILL_REGULATOR=m CONFIG_CHARGER_MANAGER=y # CONFIG_REGULATOR_DUMMY is not set CONFIG_REGULATOR_FIXED_VOLTAGE=m +CONFIG_REGULATOR_FIXED_VOLTAGE=m CONFIG_REGULATOR_VIRTUAL_CONSUMER=m CONFIG_REGULATOR_USERSPACE_CONSUMER=m CONFIG_REGULATOR_GPIO=m CONFIG_REGULATOR_AD5398=m +CONFIG_REGULATOR_DA9210=m CONFIG_REGULATOR_FAN53555=m -CONFIG_REGULATOR_ANATOP=m CONFIG_REGULATOR_ISL6271A=m +CONFIG_REGULATOR_LP3971=m +CONFIG_REGULATOR_LP3972=m +CONFIG_REGULATOR_LP8755=m CONFIG_REGULATOR_MAX1586=m CONFIG_REGULATOR_MAX8649=m CONFIG_REGULATOR_MAX8660=m CONFIG_REGULATOR_MAX8952=m CONFIG_REGULATOR_MAX8973=m -CONFIG_REGULATOR_LP3971=m -CONFIG_REGULATOR_LP3972=m -CONFIG_REGULATOR_LP8755=m +CONFIG_REGULATOR_PFUZE100=m CONFIG_REGULATOR_TPS51632=m CONFIG_REGULATOR_TPS62360=m CONFIG_REGULATOR_TPS65023=m CONFIG_REGULATOR_TPS6507X=m +CONFIG_REGULATOR_TPS65090=m +CONFIG_REGULATOR_TPS65217=m CONFIG_REGULATOR_TPS6524X=m +CONFIG_REGULATOR_TPS6586X=m +CONFIG_REGULATOR_TPS65910=m CONFIG_REGULATOR_TPS65912=m +CONFIG_REGULATOR_TPS80031=m +CONFIG_CHARGER_TPS65090=m CONFIG_SENSORS_AD7314=m CONFIG_SENSORS_ADCXX=m @@ -330,6 +349,7 @@ CONFIG_SENSORS_MAX1111=m CONFIG_SENSORS_ADS7871=m CONFIG_SENSORS_LIS3_SPI=m CONFIG_SENSORS_GPIO_FAN=m +CONFIG_SENSORS_HTU21=m CONFIG_LCD_L4F00242T03=m CONFIG_LCD_LMS283GF05=m diff --git a/kernel.spec b/kernel.spec index ebea45674..7a8c90d52 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2350,6 +2350,14 @@ fi # ||----w | # || || %changelog +* Mon Oct 7 2013 Peter Robinson +- General ARM config cleanups +- Remove old/dupe ARM config options +- Enable external connectors on ARM +- Enable i.MX RNG driver +- ARM MFD and REGULATOR changes and cleanups +- Enable console for Zynq-7xxx SoCs + * Mon Oct 7 2013 Justin M. Forbes - Linux v3.11.4