From ca8bfc97ca7795f86e5b25553dd19d96b252bb29 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Tue, 25 Nov 2014 16:24:59 +0100 Subject: [PATCH 1/5] ARM: shmobile: kzm9g_defconfig: Update AK8975 config option CONFIG_SENSORS_AK8975 was renamed to CONFIG_AK8975 in commit 2fc72cd8354e3e9c ("iio:magnetometer:ak8975 move driver out of staging") in v3.10. Signed-off-by: Geert Uytterhoeven Signed-off-by: Simon Horman --- arch/arm/configs/kzm9g_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/configs/kzm9g_defconfig b/arch/arm/configs/kzm9g_defconfig index 5d63fc5d2d48..23e8d146dc16 100644 --- a/arch/arm/configs/kzm9g_defconfig +++ b/arch/arm/configs/kzm9g_defconfig @@ -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 From ff550a37cda1f8ef9f383b456a9403c9e636fc9e Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Thu, 4 Dec 2014 03:57:36 +0000 Subject: [PATCH 2/5] ARM: shmobile: defconfig: cleanup by savedefconfig Current shmobile_defconfig is not created from savedefconfig. Therefore, next defconfig patch will be unreadable. this patch tidyup this issue by below command > make shmobile_defconfig > make savedefconfig > cp defconfig ${LINUX}/arch/arm/config/shmobile_defconfig Signed-off-by: Kuninori Morimoto Acked-by: Geert Uytterhoeven [horms: Resolved conflicts; in particular leaving CONFIG_CPUFREQ_DT enabled] Signed-off-by: Simon Horman --- arch/arm/configs/shmobile_defconfig | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index 3df6ca0c1d1f..ad52868b4c2b 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -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 @@ -98,9 +104,10 @@ 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_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 +161,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 +172,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 From 1df3396bd09baf4093f82a49f8a1a523277fdf82 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Thu, 4 Dec 2014 03:57:50 +0000 Subject: [PATCH 3/5] ARM: shmobile: defconfig: add MTD_BLOCK MTD_BLOOK is needed for accessing to SPI-FLASH Signed-off-by: Kuninori Morimoto Reported-by: Cao Minh Hiep Reported-by: Bui Duc Phuc ( Fukuda ) Reported-by: Nguyen Xuan Nui Acked-by: Geert Uytterhoeven Signed-off-by: Simon Horman --- arch/arm/configs/shmobile_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index ad52868b4c2b..a936a2ea8621 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -56,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 From 174b7a54c925a068161222fadb45732453bd7efa Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Mon, 8 Dec 2014 12:35:24 +0100 Subject: [PATCH 4/5] ARM: shmobile: Enable MICREL_PHY in shmobile_defconfig commit 1c9106cb783cd227 ("ARM: shmobile: lager-reference: DTS-only board support"), dropped the MACH_LAGER Kconfig section, which did "select MICREL_PHY if SH_ETH". Hence we now have to enable MICREL_PHY explicitly in shmobile_defconfig. Signed-off-by: Geert Uytterhoeven Signed-off-by: Simon Horman --- arch/arm/configs/shmobile_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index a936a2ea8621..a9a1b0afc691 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -80,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 From db54d850b686c2ca81c10dd3582e98ee089a0e3a Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Tue, 9 Dec 2014 12:22:49 +0100 Subject: [PATCH 5/5] ARM: shmobile: Enable DA9063 watchdog in multiplatform defconfig This allows to restart koelsch on watchdog timeout or manual system restart request. Signed-off-by: Geert Uytterhoeven Signed-off-by: Simon Horman --- arch/arm/configs/shmobile_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index a9a1b0afc691..99e122694f5e 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -108,6 +108,9 @@ CONFIG_GPIO_RCAR=y 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_DA9210=y CONFIG_REGULATOR_GPIO=y