From 4ed282d67df719b6c86ff8e5a180f826cbb7fff7 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Sun, 4 Apr 2010 20:49:19 +0200 Subject: [PATCH 19/69] s3c2440: gta02: Configure pcf50633 gpios. --- arch/arm/mach-s3c2440/Kconfig | 3 ++- arch/arm/mach-s3c2440/include/mach/gta02.h | 5 +++++ arch/arm/mach-s3c2440/mach-gta02.c | 1 + 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig index 50825a3..b6670ff 100644 --- a/arch/arm/mach-s3c2440/Kconfig +++ b/arch/arm/mach-s3c2440/Kconfig @@ -93,8 +93,9 @@ config MACH_ANUBIS config MACH_NEO1973_GTA02 bool "Openmoko GTA02 / Freerunner phone" select CPU_S3C2442 + select S3C24XX_GPIO_EXTRA64 select MFD_PCF50633 - select PCF50633_GPIO + select GPIO_PCF50633 select I2C select POWER_SUPPLY select MACH_NEO1973 diff --git a/arch/arm/mach-s3c2440/include/mach/gta02.h b/arch/arm/mach-s3c2440/include/mach/gta02.h index 3a56a22..2e84b5a 100644 --- a/arch/arm/mach-s3c2440/include/mach/gta02.h +++ b/arch/arm/mach-s3c2440/include/mach/gta02.h @@ -79,6 +79,11 @@ #define GTA02_PCB_ID2_0 S3C2410_GPD(3) #define GTA02_PCB_ID2_1 S3C2410_GPD(4) +#define GTA02_GPIO_GLAMO_BASE S3C_GPIO_END +#define GTA02_GPIO_GLAMO(x) (GTA02_GPIO_GLAMO_BASE + (x)) +#define GTA02_GPIO_PCF_BASE (GTA02_GPIO_GLAMO_BASE + 32) +#define GTA02_GPIO_PCF(x) (GTA02_GPIO_PCF_BASE + (x)) + int gta02_get_pcb_revision(void); #endif /* _GTA02_H */ diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c index a393cfc..85cc443 100644 --- a/arch/arm/mach-s3c2440/mach-gta02.c +++ b/arch/arm/mach-s3c2440/mach-gta02.c @@ -271,6 +271,7 @@ struct pcf50633_platform_data gta02_pcf_pdata = { .charger_reference_current_ma = 1000, .backlight_data = >a02_backlight_data, + .gpio_base = GTA02_GPIO_PCF_BASE, .reg_init_data = { [PCF50633_REGULATOR_AUTO] = { -- 1.7.2.5