From eed73702032e41c6219edffba0d7a0d54c28ddbc Mon Sep 17 00:00:00 2001 From: Paul Parsons Date: Wed, 2 May 2012 16:49:29 +0100 Subject: [PATCH] --- yaml --- r: 303426 b: refs/heads/master c: 1334d86b55d2ec1b50fdcb440c2642ae7a4620ba h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/hx4700.c | 2 +- trunk/include/linux/mfd/asic3.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 24711e41355f..abea2e873b89 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e949f93c591352f0376fdd192b4060a38c102ba5 +refs/heads/master: 1334d86b55d2ec1b50fdcb440c2642ae7a4620ba diff --git a/trunk/arch/arm/mach-pxa/hx4700.c b/trunk/arch/arm/mach-pxa/hx4700.c index 2fe0fa0cb383..cccddfe13fa4 100644 --- a/trunk/arch/arm/mach-pxa/hx4700.c +++ b/trunk/arch/arm/mach-pxa/hx4700.c @@ -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, diff --git a/trunk/include/linux/mfd/asic3.h b/trunk/include/linux/mfd/asic3.h index ed793b77a1c5..ef6faa5cee46 100644 --- a/trunk/include/linux/mfd/asic3.h +++ b/trunk/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)