mirror of https://gitee.com/openkylin/linux.git
Renesas ARM Based SoC Defconfig Updates for v3.20
* Enable DA9063, MICREL_PHY and MTD_BLOCK watchdog in multiplatform defconfig * Update AK8975 config option in kzm9g defconfig -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJUoJAdAAoJENfPZGlqN0++EvMP/iwzs2U+IGNUiIryYEdfsy8p JP9ivazZPqns3o6ucGC7erzw7nhsfO7kwqLVsTYWJWkUEyLiWx3ax9sYBgJElUmz wAVHTwldpl2YBG1w8hg/yukjXfSesB21MJl96WLaZyWvXpXXnIoSL0JWszgoE3oE HeCNpjbG/VV+FxbhM08j/8wbfNtKYlijuT98sKmEk1QhuObA6R7ZAcn0ZDQgjbJ9 nbMQtC5IH9viop+fXPIVschat6o5oxPT/xMwDfb9/8YhRi0gm7LMjwpDXFYn4Dqj BiBzn7CA21eMlqFHfhNU5mYErKhpuI18AkLcILHjdcKFNE4K1GJANcbNbdgPJavR 53nzqLU4sJzghyqW2a/+EOOeS7RjCoFWdROlf/rGpb4SaOiDFjuIYNSNZuEu6ZEs bLzaCRyA00YREwsQeh48XRLspo/4ea8hXe7UP+OJi+6IjAai2eFUKXj7eyu9HxqU GZ5mDh5+kFsIQqdIqZB4JawF9YWwgeUWCZS5ye/syNjdy+Www2XpOhMRo0gyPPmr Ashk9N+0XOvUChjMxSycjTbs2vWbfY0J22J7SP6IzmYUgmMXOW03I3W5LorsU9sM 4CE85UZozkUFl1KZZeFBiDurC73OLcpmj0wmZzq04PeQSri9Coe/zj7YIg8nbFss DpCacI+9erqVrXMvIMg/ =tSs0 -----END PGP SIGNATURE----- Merge tag 'renesas-defconfig-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig Merge "Renesas ARM Based SoC Defconfig Updates for v3.20" from Simon Horman: * Enable DA9063, MICREL_PHY and MTD_BLOCK watchdog in multiplatform defconfig * Update AK8975 config option in kzm9g defconfig * tag 'renesas-defconfig-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: Enable DA9063 watchdog in multiplatform defconfig ARM: shmobile: Enable MICREL_PHY in shmobile_defconfig ARM: shmobile: defconfig: add MTD_BLOCK ARM: shmobile: defconfig: cleanup by savedefconfig ARM: shmobile: kzm9g_defconfig: Update AK8975 config option Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
commit
f58350eb01
|
@ -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
|
||||
|
|
|
@ -19,7 +19,6 @@ CONFIG_ARCH_R8A7791=y
|
|||
CONFIG_ARCH_R8A7794=y
|
||||
CONFIG_MACH_LAGER=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
|
||||
|
@ -36,6 +35,13 @@ 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
|
||||
|
@ -50,6 +56,7 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
|
|||
CONFIG_DEVTMPFS=y
|
||||
CONFIG_DEVTMPFS_MOUNT=y
|
||||
CONFIG_MTD=y
|
||||
CONFIG_MTD_BLOCK=y
|
||||
CONFIG_MTD_M25P80=y
|
||||
CONFIG_MTD_SPI_NOR=y
|
||||
CONFIG_EEPROM_AT24=y
|
||||
|
@ -73,6 +80,7 @@ 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_KEYBOARD_GPIO=y
|
||||
# CONFIG_INPUT_MOUSE is not set
|
||||
|
@ -98,9 +106,13 @@ CONFIG_GPIO_EM=y
|
|||
CONFIG_GPIO_RCAR=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_DA9063=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
|
||||
|
@ -154,7 +166,6 @@ CONFIG_PWM_RENESAS_TPU=y
|
|||
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
|
||||
|
@ -166,16 +177,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
|
||||
|
|
Loading…
Reference in New Issue