projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rk:move pmic_type to board.h
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-rk2928
/
board-rk2928-a720.c
diff --git
a/arch/arm/mach-rk2928/board-rk2928-a720.c
b/arch/arm/mach-rk2928/board-rk2928-a720.c
index 3ed19d531741fdc8b3c617ba529f8a0774891e3a..41803c13fdababcc575ad25d5a8e0123765e0dbf 100755
(executable)
--- 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)
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)
{
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);
}
{
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 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
{
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)
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
{
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)
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)
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
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)
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)
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
}
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)
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);
{
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)
#endif
#if defined(CONFIG_MFD_TPS65910)
- if(
g_pmic_type == PMIC_TYPE_TPS65910
)
+ if(
pmic_is_tps65910()
)
{
tps65910_device_shutdown();//tps65910 shutdown
}
{
tps65910_device_shutdown();//tps65910 shutdown
}