ARM: pxa: hx4700: Add PCMCIA/CF support

PATCH Superseded Paul Parsons 3 participants 3 messages Apr 5, 2012 – Apr 27, 2012

Subsystems (4)

Arm (32-bit) Arm sub-architectures Multifunction devices (MFD) PXA2xx/PXA3xx support

lore

Share & tools

lore

Paul Parsons

author

2012-04-05 16:44 UTC #0 lore raw

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

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 <[email protected]>

Cc Philipp Zabel <[email protected]>

---

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(-)

arch/arm/mach-pxa/hx4700.c +1 -1

index 75ce812..de01277 100644
@@ -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,

include/linux/mfd/asic3.h +1 -0

index ed793b7..ef6faa5 100644
@@ -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)

Signature · 1 line

1.7.3.4

Philipp Zabel

2012-04-10 19:21 UTC #1 lore raw

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

Am Donnerstag, den 05.04.2012, 17:44 +0100 schrieb Paul Parsons:

Quoted 7 lines

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 <[email protected]>
Cc Philipp Zabel <[email protected]>

Acked-by Philipp Zabel <[email protected]>

regards
Philipp

Haojian Zhuang

maintainer

2012-04-27 05:33 UTC #2 lore raw

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

Quoted 6 lines · Philipp Zabel

Am Donnerstag, den 05.04.2012, 17:44 +0100 schrieb Paul Parsons:
Quoted 5 lines
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.

Quoted 8 lines

Quoted 2 lines
Signed-off-by Paul Parsons <[email protected]>
Cc Philipp Zabel <[email protected]>
Acked-by Philipp Zabel <[email protected]>
regards
Philipp

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

Thanks
Haojian