From 5c0b03403ef01772a6d0831c956df93a6a4ee614 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E5=BC=A0=E6=99=B4?= Date: Fri, 10 Aug 2012 10:11:17 +0800 Subject: [PATCH] rk2928:support pmic tp65910 gpio function --- arch/arm/mach-rk2928/board-rk30-sdk-tps65910.c | 2 +- arch/arm/mach-rk2928/include/mach/gpio.h | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) mode change 100644 => 100755 arch/arm/mach-rk2928/include/mach/gpio.h diff --git a/arch/arm/mach-rk2928/board-rk30-sdk-tps65910.c b/arch/arm/mach-rk2928/board-rk30-sdk-tps65910.c index 7ec12c302a3a..51cf60dc2029 100755 --- a/arch/arm/mach-rk2928/board-rk30-sdk-tps65910.c +++ b/arch/arm/mach-rk2928/board-rk30-sdk-tps65910.c @@ -605,7 +605,7 @@ void __sramfunc board_pmu_tps65910_resume(void) static struct tps65910_board tps65910_data = { .irq = (unsigned)TPS65910_HOST_IRQ, .irq_base = NR_GIC_IRQS + NR_GPIO_IRQS, -// .gpio_base = TPS65910_GPIO_EXPANDER_BASE, + .gpio_base = TPS65910_GPIO_EXPANDER_BASE, .pre_init = tps65910_pre_init, .post_init = tps65910_post_init, diff --git a/arch/arm/mach-rk2928/include/mach/gpio.h b/arch/arm/mach-rk2928/include/mach/gpio.h old mode 100644 new mode 100755 index 0b0a76f31335..3a0c2631345a --- a/arch/arm/mach-rk2928/include/mach/gpio.h +++ b/arch/arm/mach-rk2928/include/mach/gpio.h @@ -55,8 +55,18 @@ #define WM8994_GPIO_EXPANDER_BASE (GPIO_EXPANDER_BASE+WM831X_TOTOL_GPIO_NUM) #else #define CONFIG_GPIO_WM8994_NUM 0 +#define WM8994_GPIO_EXPANDER_BASE (GPIO_EXPANDER_BASE+WM831X_TOTOL_GPIO_NUM) #endif +#if defined (CONFIG_GPIO_TPS65910) +#define CONFIG_GPIO_TPS65910_NUM 9 +#define TPS65910_GPIO_EXPANDER_BASE (WM8994_GPIO_EXPANDER_BASE+CONFIG_GPIO_WM8994_NUM) +#else +#define CONFIG_GPIO_TPS65910_NUM 0 +#define TPS65910_GPIO_EXPANDER_BASE (WM8994_GPIO_EXPANDER_BASE+CONFIG_GPIO_WM8994_NUM) +#endif + + //¶¨ÒåGPIOµÄPIN¿Ú×î´óÊýÄ¿¡£CONFIG_SPI_FPGA_GPIO_NUM±íʾFPGAµÄPIN½ÅÊý¡£ #define ARCH_NR_GPIOS (PIN_BASE + RK2928_TOTOL_GPIO_NUM + TCA6424_TOTOL_GPIO_NUM + WM831X_TOTOL_GPIO_NUM + CONFIG_SPI_FPGA_GPIO_NUM + CONFIG_GPIO_WM8994_NUM) -- 2.34.1