From 53ed916db9b12de80c7163ee6d3491869219ee5e Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Wed, 23 Jan 2013 14:59:37 +0900 Subject: [PATCH 1/9] ARM: mach-shmobile: mackerel: enable MMCIF and SDHI in defconfig I'm unsure why this isn't already the case. Signed-off-by: Simon Horman --- arch/arm/configs/mackerel_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/configs/mackerel_defconfig b/arch/arm/configs/mackerel_defconfig index 7594b3aff259..ec8e605b408c 100644 --- a/arch/arm/configs/mackerel_defconfig +++ b/arch/arm/configs/mackerel_defconfig @@ -94,6 +94,9 @@ CONFIG_USB_RENESAS_USBHS=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_RENESAS_USBHS_UDC=y +CONFIG_MMC=y +CONFIG_MMC_SDHI=y +CONFIG_MMC_SH_MMCIF=y CONFIG_DMADEVICES=y CONFIG_SH_DMAE=y CONFIG_EXT2_FS=y From 2d81a59575813a1deb2405eb81e36131377619ee Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Wed, 23 Jan 2013 14:59:37 +0900 Subject: [PATCH 2/9] ARM: mach-shmobile: mackerel: enable REGULATOR in defconfig As well as being a generally sane thing to do this is required for MMCIF to function in conjunction with " ARM: shmobile: streamline mackerel SD and MMC devices". Cc: Guennadi Liakhovetski Signed-off-by: Simon Horman --- arch/arm/configs/mackerel_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/mackerel_defconfig b/arch/arm/configs/mackerel_defconfig index ec8e605b408c..9fb11895b2e2 100644 --- a/arch/arm/configs/mackerel_defconfig +++ b/arch/arm/configs/mackerel_defconfig @@ -75,6 +75,7 @@ CONFIG_I2C=y CONFIG_I2C_SH_MOBILE=y # CONFIG_HWMON is not set # CONFIG_MFD_SUPPORT is not set +CONFIG_REGULATOR=y CONFIG_FB=y CONFIG_FB_MODE_HELPERS=y CONFIG_FB_SH_MOBILE_LCDC=y From fcd05e15633ebfaaa2a3f26a031a00a6f34d7e2b Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Wed, 23 Jan 2013 14:59:37 +0900 Subject: [PATCH 3/9] ARM: mach-shmobile: armadillo800eva: enable REGULATOR in defconfig As well as being a generally sane thing to do this is required for MMCIF to function in conjunction with "ARM: shmobile: switch SDHI0 to GPIO regulator on armadillo800eva". Cc: Guennadi Liakhovetski Signed-off-by: Simon Horman --- arch/arm/configs/armadillo800eva_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig index 0b98100d2ae7..0cc80144c6d6 100644 --- a/arch/arm/configs/armadillo800eva_defconfig +++ b/arch/arm/configs/armadillo800eva_defconfig @@ -88,6 +88,7 @@ CONFIG_I2C=y CONFIG_I2C_GPIO=y CONFIG_I2C_SH_MOBILE=y # CONFIG_HWMON is not set +CONFIG_REGULATOR=y CONFIG_MEDIA_SUPPORT=y CONFIG_VIDEO_DEV=y CONFIG_MEDIA_CAMERA_SUPPORT=y From 358c14d235b04029a40e208e46a756f8b80996c0 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Tue, 19 Feb 2013 11:47:35 +0900 Subject: [PATCH 4/9] ARM: shmobile: kzm9g: defconfig: do not enable PREEMPT The motivation for this change is: * It is consistent with all other shmobile boards and; * Allows the kzm9g-reference code to work with CONFIG_SMP and thus the new defconfig Signed-off-by: Simon Horman --- arch/arm/configs/kzm9g_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/configs/kzm9g_defconfig b/arch/arm/configs/kzm9g_defconfig index 670c3b60f936..84ac68cdf476 100644 --- a/arch/arm/configs/kzm9g_defconfig +++ b/arch/arm/configs/kzm9g_defconfig @@ -33,7 +33,6 @@ CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_SMP=y CONFIG_SCHED_MC=y -CONFIG_PREEMPT=y CONFIG_AEABI=y # CONFIG_OABI_COMPAT is not set CONFIG_HIGHMEM=y From 59dd2a2a0a640818868c3855fb3e3090c445f315 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Thu, 21 Feb 2013 20:46:19 -0800 Subject: [PATCH 5/9] ARM: shmobile: armadillo800eva: enable branch prediction on defconfig Because defconfig disabled ARM branch prediction by CONFIG_CPU_BPREDICT_DISABLE, Armadillo800eva's Bogomips and Loop were not good performance. This patch enabled Arm branch prediction. Special thanks to Ishiyama-san Reported-by: Kiyoshi Ishiyama Signed-off-by: Kuninori Morimoto Acked-by: Kiyoshi Ishiyama Signed-off-by: Simon Horman --- arch/arm/configs/armadillo800eva_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig index 0cc80144c6d6..c40229442512 100644 --- a/arch/arm/configs/armadillo800eva_defconfig +++ b/arch/arm/configs/armadillo800eva_defconfig @@ -20,7 +20,6 @@ CONFIG_ARCH_R8A7740=y CONFIG_MACH_ARMADILLO800EVA=y # CONFIG_SH_TIMER_TMU is not set CONFIG_ARM_THUMB=y -CONFIG_CPU_BPREDICT_DISABLE=y CONFIG_CACHE_L2X0=y CONFIG_ARM_ERRATA_430973=y CONFIG_ARM_ERRATA_458693=y From 4861d68aa55cbbe736091bb6640aa85064557583 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Thu, 21 Feb 2013 20:46:40 -0800 Subject: [PATCH 6/9] ARM: shmobile: armadillo800eva: enable NEON on defconfig The application / library will be stopped by illegal instruction on current Armaddilo800eva board, since defconfig doesn't have CONFIG_NEON. This patch enabled it. Special thanks to Ishiyama-san Reported-by: Kiyoshi Ishiyama Signed-off-by: Kuninori Morimoto Acked-by: Kiyoshi Ishiyama Signed-off-by: Simon Horman --- arch/arm/configs/armadillo800eva_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig index c40229442512..468c616e49ec 100644 --- a/arch/arm/configs/armadillo800eva_defconfig +++ b/arch/arm/configs/armadillo800eva_defconfig @@ -36,6 +36,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ARM_APPENDED_DTB=y CONFIG_KEXEC=y CONFIG_VFP=y +CONFIG_NEON=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_PM_RUNTIME=y CONFIG_NET=y From 54725e02039f8c419723e785cf595bbb07f3dcc7 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Fri, 15 Feb 2013 22:48:37 +0900 Subject: [PATCH 7/9] ARM: mach-shmobile: kzm9g: do not enable REGULATOR_DUMMY in defconfig Don't enable REGULATOR_DUMMY, it is only intended for development / testing. There doesn't seem to be any value in setting it here and doing so was an error on my part. Cc: Guennadi Liakhovetski Signed-off-by: Simon Horman --- arch/arm/configs/kzm9g_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/configs/kzm9g_defconfig b/arch/arm/configs/kzm9g_defconfig index 84ac68cdf476..f6e585b353a4 100644 --- a/arch/arm/configs/kzm9g_defconfig +++ b/arch/arm/configs/kzm9g_defconfig @@ -85,7 +85,6 @@ CONFIG_I2C_SH_MOBILE=y CONFIG_GPIO_PCF857X=y # CONFIG_HWMON is not set CONFIG_REGULATOR=y -CONFIG_REGULATOR_DUMMY=y CONFIG_FB=y CONFIG_FB_SH_MOBILE_LCDC=y CONFIG_FRAMEBUFFER_CONSOLE=y From e0ef0984ae346c545f5d76ecbe929c3d4adda157 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Thu, 21 Feb 2013 20:45:57 -0800 Subject: [PATCH 8/9] ARM: shmobile: armadillo800eva: enable all errata for cache on defconfig Some errata for cache had not enabled on current Armadillo800eva defconfig. This patch enables these. Special thanks to Ishiyama-san Reported-by: Kiyoshi Ishiyama Signed-off-by: Kuninori Morimoto Signed-off-by: Simon Horman --- arch/arm/configs/armadillo800eva_defconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig index 468c616e49ec..0f2d80da7378 100644 --- a/arch/arm/configs/armadillo800eva_defconfig +++ b/arch/arm/configs/armadillo800eva_defconfig @@ -24,10 +24,15 @@ CONFIG_CACHE_L2X0=y CONFIG_ARM_ERRATA_430973=y CONFIG_ARM_ERRATA_458693=y CONFIG_ARM_ERRATA_460075=y +CONFIG_PL310_ERRATA_588369=y CONFIG_ARM_ERRATA_720789=y +CONFIG_PL310_ERRATA_727915=y CONFIG_ARM_ERRATA_743622=y CONFIG_ARM_ERRATA_751472=y +CONFIG_PL310_ERRATA_753970=y CONFIG_ARM_ERRATA_754322=y +CONFIG_PL310_ERRATA_769419=y +CONFIG_ARM_ERRATA_775420=y CONFIG_AEABI=y # CONFIG_OABI_COMPAT is not set CONFIG_FORCE_MAX_ZONEORDER=13 From db30abdf3c07c564d4af0f991bb7f38b728f9035 Mon Sep 17 00:00:00 2001 From: Vladimir Barinov Date: Wed, 27 Feb 2013 23:40:34 +0300 Subject: [PATCH 9/9] ARM: mach-shmobile: marzen: add SATA support Add SATA support to marzen_defconfig. Signed-off-by: Vladimir Barinov Signed-off-by: Sergei Shtylyov Signed-off-by: Simon Horman --- arch/arm/configs/marzen_defconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig index afb17d630d44..8e7329b3ebaf 100644 --- a/arch/arm/configs/marzen_defconfig +++ b/arch/arm/configs/marzen_defconfig @@ -49,6 +49,10 @@ CONFIG_DEVTMPFS_MOUNT=y # CONFIG_FW_LOADER is not set CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y +CONFIG_ATA=y +CONFIG_ATA_SFF=y +CONFIG_ATA_BMDMA=y +CONFIG_SATA_RCAR=y CONFIG_NETDEVICES=y # CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_FARADAY is not set