From: 张晴 Date: Wed, 17 Oct 2012 07:18:35 +0000 (+0800) Subject: rk:move pmic_type to board.h X-Git-Tag: firefly_0821_release~8392^2~3 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8607ccb9f16aa1487ff2a6e020ec767a358b3f88;p=firefly-linux-kernel-4.4.55.git rk:move pmic_type to board.h --- diff --git a/arch/arm/mach-rk2928/board-rk2926-sdk.c b/arch/arm/mach-rk2928/board-rk2926-sdk.c index 9f9a0a21fc3d..64c1ef9f9cc4 100755 --- a/arch/arm/mach-rk2928/board-rk2926-sdk.c +++ b/arch/arm/mach-rk2928/board-rk2926-sdk.c @@ -125,16 +125,12 @@ static int rk29_backlight_pwm_suspend(void) return -1; } #if defined(CONFIG_MFD_TPS65910) - if(g_pmic_type == PMIC_TYPE_TPS65910) - { - gpio_direction_output(PWM_GPIO, GPIO_LOW); - } + if (pmic_is_tps65910() ) + gpio_direction_output(PWM_GPIO, GPIO_LOW); #endif #if defined(CONFIG_REGULATOR_ACT8931) - if(g_pmic_type == PMIC_TYPE_ACT8931) - { - gpio_direction_output(PWM_GPIO, GPIO_HIGH); - } + if (pmic_is_act8931() ) + gpio_direction_output(PWM_GPIO, GPIO_HIGH); #endif #ifdef LCD_DISP_ON_PIN gpio_direction_output(BL_EN_PIN, 0); @@ -207,8 +203,7 @@ static int rk_fb_io_disable(void) { #if 0//defined(CONFIG_REGULATOR_ACT8931) - if(g_pmic_type == PMIC_TYPE_ACT8931) - { + if (pmic_is_act8931() ){ struct regulator *ldo; ldo = regulator_get(NULL, "act_ldo4"); //vcc_lcd regulator_disable(ldo); @@ -222,8 +217,7 @@ static int rk_fb_io_disable(void) static int rk_fb_io_enable(void) { #if 0//defined(CONFIG_REGULATOR_ACT8931) - if(g_pmic_type == PMIC_TYPE_ACT8931) - { + if (pmic_is_act8931() ){ struct regulator *ldo; ldo = regulator_get(NULL, "act_ldo4"); //vcc_lcd regulator_enable(ldo); @@ -449,14 +443,12 @@ static void rkusb_wifi_power(int on) { struct regulator *ldo = NULL; #if defined(CONFIG_MFD_TPS65910) - if(g_pmic_type == PMIC_TYPE_TPS65910) { + if (pmic_is_tps65910() ) ldo = regulator_get(NULL, "vmmc"); //vccio_wl - } #endif #if defined(CONFIG_REGULATOR_ACT8931) - if(g_pmic_type == PMIC_TYPE_ACT8931) { + if(pmic_is_act8931() ) ldo = regulator_get(NULL, "act_ldo4"); //vccio_wl - } #endif if(on) { @@ -702,15 +694,15 @@ void rk30_pwm_resume_voltage_set(void) void __sramfunc board_pmu_suspend(void) { #if defined (CONFIG_MFD_TPS65910) - if(g_pmic_type == PMIC_TYPE_TPS65910) - board_pmu_tps65910_suspend(); + if(pmic_is_tps65910() ) + board_pmu_tps65910_suspend(); #endif } void __sramfunc board_pmu_resume(void) { #if defined (CONFIG_MFD_TPS65910) - if(g_pmic_type == PMIC_TYPE_TPS65910) - board_pmu_tps65910_resume(); + if(pmic_is_tps65910() ) + board_pmu_tps65910_resume(); #endif } @@ -794,18 +786,15 @@ static void rk2928_pm_power_off(void) printk(KERN_ERR "rk2928_pm_power_off start...\n"); #if defined(CONFIG_REGULATOR_ACT8931) - if(g_pmic_type == PMIC_TYPE_ACT8931) - { + if (pmic_is_act8931() ){ if(act8931_charge_det) arm_pm_restart(0, NULL); - } + } #endif #if defined(CONFIG_MFD_TPS65910) - if(g_pmic_type == PMIC_TYPE_TPS65910) - { + if(pmic_is_tps65910() ) tps65910_device_shutdown();//tps65910 shutdown - } #endif gpio_direction_output(POWER_ON_PIN, GPIO_LOW); diff --git a/arch/arm/mach-rk2928/board-rk2928-a720.c b/arch/arm/mach-rk2928/board-rk2928-a720.c index 3ed19d531741..41803c13fdab 100755 --- a/arch/arm/mach-rk2928/board-rk2928-a720.c +++ b/arch/arm/mach-rk2928/board-rk2928-a720.c @@ -129,13 +129,13 @@ static int rk29_backlight_pwm_suspend(void) return -1; } #if defined(CONFIG_MFD_TPS65910) - if(g_pmic_type == PMIC_TYPE_TPS65910) + if(pmic_is_tps65910()) { gpio_direction_output(PWM_GPIO, GPIO_LOW); } #endif #if defined(CONFIG_REGULATOR_ACT8931) - if(g_pmic_type == PMIC_TYPE_ACT8931) + if(pmic_is_act8931()) { gpio_direction_output(PWM_GPIO, GPIO_HIGH); } @@ -215,7 +215,7 @@ static int rk_fb_io_disable(void) { #if 0//defined(CONFIG_REGULATOR_ACT8931) - if(g_pmic_type == PMIC_TYPE_ACT8931) + if(pmic_is_act8931()) { struct regulator *ldo; ldo = regulator_get(NULL, "act_ldo4"); //vcc_lcd @@ -230,7 +230,7 @@ static int rk_fb_io_disable(void) static int rk_fb_io_enable(void) { #if 0//defined(CONFIG_REGULATOR_ACT8931) - if(g_pmic_type == PMIC_TYPE_ACT8931) + if(pmic_is_act8931()) { struct regulator *ldo; ldo = regulator_get(NULL, "act_ldo4"); //vcc_lcd @@ -478,12 +478,12 @@ static void rkusb_wifi_power(int on) { struct regulator *ldo = NULL; #if defined(CONFIG_MFD_TPS65910) - if(g_pmic_type == PMIC_TYPE_TPS65910) { + if(pmic_is_tps65910()) { ldo = regulator_get(NULL, "vmmc"); //vccio_wl } #endif #if defined(CONFIG_REGULATOR_ACT8931) - if(g_pmic_type == PMIC_TYPE_ACT8931) { + if(pmic_is_act8931()) { ldo = regulator_get(NULL, "act_ldo4"); //vccio_wl } #endif @@ -761,14 +761,14 @@ void rk30_pwm_resume_voltage_set(void) void __sramfunc board_pmu_suspend(void) { #if defined (CONFIG_MFD_TPS65910) - if(g_pmic_type == PMIC_TYPE_TPS65910) + if(pmic_is_tps65910()) board_pmu_tps65910_suspend(); #endif } void __sramfunc board_pmu_resume(void) { #if defined (CONFIG_MFD_TPS65910) - if(g_pmic_type == PMIC_TYPE_TPS65910) + if(pmic_is_tps65910()) board_pmu_tps65910_resume(); #endif } @@ -857,7 +857,7 @@ static void rk2928_pm_power_off(void) printk(KERN_ERR "rk2928_pm_power_off start...\n"); #if defined(CONFIG_REGULATOR_ACT8931) - if(g_pmic_type == PMIC_TYPE_ACT8931) + if(pmic_is_act8931()) { if(act8931_charge_det) arm_pm_restart(0, NULL); @@ -865,7 +865,7 @@ static void rk2928_pm_power_off(void) #endif #if defined(CONFIG_MFD_TPS65910) - if(g_pmic_type == PMIC_TYPE_TPS65910) + if(pmic_is_tps65910()) { tps65910_device_shutdown();//tps65910 shutdown } diff --git a/arch/arm/mach-rk2928/board-rk2928-sdk.c b/arch/arm/mach-rk2928/board-rk2928-sdk.c index 4e2a00f5faad..84e6768715bd 100755 --- a/arch/arm/mach-rk2928/board-rk2928-sdk.c +++ b/arch/arm/mach-rk2928/board-rk2928-sdk.c @@ -59,8 +59,6 @@ #include "board-rk2928-sdk-key.c" int __sramdata g_pmic_type = 0; -#define PMIC_TYPE_TPS65910 2 -#define PMIC_TYPE_ACT8931 3 #ifdef CONFIG_THREE_FB_BUFFER #define RK30_FB0_MEM_SIZE 12*SZ_1M @@ -127,13 +125,13 @@ static int rk29_backlight_pwm_suspend(void) return -1; } #if defined(CONFIG_MFD_TPS65910) - if(g_pmic_type == PMIC_TYPE_TPS65910) + if(pmic_is_tps65910()) { gpio_direction_output(PWM_GPIO, GPIO_LOW); } #endif #if defined(CONFIG_REGULATOR_ACT8931) - if(g_pmic_type == PMIC_TYPE_ACT8931) + if(pmic_is_act8931()) { gpio_direction_output(PWM_GPIO, GPIO_HIGH); } @@ -209,7 +207,7 @@ static int rk_fb_io_disable(void) { #if 0//defined(CONFIG_REGULATOR_ACT8931) - if(g_pmic_type == PMIC_TYPE_ACT8931) + if(pmic_is_act8931()) { struct regulator *ldo; ldo = regulator_get(NULL, "act_ldo4"); //vcc_lcd @@ -224,7 +222,7 @@ static int rk_fb_io_disable(void) static int rk_fb_io_enable(void) { #if 0//defined(CONFIG_REGULATOR_ACT8931) - if(g_pmic_type == PMIC_TYPE_ACT8931) + if(pmic_is_act8931()) { struct regulator *ldo; ldo = regulator_get(NULL, "act_ldo4"); //vcc_lcd @@ -486,12 +484,12 @@ static void rkusb_wifi_power(int on) { struct regulator *ldo = NULL; #if defined(CONFIG_MFD_TPS65910) - if(g_pmic_type == PMIC_TYPE_TPS65910) { + if(pmic_is_tps65910()) { ldo = regulator_get(NULL, "vmmc"); //vccio_wl } #endif #if defined(CONFIG_REGULATOR_ACT8931) - if(g_pmic_type == PMIC_TYPE_ACT8931) { + if(pmic_is_act8931()) { ldo = regulator_get(NULL, "act_ldo4"); //vccio_wl } #endif @@ -745,14 +743,14 @@ void rk30_pwm_resume_voltage_set(void) void __sramfunc board_pmu_suspend(void) { #if defined (CONFIG_MFD_TPS65910) - if(g_pmic_type == PMIC_TYPE_TPS65910) + if(pmic_is_tps65910()) board_pmu_tps65910_suspend(); #endif } void __sramfunc board_pmu_resume(void) { #if defined (CONFIG_MFD_TPS65910) - if(g_pmic_type == PMIC_TYPE_TPS65910) + if(pmic_is_tps65910()) board_pmu_tps65910_resume(); #endif } @@ -848,7 +846,7 @@ static void rk2928_pm_power_off(void) printk(KERN_ERR "rk2928_pm_power_off start...\n"); #if defined(CONFIG_REGULATOR_ACT8931) - if(g_pmic_type == PMIC_TYPE_ACT8931) + if(pmic_is_act8931()) { #ifdef CONFIG_BATTERY_RK30_ADC_FAC if (gpio_get_value (rk30_adc_battery_platdata.dc_det_pin) == rk30_adc_battery_platdata.dc_det_level)//if(act8931_charge_det) @@ -858,7 +856,7 @@ static void rk2928_pm_power_off(void) #endif #if defined(CONFIG_MFD_TPS65910) - if(g_pmic_type == PMIC_TYPE_TPS65910) + if(pmic_is_tps65910()) { tps65910_device_shutdown();//tps65910 shutdown } diff --git a/arch/arm/mach-rk2928/board-rk2928.c b/arch/arm/mach-rk2928/board-rk2928.c index a2ecdbc721ae..eb919103866f 100755 --- a/arch/arm/mach-rk2928/board-rk2928.c +++ b/arch/arm/mach-rk2928/board-rk2928.c @@ -60,8 +60,6 @@ #include "board-rk2928-a720-key.c" int __sramdata g_pmic_type = 0; -#define PMIC_TYPE_TPS65910 2 -#define PMIC_TYPE_ACT8931 3 #ifdef CONFIG_THREE_FB_BUFFER #define RK30_FB0_MEM_SIZE 12*SZ_1M @@ -128,13 +126,13 @@ static int rk29_backlight_pwm_suspend(void) return -1; } #if defined(CONFIG_MFD_TPS65910) - if(g_pmic_type == PMIC_TYPE_TPS65910) + if(pmic_is_tps65910()) { gpio_direction_output(PWM_GPIO, GPIO_LOW); } #endif #if defined(CONFIG_REGULATOR_ACT8931) - if(g_pmic_type == PMIC_TYPE_ACT8931) + if(pmic_is_act8931()) { gpio_direction_output(PWM_GPIO, GPIO_HIGH); } @@ -210,7 +208,7 @@ static int rk_fb_io_disable(void) { #if 0//defined(CONFIG_REGULATOR_ACT8931) - if(g_pmic_type == PMIC_TYPE_ACT8931) + if(pmic_is_act8931()) { struct regulator *ldo; ldo = regulator_get(NULL, "act_ldo4"); //vcc_lcd @@ -225,7 +223,7 @@ static int rk_fb_io_disable(void) static int rk_fb_io_enable(void) { #if 0//defined(CONFIG_REGULATOR_ACT8931) - if(g_pmic_type == PMIC_TYPE_ACT8931) + if(pmic_is_act8931()) { struct regulator *ldo; ldo = regulator_get(NULL, "act_ldo4"); //vcc_lcd @@ -453,12 +451,12 @@ static void rkusb_wifi_power(int on) { struct regulator *ldo = NULL; #if defined(CONFIG_MFD_TPS65910) - if(g_pmic_type == PMIC_TYPE_TPS65910) { + if(pmic_is_tps65910()) { ldo = regulator_get(NULL, "vmmc"); //vccio_wl } #endif #if defined(CONFIG_REGULATOR_ACT8931) - if(g_pmic_type == PMIC_TYPE_ACT8931) { + if(pmic_is_act8931()) { ldo = regulator_get(NULL, "act_ldo4"); //vccio_wl } #endif @@ -738,7 +736,7 @@ static void rk2928_pm_power_off(void) printk(KERN_ERR "rk2928_pm_power_off start...\n"); #if defined(CONFIG_MFD_TPS65910) - if(g_pmic_type == PMIC_TYPE_TPS65910) + if(pmic_is_tps65910()) { tps65910_device_shutdown();//tps65910 shutdown } diff --git a/arch/arm/mach-rk2928/i2c_sram.c b/arch/arm/mach-rk2928/i2c_sram.c index 853105454c90..21bf05905ff9 100755 --- a/arch/arm/mach-rk2928/i2c_sram.c +++ b/arch/arm/mach-rk2928/i2c_sram.c @@ -308,7 +308,7 @@ uint8 __sramfunc sram_i2c_read(uint8 I2CSlaveAddr, uint8 regAddr) sram_i2c_disenable(); return data; } -extern int __sramdata g_pmic_type ; + void __sramfunc rk30_suspend_voltage_set(unsigned int vol) { uint8 slaveaddr; @@ -317,7 +317,7 @@ void __sramfunc rk30_suspend_voltage_set(unsigned int vol) uint8 rtc_status_reg = 0x11; sram_i2c_init(); //init i2c device #if defined(CONFIG_MFD_TPS65910) - if(g_pmic_type == PMIC_TYPE_TPS65910) + if(pmic_is_tps65910()) { slaveaddr = 0x2d; //slave device addr slavereg = 0x22; // reg addr @@ -332,7 +332,7 @@ void __sramfunc rk30_suspend_voltage_set(unsigned int vol) #endif #if defined(CONFIG_REGULATOR_ACT8931) - if(g_pmic_type == PMIC_TYPE_ACT8931) + if(pmic_is_act8931()) { slaveaddr = 0x5b; //slave device addr slavereg = 0x40; // reg addr @@ -357,7 +357,7 @@ void __sramfunc rk30_suspend_voltage_resume(unsigned int vol) data = arm_voltage; sram_i2c_init(); //init i2c device #if defined(CONFIG_MFD_TPS65910) - if(g_pmic_type == PMIC_TYPE_TPS65910) + if(pmic_is_tps65910()) { slaveaddr = 0x2d; //slave device addr slavereg = 0x22; // reg add @@ -366,7 +366,7 @@ void __sramfunc rk30_suspend_voltage_resume(unsigned int vol) } #endif #if defined(CONFIG_REGULATOR_ACT8931) - if(g_pmic_type == PMIC_TYPE_ACT8931) + if(pmic_is_act8931()) { slaveaddr = 0x5b; //slave device addr slavereg = 0x40; // reg addr diff --git a/arch/arm/mach-rk2928/include/mach/board.h b/arch/arm/mach-rk2928/include/mach/board.h index 1e368114e206..840b598dee4e 100755 --- a/arch/arm/mach-rk2928/include/mach/board.h +++ b/arch/arm/mach-rk2928/include/mach/board.h @@ -15,9 +15,6 @@ #define GPIO_SWPORTA_DR 0x0000 #define GPIO_SWPORTA_DDR 0x0004 -#define PMIC_TYPE_TPS65910 2 -#define PMIC_TYPE_ACT8931 3 - extern struct rk29_sdmmc_platform_data default_sdmmc0_data; extern struct rk29_sdmmc_platform_data default_sdmmc1_data; diff --git a/arch/arm/mach-rk30/board-rk30-phonepad.c b/arch/arm/mach-rk30/board-rk30-phonepad.c index 04bba1910374..a50e94120ed1 100755 --- a/arch/arm/mach-rk30/board-rk30-phonepad.c +++ b/arch/arm/mach-rk30/board-rk30-phonepad.c @@ -2528,8 +2528,6 @@ static struct i2c_board_info __initdata i2c0_info[] = { }; #endif -#define PMIC_TYPE_WM8326 1 -#define PMIC_TYPE_TPS65910 2 int __sramdata g_pmic_type = 0; #ifdef CONFIG_I2C1_RK30 #ifdef CONFIG_MFD_WM831X_I2C @@ -2566,11 +2564,11 @@ static struct i2c_board_info __initdata i2c1_info[] = { void __sramfunc board_pmu_suspend(void) { #if defined (CONFIG_MFD_WM831X_I2C) - if(g_pmic_type == PMIC_TYPE_WM8326) + if(pmic_is_wm8326()) board_pmu_wm8326_suspend(); #endif #if defined (CONFIG_MFD_TPS65910) - if(g_pmic_type == PMIC_TYPE_TPS65910) + if(pmic_is_tps65910()) board_pmu_tps65910_suspend(); #endif } @@ -2578,11 +2576,11 @@ void __sramfunc board_pmu_suspend(void) void __sramfunc board_pmu_resume(void) { #if defined (CONFIG_MFD_WM831X_I2C) - if(g_pmic_type == PMIC_TYPE_WM8326) + if(pmic_is_wm8326()) board_pmu_wm8326_resume(); #endif #if defined (CONFIG_MFD_TPS65910) - if(g_pmic_type == PMIC_TYPE_TPS65910) + if(pmic_is_tps65910()) board_pmu_tps65910_resume(); #endif } @@ -2824,14 +2822,14 @@ void rk30_pm_power_off(void) } #endif #if defined(CONFIG_MFD_WM831X) - if(g_pmic_type == PMIC_TYPE_WM8326) + if(pmic_is_wm8326()) { wm831x_set_bits(Wm831x,WM831X_GPIO_LEVEL,0x0001,0x0000); //set sys_pwr 0 wm831x_device_shutdown(Wm831x);//wm8326 shutdown } #endif #if defined(CONFIG_MFD_TPS65910) - if(g_pmic_type == PMIC_TYPE_TPS65910) + if(pmic_is_tps65910()) { tps65910_device_shutdown();//tps65910 shutdown } diff --git a/arch/arm/mach-rk30/board-rk30-sdk.c b/arch/arm/mach-rk30/board-rk30-sdk.c index 02a5f254afd4..01b0d184aedb 100755 --- a/arch/arm/mach-rk30/board-rk30-sdk.c +++ b/arch/arm/mach-rk30/board-rk30-sdk.c @@ -1388,8 +1388,6 @@ static struct i2c_board_info __initdata i2c0_info[] = { }; #endif -#define PMIC_TYPE_WM8326 1 -#define PMIC_TYPE_TPS65910 2 int __sramdata g_pmic_type = 0; #ifdef CONFIG_I2C1_RK30 #ifdef CONFIG_MFD_WM831X_I2C @@ -1425,11 +1423,11 @@ static struct i2c_board_info __initdata i2c1_info[] = { void __sramfunc board_pmu_suspend(void) { #if defined (CONFIG_MFD_WM831X_I2C) - if(g_pmic_type == PMIC_TYPE_WM8326) + if(pmic_is_wm8326()) board_pmu_wm8326_suspend(); #endif #if defined (CONFIG_MFD_TPS65910) - if(g_pmic_type == PMIC_TYPE_TPS65910) + if(pmic_is_tps65910()) board_pmu_tps65910_suspend(); #endif } @@ -1437,11 +1435,11 @@ void __sramfunc board_pmu_suspend(void) void __sramfunc board_pmu_resume(void) { #if defined (CONFIG_MFD_WM831X_I2C) - if(g_pmic_type == PMIC_TYPE_WM8326) + if(pmic_is_wm8326()) board_pmu_wm8326_resume(); #endif #if defined (CONFIG_MFD_TPS65910) - if(g_pmic_type == PMIC_TYPE_TPS65910) + if(pmic_is_tps65910()) board_pmu_tps65910_resume(); #endif } @@ -1530,14 +1528,14 @@ static void rk30_pm_power_off(void) printk(KERN_ERR "rk30_pm_power_off start...\n"); gpio_direction_output(POWER_ON_PIN, GPIO_LOW); #if defined(CONFIG_MFD_WM831X) - if(g_pmic_type == PMIC_TYPE_WM8326) + if(pmic_is_wm8326()) { wm831x_set_bits(Wm831x,WM831X_GPIO_LEVEL,0x0001,0x0000); //set sys_pwr 0 wm831x_device_shutdown(Wm831x);//wm8326 shutdown } #endif #if defined(CONFIG_MFD_TPS65910) - if(g_pmic_type == PMIC_TYPE_TPS65910) + if(pmic_is_tps65910()) { tps65910_device_shutdown();//tps65910 shutdown } diff --git a/arch/arm/mach-rk30/board-rk3066b-m701.c b/arch/arm/mach-rk30/board-rk3066b-m701.c index 1c4c3e53bf9f..7735e9e08860 100755 --- a/arch/arm/mach-rk30/board-rk3066b-m701.c +++ b/arch/arm/mach-rk30/board-rk3066b-m701.c @@ -1409,8 +1409,6 @@ static struct i2c_board_info __initdata i2c0_info[] = { }; #endif -#define PMIC_TYPE_WM8326 1 -#define PMIC_TYPE_TPS65910 2 int __sramdata g_pmic_type = 0; #ifdef CONFIG_I2C1_RK30 #ifdef CONFIG_MFD_WM831X_I2C @@ -1446,11 +1444,11 @@ static struct i2c_board_info __initdata i2c1_info[] = { void __sramfunc board_pmu_suspend(void) { #if defined (CONFIG_MFD_WM831X_I2C) - if(g_pmic_type == PMIC_TYPE_WM8326) + if(pmic_is_wm8326()) board_pmu_wm8326_suspend(); #endif #if defined (CONFIG_MFD_TPS65910) - if(g_pmic_type == PMIC_TYPE_TPS65910) + if(pmic_is_tps65910()) board_pmu_tps65910_suspend(); #endif } @@ -1458,11 +1456,11 @@ void __sramfunc board_pmu_suspend(void) void __sramfunc board_pmu_resume(void) { #if defined (CONFIG_MFD_WM831X_I2C) - if(g_pmic_type == PMIC_TYPE_WM8326) + if(pmic_is_wm8326()) board_pmu_wm8326_resume(); #endif #if defined (CONFIG_MFD_TPS65910) - if(g_pmic_type == PMIC_TYPE_TPS65910) + if(pmic_is_tps65910()) board_pmu_tps65910_resume(); #endif } diff --git a/arch/arm/mach-rk30/board-rk3066b-sdk.c b/arch/arm/mach-rk30/board-rk3066b-sdk.c index 4cf5f01308a9..8c01f5e92182 100755 --- a/arch/arm/mach-rk30/board-rk3066b-sdk.c +++ b/arch/arm/mach-rk30/board-rk3066b-sdk.c @@ -1326,8 +1326,6 @@ static struct i2c_board_info __initdata i2c0_info[] = { }; #endif -#define PMIC_TYPE_WM8326 1 -#define PMIC_TYPE_TPS65910 2 int __sramdata g_pmic_type = 0; #ifdef CONFIG_I2C1_RK30 #ifdef CONFIG_MFD_WM831X_I2C @@ -1367,11 +1365,11 @@ static struct i2c_board_info __initdata i2c1_info[] = { void __sramfunc board_pmu_suspend(void) { #if defined (CONFIG_MFD_WM831X_I2C) - if(g_pmic_type == PMIC_TYPE_WM8326) + if(pmic_is_wm8326()) board_pmu_wm8326_suspend(); #endif #if defined (CONFIG_MFD_TPS65910) - if(g_pmic_type == PMIC_TYPE_TPS65910) + if(pmic_is_tps65910()) board_pmu_tps65910_suspend(); #endif } @@ -1379,11 +1377,11 @@ void __sramfunc board_pmu_suspend(void) void __sramfunc board_pmu_resume(void) { #if defined (CONFIG_MFD_WM831X_I2C) - if(g_pmic_type == PMIC_TYPE_WM8326) + if(pmic_is_wm8326()) board_pmu_wm8326_resume(); #endif #if defined (CONFIG_MFD_TPS65910) - if(g_pmic_type == PMIC_TYPE_TPS65910) + if(pmic_is_tps65910()) board_pmu_tps65910_resume(); #endif } diff --git a/arch/arm/plat-rk/include/plat/board.h b/arch/arm/plat-rk/include/plat/board.h index 388c1d0ce60f..0225079bb81d 100755 --- a/arch/arm/plat-rk/include/plat/board.h +++ b/arch/arm/plat-rk/include/plat/board.h @@ -5,6 +5,8 @@ #include #include #include +#include + enum { I2C_IDLE = 0, @@ -60,7 +62,17 @@ struct rk29_io_t { int (*io_init)(void); }; - +enum { + PMIC_TYPE_NOE =0, + PMIC_TYPE_WM8326 =1, + PMIC_TYPE_TPS65910 =2, + PMIC_TYPE_ACT8931 =3, + PMIC_TYPE_MAX, +}; +extern __sramdata int g_pmic_type; +#define pmic_is_wm8326() (g_pmic_type == PMIC_TYPE_WM8326) +#define pmic_is_tps65910() (g_pmic_type == PMIC_TYPE_TPS65910) +#define pmic_is_act8931() (g_pmic_type == PMIC_TYPE_ACT8931) struct rk29_fb_setting_info { u8 data_num;