Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1334d86b authored by Paul Parsons's avatar Paul Parsons Committed by Haojian Zhuang
Browse files

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: default avatarPaul Parsons <lost.distance@yahoo.com>
Cc: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@gmail.com>
parent e949f93c

arch/arm/mach-pxa/hx4700.c

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,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,
@@ -241,6 +240,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
Original line number Diff line number Diff line
@@ -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)