Merge tag 'defconfig-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc - kernel/git/torvalds/linux.git (original) (raw)

Merge tag 'defconfig-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC defconfig changes from Olof Johansson: "Most of these changes are to enable new drivers that have been merged, or various additions to make defconfigs more useful. There's also a set of patches trimming down omap2plus kernel size a bit since it is quite large" * tag 'defconfig-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (39 commits) ARM: config: add DEVTMPFS option by default to keystone config ARM: multi_v7_defconfig: Enable Exynos5420 Multi-Cluster PM support ARM: shmobile: Select CONFIG_REGULATOR in defconfig once again ARM: exynos_defconfig: Enable CONFIG_FHANDLE ARM: exynos_defconfig: Enable PMIC and MUIC drivers for Gears and Trats2 ARM: exynos_defconfig: Enable CONFIG_LOCKUP_DETECTOR ARM: config: enable ARCH_HIP01 ARM: omap2plus_defconfig: Enable OHCI & EHCI HCD support ARM: omap2plus_defconfig: Enable misc options for BeagleBoard-X15 platform ARM: imx_v6_v7_defconfig: enable more USB functions ARM: imx_v6_v7_defconfig: Select CONFIG_FB_MXS ARM: omap2plus_defconfig: Enable pcf857x ARM: omap2plus_defconfig: Add NOR flash support ARM: omap2plus_defconfig: Enable support for davinci_emac ARM: multi_v7_defconfig: Enable MiPHY28lp - ST's Generic (SATA, PCIe & USB3) PHY ARM: efm32: update defconfig ARM: at91: sama5: enable atmel-isi and ov2640 in defconfig ARM: multi_v7_defconfig: Enable Hip01 platform ARM: config: multi_v7: Update it for Keystone defconfig ARM: shmobile: Enable kzm9g board in multiplatform defconfig ...

@@ -17,7 +17,6 @@ CONFIG_EMBEDDED=y

# CONFIG_IOSCHED_CFQ is not set

# CONFIG_MMU is not set

CONFIG_ARCH_EFM32=y

-# CONFIG_KUSER_HELPERS is not set

CONFIG_SET_MEM_PARAM=y

CONFIG_DRAM_BASE=0x88000000

CONFIG_DRAM_SIZE=0x00400000

@@ -49,7 +48,6 @@ CONFIG_MTD=y

CONFIG_MTD_BLOCK_RO=y

CONFIG_MTD_ROM=y

CONFIG_MTD_UCLINUX=y

-CONFIG_PROC_DEVICETREE=y

# CONFIG_BLK_DEV is not set

CONFIG_NETDEVICES=y

# CONFIG_NET_VENDOR_ARC is not set

@@ -78,6 +76,9 @@ CONFIG_SERIAL_NONSTANDARD=y

CONFIG_SERIAL_EFM32_UART=y

CONFIG_SERIAL_EFM32_UART_CONSOLE=y

# CONFIG_HW_RANDOM is not set

+CONFIG_I2C=y

+# CONFIG_I2C_COMPAT is not set

+CONFIG_I2C_EFM32=y

CONFIG_SPI=y

CONFIG_SPI_EFM32=y

CONFIG_GPIO_SYSFS=y

@@ -1,4 +1,5 @@

CONFIG_SYSVIPC=y

+CONFIG_FHANDLE=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_CGROUPS=y

@@ -83,6 +84,10 @@ CONFIG_I2C_S3C2410=y

CONFIG_DEBUG_GPIO=y

CONFIG_POWER_SUPPLY=y

CONFIG_BATTERY_SBS=y

+CONFIG_BATTERY_MAX17040=y

+CONFIG_BATTERY_MAX17042=y

+CONFIG_CHARGER_MAX14577=y

+CONFIG_CHARGER_MAX77693=y

CONFIG_CHARGER_TPS65090=y

CONFIG_HWMON=y

CONFIG_SENSORS_LM90=y

@@ -94,6 +99,7 @@ CONFIG_S3C2410_WATCHDOG=y

CONFIG_MFD_CROS_EC=y

CONFIG_MFD_CROS_EC_I2C=y

CONFIG_MFD_CROS_EC_SPI=y

+CONFIG_MFD_MAX14577=y

CONFIG_MFD_MAX77686=y

CONFIG_MFD_MAX77693=y

CONFIG_MFD_MAX8997=y

@@ -102,6 +108,7 @@ CONFIG_MFD_TPS65090=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_GPIO=y

+CONFIG_REGULATOR_MAX14577=y

CONFIG_REGULATOR_MAX8997=y

CONFIG_REGULATOR_MAX77686=y

CONFIG_REGULATOR_MAX77802=y

@@ -168,6 +175,9 @@ CONFIG_COMMON_CLK_MAX77686=y

CONFIG_COMMON_CLK_MAX77802=y

CONFIG_COMMON_CLK_S2MPS11=y

CONFIG_EXYNOS_IOMMU=y

+CONFIG_EXTCON=y

+CONFIG_EXTCON_MAX14577=y

+CONFIG_EXTCON_MAX77693=y

CONFIG_IIO=y

CONFIG_EXYNOS_ADC=y

CONFIG_PWM=y

@@ -198,6 +208,7 @@ CONFIG_DETECT_HUNG_TASK=y

CONFIG_DEBUG_RT_MUTEXES=y

CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_MUTEXES=y

+CONFIG_LOCKUP_DETECTOR=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_USER=y

CONFIG_CRYPTO_SHA256=y

@@ -8,6 +8,7 @@ CONFIG_ARCH_HI3xxx=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_CMDLINE_PARTITION=y

CONFIG_ARCH_HIX5HD2=y

+CONFIG_ARCH_HIP01=y

CONFIG_ARCH_HIP04=y

CONFIG_SMP=y

CONFIG_NR_CPUS=16

@@ -97,6 +97,7 @@ CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_GPMI_NAND=y

CONFIG_MTD_NAND_MXC=y

CONFIG_MTD_SPI_NOR=y

+CONFIG_SPI_FSL_QUADSPI=y

CONFIG_MTD_UBI=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

@@ -129,6 +130,11 @@ CONFIG_SMC911X=y

CONFIG_SMSC911X=y

# CONFIG_NET_VENDOR_STMICRO is not set

CONFIG_AT803X_PHY=y

+CONFIG_USB_PEGASUS=m

+CONFIG_USB_RTL8150=m

+CONFIG_USB_RTL8152=m

+CONFIG_USB_USBNET=m

+CONFIG_USB_NET_CDC_EEM=m

CONFIG_BRCMFMAC=m

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

CONFIG_INPUT_EVDEV=y

@@ -163,13 +169,14 @@ CONFIG_SPI_IMX=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_MC9S08DZ60=y

CONFIG_GPIO_STMPE=y

+CONFIG_POWER_SUPPLY=y

+CONFIG_POWER_RESET=y

+CONFIG_POWER_RESET_IMX=y

+CONFIG_POWER_RESET_SYSCON=y

CONFIG_SENSORS_GPIO_FAN=y

CONFIG_THERMAL=y

CONFIG_CPU_THERMAL=y

CONFIG_IMX_THERMAL=y

-CONFIG_POWER_SUPPLY=y

-CONFIG_POWER_RESET=y

-CONFIG_POWER_RESET_IMX=y

CONFIG_WATCHDOG=y

CONFIG_IMX2_WDT=y

CONFIG_MFD_DA9052_I2C=y

@@ -189,6 +196,8 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_MEDIA_RC_SUPPORT=y

CONFIG_RC_DEVICES=y

CONFIG_IR_GPIO_CIR=y

+CONFIG_MEDIA_USB_SUPPORT=y

+CONFIG_USB_VIDEO_CLASS=m

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_SOC_CAMERA=y

CONFIG_VIDEO_MX3=y

@@ -198,16 +207,17 @@ CONFIG_SOC_CAMERA_OV2640=y

CONFIG_IMX_IPUV3_CORE=y

CONFIG_DRM=y

CONFIG_DRM_PANEL_SIMPLE=y

-CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_LCD_CLASS_DEVICE=y

CONFIG_LCD_L4F00242T03=y

CONFIG_LCD_PLATFORM=y

+CONFIG_FB_MXS=y

CONFIG_BACKLIGHT_PWM=y

CONFIG_BACKLIGHT_GPIO=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y

CONFIG_SOUND=y

CONFIG_SND=y

+CONFIG_SND_USB_AUDIO=m

CONFIG_SND_SOC=y

CONFIG_SND_SOC_FSL_SAI=y

CONFIG_SND_IMX_SOC=y

@@ -226,11 +236,32 @@ CONFIG_USB_STORAGE=y

CONFIG_USB_CHIPIDEA=y

CONFIG_USB_CHIPIDEA_UDC=y

CONFIG_USB_CHIPIDEA_HOST=y

+CONFIG_USB_SERIAL=m

+CONFIG_USB_SERIAL_GENERIC=y

+CONFIG_USB_SERIAL_FTDI_SIO=m

+CONFIG_USB_SERIAL_OPTION=m

+CONFIG_USB_EHSET_TEST_FIXTURE=m

CONFIG_NOP_USB_XCEIV=y

CONFIG_USB_MXS_PHY=y

CONFIG_USB_GADGET=y

+CONFIG_USB_CONFIGFS=m

+CONFIG_USB_CONFIGFS_SERIAL=y

+CONFIG_USB_CONFIGFS_ACM=y

+CONFIG_USB_CONFIGFS_OBEX=y

+CONFIG_USB_CONFIGFS_NCM=y

+CONFIG_USB_CONFIGFS_ECM=y

+CONFIG_USB_CONFIGFS_ECM_SUBSET=y

+CONFIG_USB_CONFIGFS_RNDIS=y

+CONFIG_USB_CONFIGFS_EEM=y

+CONFIG_USB_CONFIGFS_MASS_STORAGE=y

+CONFIG_USB_CONFIGFS_F_LB_SS=y

+CONFIG_USB_CONFIGFS_F_FS=y

+CONFIG_USB_ZERO=m

CONFIG_USB_ETH=m

+CONFIG_USB_G_NCM=m

+CONFIG_USB_GADGETFS=m

CONFIG_USB_MASS_STORAGE=m

+CONFIG_USB_G_SERIAL=m

CONFIG_MMC=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

@@ -201,3 +201,4 @@ CONFIG_KEYSTONE_IRQ=y

CONFIG_GPIO_SYSCON=y

CONFIG_TI_DAVINCI_MDIO=y

CONFIG_MARVELL_PHY=y

+CONFIG_DEVTMPFS=y

@@ -126,8 +126,8 @@ CONFIG_DMADEVICES=y

CONFIG_SH_DMAE=y

CONFIG_ASYNC_TX_DMA=y

CONFIG_STAGING=y

-CONFIG_SENSORS_AK8975=y

CONFIG_IIO=y

+CONFIG_AK8975=y

# CONFIG_DNOTIFY is not set

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

@@ -32,6 +32,7 @@ CONFIG_ARCH_HIGHBANK=y

CONFIG_ARCH_HISI=y

CONFIG_ARCH_HI3xxx=y

CONFIG_ARCH_HIX5HD2=y

+CONFIG_ARCH_HIP01=y

CONFIG_ARCH_HIP04=y

CONFIG_ARCH_KEYSTONE=y

CONFIG_ARCH_MESON=y

@@ -60,6 +61,7 @@ CONFIG_MACH_SPEAR1310=y

CONFIG_MACH_SPEAR1340=y

CONFIG_ARCH_STI=y

CONFIG_ARCH_EXYNOS=y

+CONFIG_EXYNOS5420_MCPM=y

CONFIG_ARCH_SUNXI=y

CONFIG_ARCH_SIRF=y

CONFIG_ARCH_TEGRA=y

@@ -78,6 +80,7 @@ CONFIG_ARCH_WM8850=y

CONFIG_ARCH_ZYNQ=y

CONFIG_TRUSTED_FOUNDATIONS=y

CONFIG_PCI=y

+CONFIG_PCI_KEYSTONE=y

CONFIG_PCI_MSI=y

CONFIG_PCI_MVEBU=y

CONFIG_PCI_TEGRA=y

@@ -132,6 +135,7 @@ CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_M25P80=y

CONFIG_MTD_NAND=y

+CONFIG_MTD_NAND_DAVINCI=y

CONFIG_MTD_SPI_NOR=y

CONFIG_MTD_UBI=y

CONFIG_BLK_DEV_LOOP=y

@@ -189,12 +193,15 @@ CONFIG_MOUSE_PS2_ELANTECH=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_ATMEL_MXT=y

CONFIG_TOUCHSCREEN_STMPE=y

+CONFIG_TOUCHSCREEN_SUN4I=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_MPU3050=y

+CONFIG_INPUT_AXP20X_PEK=y

CONFIG_SERIO_AMBAKMI=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_DW=y

+CONFIG_SERIAL_8250_MT6577=y

CONFIG_SERIAL_AMBA_PL011=y

CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

CONFIG_SERIAL_MESON=y

@@ -220,6 +227,7 @@ CONFIG_SERIAL_FSL_LPUART_CONSOLE=y

CONFIG_SERIAL_ST_ASC=y

CONFIG_SERIAL_ST_ASC_CONSOLE=y

CONFIG_I2C_CHARDEV=y

+CONFIG_I2C_DAVINCI=y

CONFIG_I2C_MUX=y

CONFIG_I2C_MUX_PCA954x=y

CONFIG_I2C_MUX_PINCTRL=y

@@ -233,6 +241,7 @@ CONFIG_I2C_TEGRA=y

CONFIG_I2C_ST=y

CONFIG_SPI=y

CONFIG_I2C_XILINX=y

+CONFIG_SPI_DAVINCI=y

CONFIG_SPI_CADENCE=y

CONFIG_SPI_OMAP24XX=y

CONFIG_SPI_ORION=y

@@ -251,23 +260,28 @@ CONFIG_PINCTRL_APQ8084=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_GENERIC_PLATFORM=y

CONFIG_GPIO_DWAPB=y

+CONFIG_GPIO_DAVINCI=y

CONFIG_GPIO_XILINX=y

CONFIG_GPIO_ZYNQ=y

CONFIG_GPIO_PCA953X=y

CONFIG_GPIO_PCA953X_IRQ=y

CONFIG_GPIO_TWL4030=y

CONFIG_GPIO_PALMAS=y

+CONFIG_GPIO_SYSCON=y

CONFIG_GPIO_TPS6586X=y

CONFIG_GPIO_TPS65910=y

CONFIG_BATTERY_SBS=y

CONFIG_CHARGER_TPS65090=y

CONFIG_POWER_RESET_AS3722=y

CONFIG_POWER_RESET_GPIO=y

+CONFIG_POWER_RESET_KEYSTONE=y

CONFIG_POWER_RESET_SUN6I=y

CONFIG_SENSORS_LM90=y

CONFIG_SENSORS_LM95245=y

CONFIG_THERMAL=y

+CONFIG_CPU_THERMAL=y

CONFIG_ARMADA_THERMAL=y

+CONFIG_DAVINCI_WATCHDOG

CONFIG_ST_THERMAL_SYSCFG=y

CONFIG_ST_THERMAL_MEMMAP=y

CONFIG_WATCHDOG=y

@@ -278,6 +292,7 @@ CONFIG_SUNXI_WATCHDOG=y

CONFIG_MESON_WATCHDOG=y

CONFIG_MFD_AS3722=y

CONFIG_MFD_BCM590XX=y

+CONFIG_MFD_AXP20X=y

CONFIG_MFD_CROS_EC=y

CONFIG_MFD_CROS_EC_SPI=y

CONFIG_MFD_MAX77686=y

@@ -290,6 +305,7 @@ CONFIG_MFD_TPS6586X=y

CONFIG_MFD_TPS65910=y

CONFIG_REGULATOR_AB8500=y

CONFIG_REGULATOR_AS3722=y

+CONFIG_REGULATOR_AXP20X=y

CONFIG_REGULATOR_BCM590XX=y

CONFIG_REGULATOR_GPIO=y

CONFIG_MFD_SYSCON=y

@@ -347,9 +363,11 @@ CONFIG_USB_OHCI_HCD=y

CONFIG_USB_OHCI_HCD_STI=y

CONFIG_USB_OHCI_HCD_PLATFORM=y

CONFIG_USB_STORAGE=y

+CONFIG_USB_DWC3=y

CONFIG_USB_CHIPIDEA=y

CONFIG_USB_CHIPIDEA_HOST=y

CONFIG_AB8500_USB=y

+CONFIG_KEYSTONE_USB_PHY=y

CONFIG_OMAP_USB3=y

CONFIG_SAMSUNG_USB2PHY=y

CONFIG_SAMSUNG_USB3PHY=y

@@ -445,6 +463,7 @@ CONFIG_MSM_MMCC_8974=y

CONFIG_TEGRA_IOMMU_GART=y

CONFIG_TEGRA_IOMMU_SMMU=y

CONFIG_MEMORY=y

+CONFIG_TI_AEMIF=y

CONFIG_IIO=y

CONFIG_XILINX_XADC=y

CONFIG_AK8975=y

@@ -454,6 +473,7 @@ CONFIG_PWM_VT8500=y

CONFIG_PHY_HIX5HD2_SATA=y

CONFIG_OMAP_USB2=y

CONFIG_TI_PIPE3=y

+CONFIG_PHY_MIPHY28LP=y

CONFIG_PHY_MIPHY365X=y

CONFIG_PHY_STIH41X_USB=y

CONFIG_PHY_STIH407_USB=y

@@ -482,3 +502,4 @@ CONFIG_MAGIC_SYSRQ=y

CONFIG_LOCKUP_DETECTOR=y

CONFIG_CRYPTO_DEV_TEGRA_AES=y

CONFIG_CPUFREQ_DT=y

+CONFIG_KEYSTONE_IRQ=y

@@ -26,6 +26,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_ARM_APPENDED_DTB=y

CONFIG_ARM_ATAG_DTB_COMPAT=y

CONFIG_CPU_FREQ=y

+CONFIG_CPUFREQ_DT=y

CONFIG_CPU_IDLE=y

CONFIG_ARM_MVEBU_V7_CPUIDLE=y

CONFIG_VFP=y

@@ -13,7 +13,6 @@ CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_DEVICE=y

CONFIG_CPUSETS=y

CONFIG_CGROUP_CPUACCT=y

-CONFIG_RESOURCE_COUNTERS=y

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_MEMCG_KMEM=y

@@ -103,13 +102,15 @@ CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_DMA_CMA=y

CONFIG_OMAP_OCP2SCP=y

-CONFIG_CONNECTOR=y

+CONFIG_CONNECTOR=m

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_OOPS=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_INTELEXT=y

+CONFIG_MTD_PHYSMAP=y

+CONFIG_MTD_PHYSMAP_OF=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_ECC_BCH=y

CONFIG_MTD_NAND_OMAP2=y

@@ -122,14 +123,12 @@ CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=16384

CONFIG_SENSORS_TSL2550=m

CONFIG_BMP085_I2C=m

-CONFIG_SENSORS_LIS3_I2C=m

CONFIG_SRAM=y

-CONFIG_SCSI=y

+CONFIG_SENSORS_LIS3_I2C=m

CONFIG_BLK_DEV_SD=y

CONFIG_SCSI_SCAN_ASYNC=y

CONFIG_ATA=y

CONFIG_SATA_AHCI_PLATFORM=y

-CONFIG_MD=y

CONFIG_NETDEVICES=y

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_CADENCE is not set

@@ -149,16 +148,19 @@ CONFIG_KS8851_MLL=y

CONFIG_SMC91X=y

CONFIG_SMSC911X=y

# CONFIG_NET_VENDOR_STMICRO is not set

+CONFIG_TI_DAVINCI_EMAC=y

CONFIG_TI_CPSW=y

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WIZNET is not set

CONFIG_AT803X_PHY=y

CONFIG_SMSC_PHY=y

-CONFIG_USB_USBNET=y

-CONFIG_USB_NET_SMSC95XX=y

+CONFIG_USB_USBNET=m

+CONFIG_USB_NET_SMSC95XX=m

CONFIG_USB_ALI_M5632=y

CONFIG_USB_AN2720=y

CONFIG_USB_EPSON2888=y

+CONFIG_USB_EHCI_HCD=m

+CONFIG_USB_OHCI_HCD=m

CONFIG_USB_KC2190=y

CONFIG_LIBERTAS=m

CONFIG_LIBERTAS_USB=m

@@ -172,18 +174,24 @@ CONFIG_WLCORE_SDIO=m

CONFIG_MWIFIEX=m

CONFIG_MWIFIEX_SDIO=m

CONFIG_MWIFIEX_USB=m

-CONFIG_INPUT_JOYDEV=y

-CONFIG_INPUT_EVDEV=y

-CONFIG_KEYBOARD_GPIO=y

+CONFIG_INPUT_JOYDEV=m

+CONFIG_INPUT_EVDEV=m

+CONFIG_KEYBOARD_ATKBD=m

+CONFIG_KEYBOARD_GPIO=m

CONFIG_KEYBOARD_MATRIX=m

-CONFIG_KEYBOARD_TWL4030=y

+CONFIG_KEYBOARD_OMAP4=m

+CONFIG_KEYBOARD_TWL4030=m

+# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_ADS7846=m

CONFIG_TOUCHSCREEN_EDT_FT5X06=m

CONFIG_TOUCHSCREEN_TSC2005=m

CONFIG_TOUCHSCREEN_TSC2007=m

CONFIG_INPUT_MISC=y

-CONFIG_INPUT_TWL4030_PWRBUTTON=y

+CONFIG_INPUT_TPS65218_PWRBUTTON=m

+CONFIG_INPUT_TWL4030_PWRBUTTON=m

+CONFIG_INPUT_PALMAS_PWRBUTTON=m

+CONFIG_SERIO=m

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

@@ -196,15 +204,18 @@ CONFIG_SERIAL_8250_RSA=y

CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_SERIAL_OMAP=y

CONFIG_SERIAL_OMAP_CONSOLE=y

-CONFIG_HW_RANDOM=y

CONFIG_I2C_CHARDEV=y

CONFIG_SPI=y

CONFIG_SPI_OMAP24XX=y

+CONFIG_SPI_TI_QSPI=m

CONFIG_PINCTRL_SINGLE=y

CONFIG_DEBUG_GPIO=y

CONFIG_GPIO_SYSFS=y

+CONFIG_GPIO_PCF857X=m

CONFIG_GPIO_TWL4030=y

-CONFIG_W1=y

+CONFIG_GPIO_PALMAS=y

+CONFIG_W1=m

+CONFIG_HDQ_MASTER_OMAP=m

CONFIG_BATTERY_BQ27x00=m

CONFIG_CHARGER_ISP1704=m

CONFIG_CHARGER_TWL4030=m

@@ -213,20 +224,22 @@ CONFIG_CHARGER_BQ24190=m

CONFIG_CHARGER_BQ24735=m

CONFIG_POWER_RESET=y

CONFIG_POWER_AVS=y

+CONFIG_HWMON=m

+CONFIG_SENSORS_GPIO_FAN=m

CONFIG_SENSORS_LM75=m

-CONFIG_THERMAL=y

+CONFIG_SENSORS_TMP102=m

+CONFIG_THERMAL=m

CONFIG_THERMAL_GOV_FAIR_SHARE=y

CONFIG_THERMAL_GOV_USER_SPACE=y

CONFIG_CPU_THERMAL=y

-CONFIG_TI_SOC_THERMAL=y

+CONFIG_TI_SOC_THERMAL=m

CONFIG_TI_THERMAL=y

CONFIG_OMAP4_THERMAL=y

CONFIG_OMAP5_THERMAL=y

CONFIG_DRA752_THERMAL=y

CONFIG_WATCHDOG=y

-CONFIG_OMAP_WATCHDOG=y

-CONFIG_TWL4030_WATCHDOG=y

-CONFIG_MFD_SYSCON=y

+CONFIG_OMAP_WATCHDOG=m

+CONFIG_TWL4030_WATCHDOG=m

CONFIG_MFD_PALMAS=y

CONFIG_MFD_TPS65217=y

CONFIG_MFD_TPS65218=y

@@ -289,51 +302,79 @@ CONFIG_SND_OMAP_SOC=m

CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m

CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m

CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m

-CONFIG_USB=y

+CONFIG_HID_GENERIC=m

+CONFIG_USB_HIDDEV=y

+CONFIG_USB_KBD=m

+CONFIG_USB_MOUSE=m

+CONFIG_USB=m

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

-CONFIG_USB_MON=y

+CONFIG_USB_MON=m

CONFIG_USB_XHCI_HCD=m

-CONFIG_USB_WDM=y

-CONFIG_USB_STORAGE=y

+CONFIG_USB_WDM=m

+CONFIG_USB_STORAGE=m

+CONFIG_USB_MUSB_HDRC=m

+CONFIG_USB_MUSB_OMAP2PLUS=m

+CONFIG_USB_MUSB_AM35X=m

+CONFIG_USB_MUSB_DSPS=m

CONFIG_USB_DWC3=m

-CONFIG_USB_TEST=y

+CONFIG_USB_TEST=m

CONFIG_AM335X_PHY_USB=y

-CONFIG_USB_GADGET=y

+CONFIG_USB_GADGET=m

CONFIG_USB_GADGET_DEBUG=y

CONFIG_USB_GADGET_DEBUG_FILES=y

CONFIG_USB_GADGET_DEBUG_FS=y

+CONFIG_USB_CONFIGFS=m

+CONFIG_USB_CONFIGFS_SERIAL=y

+CONFIG_USB_CONFIGFS_ACM=y

+CONFIG_USB_CONFIGFS_OBEX=y

+CONFIG_USB_CONFIGFS_NCM=y

+CONFIG_USB_CONFIGFS_ECM=y

+CONFIG_USB_CONFIGFS_ECM_SUBSET=y

+CONFIG_USB_CONFIGFS_RNDIS=y

+CONFIG_USB_CONFIGFS_EEM=y

+CONFIG_USB_CONFIGFS_MASS_STORAGE=y

+CONFIG_USB_CONFIGFS_F_LB_SS=y

+CONFIG_USB_CONFIGFS_F_FS=y

+CONFIG_USB_CONFIGFS_F_UAC1=y

+CONFIG_USB_CONFIGFS_F_UAC2=y

+CONFIG_USB_CONFIGFS_F_MIDI=y

+CONFIG_USB_CONFIGFS_F_HID=y

CONFIG_USB_ZERO=m

CONFIG_MMC=y

CONFIG_SDIO_UART=y

CONFIG_MMC_OMAP=y

CONFIG_MMC_OMAP_HS=y

CONFIG_NEW_LEDS=y

-CONFIG_LEDS_CLASS=y

-CONFIG_LEDS_GPIO=y

+CONFIG_LEDS_CLASS=m

+CONFIG_LEDS_GPIO=m

CONFIG_LEDS_TRIGGERS=y

-CONFIG_LEDS_TRIGGER_TIMER=y

-CONFIG_LEDS_TRIGGER_ONESHOT=y

-CONFIG_LEDS_TRIGGER_HEARTBEAT=y

-CONFIG_LEDS_TRIGGER_BACKLIGHT=y

+CONFIG_LEDS_TRIGGER_TIMER=m

+CONFIG_LEDS_TRIGGER_ONESHOT=m

+CONFIG_LEDS_TRIGGER_HEARTBEAT=m

+CONFIG_LEDS_TRIGGER_BACKLIGHT=m

CONFIG_LEDS_TRIGGER_CPU=y

-CONFIG_LEDS_TRIGGER_GPIO=y

-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y

+CONFIG_LEDS_TRIGGER_GPIO=m

+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m

CONFIG_RTC_CLASS=y

+CONFIG_RTC_DRV_DS1307=m

+CONFIG_RTC_DRV_PALMAS=m

CONFIG_RTC_DRV_TWL92330=y

-CONFIG_RTC_DRV_TWL4030=y

-CONFIG_RTC_DRV_OMAP=y

+CONFIG_RTC_DRV_TWL4030=m

+CONFIG_RTC_DRV_OMAP=m

CONFIG_DMADEVICES=y

CONFIG_TI_EDMA=y

CONFIG_DMA_OMAP=y

-CONFIG_EXTCON=y

-CONFIG_EXTCON_PALMAS=y

+# CONFIG_IOMMU_SUPPORT is not set

+CONFIG_EXTCON=m

+CONFIG_EXTCON_PALMAS=m

+CONFIG_TI_EMIF=m

CONFIG_PWM=y

-CONFIG_PWM_TIECAP=y

-CONFIG_PWM_TIEHRPWM=y

-CONFIG_PWM_TWL=y

-CONFIG_PWM_TWL_LED=y

-CONFIG_OMAP_USB2=y

-CONFIG_TI_PIPE3=y

+CONFIG_PWM_TIECAP=m

+CONFIG_PWM_TIEHRPWM=m

+CONFIG_PWM_TWL=m

+CONFIG_PWM_TWL_LED=m

+CONFIG_OMAP_USB2=m

+CONFIG_TI_PIPE3=m

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_FS_XATTR is not set

@@ -139,6 +139,12 @@ CONFIG_POWER_RESET=y

CONFIG_SSB=m

CONFIG_REGULATOR=y

CONFIG_REGULATOR_ACT8865=y

+CONFIG_MEDIA_SUPPORT=y

+CONFIG_MEDIA_CAMERA_SUPPORT=y

+CONFIG_V4L_PLATFORM_DRIVERS=y

+CONFIG_SOC_CAMERA=y

+CONFIG_SOC_CAMERA_OV2640=y

+CONFIG_VIDEO_ATMEL_ISI=y

CONFIG_FB=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

# CONFIG_LCD_CLASS_DEVICE is not set

@@ -202,8 +208,6 @@ CONFIG_DEBUG_MEMORY_INIT=y

# CONFIG_SCHED_DEBUG is not set

# CONFIG_FTRACE is not set

CONFIG_DEBUG_USER=y

-CONFIG_DEBUG_LL=y

-CONFIG_EARLY_PRINTK=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRYPTO_USER_API_HASH=m

CONFIG_CRYPTO_USER_API_SKCIPHER=m

@@ -17,8 +17,8 @@ CONFIG_ARCH_R8A7779=y

CONFIG_ARCH_R8A7790=y

CONFIG_ARCH_R8A7791=y

CONFIG_ARCH_R8A7794=y

+CONFIG_ARCH_SH73A0=y

CONFIG_MACH_MARZEN=y

-# CONFIG_SWP_EMULATE is not set

CONFIG_CPU_BPREDICT_DISABLE=y

CONFIG_PL310_ERRATA_588369=y

CONFIG_ARM_ERRATA_754322=y

@@ -35,10 +35,16 @@ CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_ARM_APPENDED_DTB=y

CONFIG_KEXEC=y

+CONFIG_CPU_FREQ=y

+CONFIG_CPU_FREQ_STAT_DETAILS=y

+CONFIG_CPU_FREQ_GOV_POWERSAVE=y

+CONFIG_CPU_FREQ_GOV_USERSPACE=y

+CONFIG_CPU_FREQ_GOV_ONDEMAND=y

+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y

+CONFIG_CPUFREQ_DT=y

CONFIG_VFP=y

CONFIG_NEON=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

-CONFIG_PM=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

@@ -48,7 +54,9 @@ CONFIG_IP_PNP_DHCP=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

+CONFIG_SIMPLE_PM_BUS=y

CONFIG_MTD=y

+CONFIG_MTD_BLOCK=y

CONFIG_MTD_M25P80=y

CONFIG_MTD_SPI_NOR=y

CONFIG_EEPROM_AT24=y

@@ -72,11 +80,15 @@ CONFIG_SMSC911X=y

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WIZNET is not set

CONFIG_SMSC_PHY=y

+CONFIG_MICREL_PHY=y

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

+CONFIG_INPUT_EVDEV=y

CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_ST1232=y

+CONFIG_INPUT_MISC=y

+CONFIG_INPUT_ADXL34X=y

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

@@ -85,6 +97,7 @@ CONFIG_SERIAL_8250_EM=y

CONFIG_SERIAL_SH_SCI=y

CONFIG_SERIAL_SH_SCI_NR_UARTS=20

CONFIG_SERIAL_SH_SCI_CONSOLE=y

+CONFIG_I2C_CHARDEV=y

CONFIG_I2C_GPIO=y

CONFIG_I2C_RIIC=y

CONFIG_I2C_SH_MOBILE=y

@@ -95,11 +108,18 @@ CONFIG_SPI_SH_MSIOF=y

CONFIG_SPI_SH_HSPI=y

CONFIG_GPIO_EM=y

CONFIG_GPIO_RCAR=y

+CONFIG_GPIO_PCF857X=y

# CONFIG_HWMON is not set

CONFIG_THERMAL=y

+CONFIG_CPU_THERMAL=y

CONFIG_RCAR_THERMAL=y

+CONFIG_WATCHDOG=y

+CONFIG_DA9063_WATCHDOG=y

+CONFIG_MFD_AS3711=y

+CONFIG_MFD_DA9063=y

CONFIG_REGULATOR=y

-CONFIG_REGULATOR_FIXED_VOLTAGE=y

+CONFIG_REGULATOR_AS3711=y

+CONFIG_REGULATOR_DA9210=y

CONFIG_REGULATOR_GPIO=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

@@ -115,10 +135,12 @@ CONFIG_VIDEO_RENESAS_VSP1=y

CONFIG_VIDEO_ADV7180=y

CONFIG_DRM=y

CONFIG_DRM_RCAR_DU=y

-CONFIG_BACKLIGHT_LCD_SUPPORT=y

+CONFIG_FB_SH_MOBILE_LCDC=y

+CONFIG_FB_SH_MOBILE_MERAM=y

# CONFIG_LCD_CLASS_DEVICE is not set

# CONFIG_BACKLIGHT_GENERIC is not set

CONFIG_BACKLIGHT_PWM=y

+CONFIG_BACKLIGHT_AS3711=y

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND_SOC=y

@@ -129,6 +151,7 @@ CONFIG_SND_SOC_WM8978=y

CONFIG_USB=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_OHCI_HCD=y

+CONFIG_USB_R8A66597_HCD=y

CONFIG_USB_RENESAS_USBHS=y

CONFIG_USB_RCAR_PHY=y

CONFIG_USB_RCAR_GEN2_PHY=y

@@ -142,18 +165,20 @@ CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

CONFIG_RTC_CLASS=y

+CONFIG_RTC_DRV_RS5C372=y

CONFIG_RTC_DRV_S35390A=y

CONFIG_DMADEVICES=y

CONFIG_SH_DMAE=y

CONFIG_RCAR_DMAC=y

# CONFIG_IOMMU_SUPPORT is not set

+CONFIG_IIO=y

+CONFIG_AK8975=y

CONFIG_PWM=y

CONFIG_PWM_RENESAS_TPU=y

# CONFIG_DNOTIFY is not set

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

-CONFIG_CONFIGFS_FS=y

# CONFIG_MISC_FILESYSTEMS is not set

CONFIG_NFS_FS=y

CONFIG_NFS_V3_ACL=y

@@ -165,16 +190,3 @@ CONFIG_NLS_ISO8859_1=y

# CONFIG_ENABLE_WARN_DEPRECATED is not set

# CONFIG_ENABLE_MUST_CHECK is not set

# CONFIG_ARM_UNWIND is not set

-CONFIG_CPU_FREQ=y

-CONFIG_CPU_FREQ_GOV_COMMON=y

-CONFIG_CPU_FREQ_STAT=y

-CONFIG_CPU_FREQ_STAT_DETAILS=y

-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y

-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y

-CONFIG_CPU_FREQ_GOV_POWERSAVE=y

-CONFIG_CPU_FREQ_GOV_USERSPACE=y

-CONFIG_CPU_FREQ_GOV_ONDEMAND=y

-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y

-CONFIG_CPU_THERMAL=y

-CONFIG_CPUFREQ_DT=y

-CONFIG_REGULATOR_DA9210=y

@@ -9,6 +9,8 @@ CONFIG_HIGHMEM=y

CONFIG_HIGHPTE=y

CONFIG_ARM_APPENDED_DTB=y

CONFIG_ARM_ATAG_DTB_COMPAT=y

+CONFIG_CPU_FREQ=y

+CONFIG_CPUFREQ_DT=y

CONFIG_VFP=y

CONFIG_NEON=y

CONFIG_PM=y

@@ -54,6 +56,10 @@ CONFIG_STMMAC_ETH=y

# CONFIG_INPUT_MOUSEDEV is not set

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

+CONFIG_INPUT_MISC=y

+CONFIG_INPUT_AXP20X_PEK=y

+CONFIG_INPUT_TOUCHSCREEN=y

+CONFIG_TOUCHSCREEN_SUN4I=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_NR_UARTS=8

@@ -71,12 +77,14 @@ CONFIG_GPIO_SYSFS=y

CONFIG_POWER_SUPPLY=y

CONFIG_POWER_RESET=y

CONFIG_POWER_RESET_SUN6I=y

-# CONFIG_HWMON is not set

+CONFIG_THERMAL=y

+CONFIG_CPU_THERMAL=y

CONFIG_WATCHDOG=y

CONFIG_SUNXI_WATCHDOG=y

CONFIG_MFD_AXP20X=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

+CONFIG_REGULATOR_AXP20X=y

CONFIG_REGULATOR_GPIO=y

CONFIG_USB=y

CONFIG_USB_EHCI_HCD=y

@@ -8,7 +8,6 @@ CONFIG_CGROUPS=y

CONFIG_CGROUP_DEBUG=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_CPUACCT=y

-CONFIG_RESOURCE_COUNTERS=y

CONFIG_CGROUP_SCHED=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_BLK_DEV_INITRD=y

@@ -46,7 +45,6 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y

CONFIG_CPU_IDLE=y

CONFIG_VFP=y

CONFIG_NEON=y

-CONFIG_PM=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y