summaryrefslogtreecommitdiffstats
path: root/include/linux/mfd
diff options
context:
space:
mode:
authorPaul Parsons <lost.distance@yahoo.com>2012-05-02 16:49:29 +0100
committerHaojian Zhuang <haojian.zhuang@gmail.com>2012-05-03 09:55:30 +0800
commit1334d86b55d2ec1b50fdcb440c2642ae7a4620ba (patch)
treea7518d0ce00bd316aa4ecdac31ff76a316193cc3 /include/linux/mfd
parente949f93c591352f0376fdd192b4060a38c102ba5 (diff)
downloadop-kernel-dev-1334d86b55d2ec1b50fdcb440c2642ae7a4620ba.zip
op-kernel-dev-1334d86b55d2ec1b50fdcb440c2642ae7a4620ba.tar.gz
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 <lost.distance@yahoo.com> Cc: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Diffstat (limited to 'include/linux/mfd')
-rw-r--r--include/linux/mfd/asic3.h1
1 files changed, 1 insertions, 0 deletions
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)
OpenPOWER on IntegriCloud