[PATCH 0/3] ARM: ux500: Update defconfigs for MMC

[PATCH 0/3] ARM: ux500: Update defconfigs for MMC

[Ulf Hansson]

This patchset updates the MMC defconfigs in the u8500|u300_defconfig.

Ulf Hansson (3):
  ARM: ux500: Enable MMC_UNSAFE_RESUME
  ARM: ux500: Don't use MMC_CLKGATE
  ARM: ux500: Disable MMC_BLOCK_BOUNCE

 arch/arm/configs/u300_defconfig  |    3 ++-
 arch/arm/configs/u8500_defconfig |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

-- 
1.7.10

[PATCH 1/3] ARM: ux500: Enable MMC_UNSAFE_RESUME

[Ulf Hansson]

Enable CONFIG_MMC_UNSAFE_RESUME to be accomplish a proper
suspend/resume cycle for SD/SDIO/(e)MMC.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---
 arch/arm/configs/u300_defconfig  |    1 +
 arch/arm/configs/u8500_defconfig |    1 +
 2 files changed, 2 insertions(+)

diff --git a/arch/arm/configs/u300_defconfig b/arch/arm/configs/u300_defconfig
index 374000e..c839375 100644
--- a/arch/arm/configs/u300_defconfig
+++ b/arch/arm/configs/u300_defconfig
@@ -51,6 +51,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_HID_SUPPORT is not set
 # CONFIG_USB_SUPPORT is not set
 CONFIG_MMC=y
+CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_CLKGATE=y
 CONFIG_MMC_ARMMMCI=y
 CONFIG_RTC_CLASS=y
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index c037aa1..f9e3f38 100644
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -82,6 +82,7 @@ CONFIG_REGULATOR_GPIO=y
 CONFIG_USB_GADGET=y
 CONFIG_AB8500_USB=y
 CONFIG_MMC=y
+CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC_CLKGATE=y
 CONFIG_MMC_ARMMMCI=y
 CONFIG_NEW_LEDS=y
-- 
1.7.10

[PATCH 2/3] ARM: ux500: Don't use MMC_CLKGATE

[Ulf Hansson]

Since ARMMMCI host driver now supports clock gating through runtime PM
CONFIG_MMC_CLKGATE is not needed anymore.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---
 arch/arm/configs/u300_defconfig  |    1 -
 arch/arm/configs/u8500_defconfig |    1 -
 2 files changed, 2 deletions(-)

diff --git a/arch/arm/configs/u300_defconfig b/arch/arm/configs/u300_defconfig
index c839375..ffe2db8 100644
--- a/arch/arm/configs/u300_defconfig
+++ b/arch/arm/configs/u300_defconfig
@@ -52,7 +52,6 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_USB_SUPPORT is not set
 CONFIG_MMC=y
 CONFIG_MMC_UNSAFE_RESUME=y
-CONFIG_MMC_CLKGATE=y
 CONFIG_MMC_ARMMMCI=y
 CONFIG_RTC_CLASS=y
 # CONFIG_RTC_HCTOSYS is not set
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index f9e3f38..45d9087 100644
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -83,7 +83,6 @@ CONFIG_USB_GADGET=y
 CONFIG_AB8500_USB=y
 CONFIG_MMC=y
 CONFIG_MMC_UNSAFE_RESUME=y
-CONFIG_MMC_CLKGATE=y
 CONFIG_MMC_ARMMMCI=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
-- 
1.7.10

[PATCH 3/3] ARM: ux500: Disable MMC_BLOCK_BOUNCE

[Ulf Hansson]

Since ARMMMCI can do scatter-gather we don't need CONFIG_MMC_BLOCK_BOUNCE.
Explicity disable it since it's default enabled, to skip unnecessarry
bounce buffer copying.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---
 arch/arm/configs/u300_defconfig  |    1 +
 arch/arm/configs/u8500_defconfig |    1 +
 2 files changed, 2 insertions(+)

diff --git a/arch/arm/configs/u300_defconfig b/arch/arm/configs/u300_defconfig
index ffe2db8..9c7941d 100644
--- a/arch/arm/configs/u300_defconfig
+++ b/arch/arm/configs/u300_defconfig
@@ -52,6 +52,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_USB_SUPPORT is not set
 CONFIG_MMC=y
 CONFIG_MMC_UNSAFE_RESUME=y
+# CONFIG_MMC_BLOCK_BOUNCE is not set
 CONFIG_MMC_ARMMMCI=y
 CONFIG_RTC_CLASS=y
 # CONFIG_RTC_HCTOSYS is not set
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index 45d9087..8fe6293 100644
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -83,6 +83,7 @@ CONFIG_USB_GADGET=y
 CONFIG_AB8500_USB=y
 CONFIG_MMC=y
 CONFIG_MMC_UNSAFE_RESUME=y
+# CONFIG_MMC_BLOCK_BOUNCE is not set
 CONFIG_MMC_ARMMMCI=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
-- 
1.7.10

[PATCH 0/3] ARM: ux500: Update defconfigs for MMC

[Linus Walleij]

On Tue, May 21, 2013 at 11:46 AM, Ulf Hansson <ulf.hansson@linaro.org> wrote:

> This patchset updates the MMC defconfigs in the u8500|u300_defconfig.
>
> Ulf Hansson (3):
>   ARM: ux500: Enable MMC_UNSAFE_RESUME
>   ARM: ux500: Don't use MMC_CLKGATE
>   ARM: ux500: Disable MMC_BLOCK_BOUNCE

Could you please:
- Squash all three into one patch doing all three changes
- Make one patch for ux500 and one for u300

This is because I have different branches for ux500 and u300
so I don't want them to conflict... Doing 6 patches for this seems
a bit too much so 2 should do.

Yours,
Linus Walleij