Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b509b5e4 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-defconfig3-for-v3.18' of... 

Merge tag 'renesas-defconfig3-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

 into next/defconfig

Pull "Renesas ARM Based SoC Defconfig Updates for v3.18" from Simon Horman:

Third Round of Renesas ARM Based SoC Defconfig Updates for v3.18

* Enable Armadillo 800 EVA board in multiplatform defconfig

Second Round Of Renesas ARM Based SoC Defconfig Updates For v3.18

* Do not disable SUSPEND in Bockw defconfig
  - Suspend to ram is now supported

Renesas ARM Based SoC Defconfig Updates for v3.18

* Enable initrd in shmobile defconfig
* Enable missing hardware support in shmobile and several board defconfigs

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>

* tag 'renesas-defconfig3-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Enable Armadillo 800 EVA board in multiplatform defconfig
  ARM: shmobile: bockw: Do not disable SUSPEND in defconfig
  ARM: shmobile: defconfig: enable initrd
  ARM: shmobile: marzen_defconfig: Enable missing hardware support
  ARM: shmobile: lager_defconfig: Enable missing hardware support
  ARM: shmobile: kzm9g_defconfig: Enable missing hardware support
  ARM: shmobile: koelsch_defconfig: Enable missing hardware support
  ARM: shmobile: bockw_defconfig: Enable missing hardware support
  ARM: shmobile: ape6evm_defconfig: Enable missing hardware support
  ARM: shmobile: shmobile_defconfig: Enable missing hardware support
parents aa4f88c8 de46e95c

arch/arm/configs/ape6evm_defconfig

+8 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ CONFIG_KALLSYMS_ALL=y 
CONFIG_EMBEDDED=y

CONFIG_PERF_EVENTS=y

CONFIG_SLAB=y

# CONFIG_BLOCK is not set

CONFIG_ARCH_SHMOBILE_LEGACY=y

CONFIG_ARCH_R8A73A4=y

CONFIG_MACH_APE6EVM=y
@@ -64,6 +63,8 @@ CONFIG_SERIAL_NONSTANDARD=y 
CONFIG_SERIAL_SH_SCI=y

CONFIG_SERIAL_SH_SCI_NR_UARTS=12

CONFIG_SERIAL_SH_SCI_CONSOLE=y

CONFIG_I2C=y

CONFIG_I2C_SH_MOBILE=y

CONFIG_GPIO_SH_PFC=y

CONFIG_GPIOLIB=y

# CONFIG_HWMON is not set
@@ -72,11 +73,17 @@ CONFIG_RCAR_THERMAL=y 
CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_GPIO=y

CONFIG_REGULATOR_MAX8973=y

# CONFIG_HID is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_MMC=y

CONFIG_MMC_SDHI=y

CONFIG_MMC_SH_MMCIF=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

CONFIG_DMADEVICES=y

CONFIG_SH_DMAE=y

# CONFIG_IOMMU_SUPPORT is not set

# CONFIG_DNOTIFY is not set

CONFIG_TMPFS=y

arch/arm/configs/bockw_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ CONFIG_ZBOOT_ROM_BSS=0x0 
CONFIG_ARM_APPENDED_DTB=y

CONFIG_VFP=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

# CONFIG_SUSPEND is not set

CONFIG_PM_RUNTIME=y

CONFIG_NET=y

CONFIG_PACKET=y
@@ -55,6 +54,7 @@ CONFIG_MTD_BLOCK=y 
CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_M25P80=y

CONFIG_MTD_SPI_NOR=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_NETDEVICES=y
@@ -82,6 +82,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y 
# CONFIG_HWMON is not set

CONFIG_I2C=y

CONFIG_I2C_RCAR=y

CONFIG_GPIO_RCAR=y

CONFIG_REGULATOR=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

arch/arm/configs/koelsch_defconfig

+17 −0
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ CONFIG_MACH_KOELSCH=y 
CONFIG_CPU_BPREDICT_DISABLE=y

CONFIG_PL310_ERRATA_588369=y

CONFIG_ARM_ERRATA_754322=y

CONFIG_PCI=y

CONFIG_PCI_RCAR_GEN2=y

CONFIG_PCI_RCAR_GEN2_PCIE=y

CONFIG_SMP=y

CONFIG_SCHED_MC=y

CONFIG_NR_CPUS=8
@@ -42,6 +45,8 @@ CONFIG_ATA=y 
CONFIG_SATA_RCAR=y

CONFIG_MTD=y

CONFIG_MTD_M25P80=y

CONFIG_MTD_SPI_NOR=y

CONFIG_EEPROM_AT24=y

CONFIG_NETDEVICES=y

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_CADENCE is not set
@@ -66,9 +71,12 @@ CONFIG_SERIAL_SH_SCI=y 
CONFIG_SERIAL_SH_SCI_NR_UARTS=20

CONFIG_SERIAL_SH_SCI_CONSOLE=y

CONFIG_I2C=y

CONFIG_I2C_MUX=y

CONFIG_I2C_SH_MOBILE=y

CONFIG_I2C_RCAR=y

CONFIG_SPI=y

CONFIG_SPI_RSPI=y

CONFIG_SPI_SH_MSIOF=y

CONFIG_GPIOLIB=y

CONFIG_GPIO_RCAR=y

# CONFIG_HWMON is not set
@@ -76,7 +84,16 @@ CONFIG_THERMAL=y 
CONFIG_RCAR_THERMAL=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_DA9210=y

CONFIG_REGULATOR_GPIO=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_SOC_CAMERA=y

CONFIG_SOC_CAMERA_PLATFORM=y

CONFIG_VIDEO_RCAR_VIN=y

# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set

CONFIG_VIDEO_ADV7180=y

# CONFIG_HID is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_MMC=y

arch/arm/configs/kzm9g_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ CONFIG_MMC_SDHI=y 
CONFIG_MMC_SH_MMCIF=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_RS5C372=y

CONFIG_DMADEVICES=y

arch/arm/configs/lager_defconfig

+7 −1
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ CONFIG_ARM_ERRATA_458693=y 
CONFIG_ARM_ERRATA_460075=y

CONFIG_ARM_ERRATA_743622=y

CONFIG_ARM_ERRATA_754322=y

CONFIG_PCI=y

CONFIG_PCI_RCAR_GEN2=y

CONFIG_PCI_RCAR_GEN2_PCIE=y

CONFIG_HAVE_ARM_ARCH_TIMER=y

CONFIG_AEABI=y

# CONFIG_OABI_COMPAT is not set
@@ -53,6 +56,7 @@ CONFIG_DEVTMPFS=y 
CONFIG_DEVTMPFS_MOUNT=y

CONFIG_MTD=y

CONFIG_MTD_M25P80=y

CONFIG_MTD_SPI_NOR=y

CONFIG_BLK_DEV_SD=y

CONFIG_ATA=y

CONFIG_SATA_RCAR=y
@@ -85,11 +89,12 @@ CONFIG_SERIAL_SH_SCI=y 
CONFIG_SERIAL_SH_SCI_NR_UARTS=10

CONFIG_SERIAL_SH_SCI_CONSOLE=y

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

CONFIG_I2C_GPIO=y

CONFIG_I2C_SH_MOBILE=y

CONFIG_I2C_RCAR=y

CONFIG_SPI=y

CONFIG_SPI_RSPI=y

CONFIG_SPI_SH_MSIOF=y

CONFIG_GPIO_SH_PFC=y

CONFIG_GPIOLIB=y

CONFIG_GPIO_RCAR=y
@@ -98,6 +103,7 @@ CONFIG_THERMAL=y 
CONFIG_RCAR_THERMAL=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_DA9210=y

CONFIG_REGULATOR_GPIO=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_CAMERA_SUPPORT=y