[PATCH 2/3 v6] ARM: pxa: hx4700: Add PCMCIA/CF support

[PATCH 2/3 v6] ARM: pxa: hx4700: Add PCMCIA/CF support

[Paul Parsons]

This patch is part of a set which adds PCMCIA/CF support for the hx4700.
This patch modifies asic3_gpio_config[] as follows:
1. Remove ASIC3_GPIOC4_CF_nCD, whose purpose is unknown.
2. Add ASIC3_GPIOD4_CF_nCD, the actual CF card detect GPIO.

Signed-off-by: Paul Parsons <lost.distance@yahoo.com>
Cc: Philipp Zabel <philipp.zabel@gmail.com>
---

V6:
Rebased from linux-3.3-rc6 to linux-3.4-rc1.

 arch/arm/mach-pxa/hx4700.c |    2 +-
 include/linux/mfd/asic3.h  |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c
index 75ce812..de01277 100644
--- a/arch/arm/mach-pxa/hx4700.c
+++ b/arch/arm/mach-pxa/hx4700.c
@@ -231,7 +231,6 @@ static u16 asic3_gpio_config[] = {
 	ASIC3_GPIOC0_LED0,		/* red */
 	ASIC3_GPIOC1_LED1,		/* green */
 	ASIC3_GPIOC2_LED2,		/* blue */
-	ASIC3_GPIOC4_CF_nCD,
 	ASIC3_GPIOC5_nCIOW,
 	ASIC3_GPIOC6_nCIOR,
 	ASIC3_GPIOC7_nPCE_1,
@@ -245,6 +244,7 @@ static u16 asic3_gpio_config[] = {
 	ASIC3_GPIOC15_nPIOR,
 
 	/* GPIOD: input GPIOs, CF */
+	ASIC3_GPIOD4_CF_nCD,
 	ASIC3_GPIOD11_nCIOIS16,
 	ASIC3_GPIOD12_nCWAIT,
 	ASIC3_GPIOD15_nPIOW,
diff --git a/include/linux/mfd/asic3.h b/include/linux/mfd/asic3.h
index ed793b7..ef6faa5 100644
--- a/include/linux/mfd/asic3.h
+++ b/include/linux/mfd/asic3.h
@@ -138,6 +138,7 @@ struct asic3_platform_data {
 #define ASIC3_GPIOC13_nPWAIT		ASIC3_CONFIG_GPIO(45, 1, 1, 0)
 #define ASIC3_GPIOC14_nPIOIS16		ASIC3_CONFIG_GPIO(46, 1, 1, 0)
 #define ASIC3_GPIOC15_nPIOR		ASIC3_CONFIG_GPIO(47, 1, 0, 0)
+#define ASIC3_GPIOD4_CF_nCD		ASIC3_CONFIG_GPIO(52, 1, 0, 0)
 #define ASIC3_GPIOD11_nCIOIS16		ASIC3_CONFIG_GPIO(59, 1, 0, 0)
 #define ASIC3_GPIOD12_nCWAIT		ASIC3_CONFIG_GPIO(60, 1, 0, 0)
 #define ASIC3_GPIOD15_nPIOW		ASIC3_CONFIG_GPIO(63, 1, 0, 0)
-- 
1.7.3.4

[PATCH 2/3 v6] ARM: pxa: hx4700: Add PCMCIA/CF support

[Philipp Zabel]

Am Donnerstag, den 05.04.2012, 17:44 +0100 schrieb Paul Parsons:
> This patch is part of a set which adds PCMCIA/CF support for the hx4700.
> This patch modifies asic3_gpio_config[] as follows:
> 1. Remove ASIC3_GPIOC4_CF_nCD, whose purpose is unknown.
> 2. Add ASIC3_GPIOD4_CF_nCD, the actual CF card detect GPIO.
> 
> Signed-off-by: Paul Parsons <lost.distance@yahoo.com>
> Cc: Philipp Zabel <philipp.zabel@gmail.com>

Acked-by: Philipp Zabel <philipp.zabel@gmail.com>

regards
Philipp

[PATCH 2/3 v6] ARM: pxa: hx4700: Add PCMCIA/CF support

[Haojian Zhuang]

On Wed, Apr 11, 2012 at 3:21 AM, Philipp Zabel <philipp.zabel@gmail.com> wrote:
> Am Donnerstag, den 05.04.2012, 17:44 +0100 schrieb Paul Parsons:
>> This patch is part of a set which adds PCMCIA/CF support for the hx4700.
>> This patch modifies asic3_gpio_config[] as follows:
>> 1. Remove ASIC3_GPIOC4_CF_nCD, whose purpose is unknown.
>> 2. Add ASIC3_GPIOD4_CF_nCD, the actual CF card detect GPIO.
>>
>> Signed-off-by: Paul Parsons <lost.distance@yahoo.com>
>> Cc: Philipp Zabel <philipp.zabel@gmail.com>
>
> Acked-by: Philipp Zabel <philipp.zabel@gmail.com>
>
> regards
> Philipp
>

Please re-send patch. I failed to apply it.

Thanks
Haojian