From 5ccc378fe4c5b7d12c59cb747a28a02e4512b0b0 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Thu, 3 Nov 2011 16:28:15 +0900 Subject: [PATCH] --- yaml --- r: 281700 b: refs/heads/master c: aaed44e1672c61b28dcae6e3d7bd5d15aef362f3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-s3c64xx/include/mach/crag6410.h | 3 ++- trunk/arch/arm/mach-s3c64xx/mach-crag6410.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b0bc6c607cc1..9f222633a3f3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4ff13995b512cfadef44e0bf5cb15298d6094519 +refs/heads/master: aaed44e1672c61b28dcae6e3d7bd5d15aef362f3 diff --git a/trunk/arch/arm/mach-s3c64xx/include/mach/crag6410.h b/trunk/arch/arm/mach-s3c64xx/include/mach/crag6410.h index be9074e17dfd..1cc1cc82e754 100644 --- a/trunk/arch/arm/mach-s3c64xx/include/mach/crag6410.h +++ b/trunk/arch/arm/mach-s3c64xx/include/mach/crag6410.h @@ -17,7 +17,8 @@ #define GLENFARCLAS_PMIC_IRQ_BASE (IRQ_BOARD_START + 64) #define PCA935X_GPIO_BASE GPIO_BOARD_START -#define CODEC_GPIO_BASE (GPIO_BOARD_START + 8) +#define CODEC_GPIO_BASE (GPIO_BOARD_START + 8) #define GLENFARCLAS_PMIC_GPIO_BASE (GPIO_BOARD_START + 16) +#define BANFF_PMIC_GPIO_BASE (GPIO_BOARD_START + 32) #endif diff --git a/trunk/arch/arm/mach-s3c64xx/mach-crag6410.c b/trunk/arch/arm/mach-s3c64xx/mach-crag6410.c index d04b65448510..8b04a46e9f6d 100644 --- a/trunk/arch/arm/mach-s3c64xx/mach-crag6410.c +++ b/trunk/arch/arm/mach-s3c64xx/mach-crag6410.c @@ -500,7 +500,7 @@ static struct wm831x_touch_pdata touch_pdata __initdata = { static struct wm831x_pdata crag_pmic_pdata __initdata = { .wm831x_num = 1, .irq_base = BANFF_PMIC_IRQ_BASE, - .gpio_base = GPIO_BOARD_START + 8, + .gpio_base = BANFF_PMIC_GPIO_BASE, .backup = &banff_backup_pdata,