From 1687a0df4d32245d95510e31d3873e7e0648e587 Mon Sep 17 00:00:00 2001 From: ywj Date: Thu, 5 Sep 2013 18:14:19 +0800 Subject: [PATCH] mend some error,Compatible with 3028a and 3168 --- arch/arm/mach-rk30/board-pmu-tps65910.c | 4 ++-- arch/arm/mach-rk3026/board-rk3028a-86v-camera.c | 2 +- drivers/input/touchscreen/rockchip_gslX680.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-rk30/board-pmu-tps65910.c b/arch/arm/mach-rk30/board-pmu-tps65910.c index 6d195fa9f788..74a9c8587879 100755 --- a/arch/arm/mach-rk30/board-pmu-tps65910.c +++ b/arch/arm/mach-rk30/board-pmu-tps65910.c @@ -310,7 +310,7 @@ static struct regulator_consumer_supply tps65910_smps1_supply[] = { { .supply = "vdd1", }, - #if defined(CONFIG_SOC_RK3168) || defined(CONFIG_ARCH_RK3188) || defined(CONFIG_SOC_RK3028) ||defined(CONFIG_MACH_RK3028A_86V)||defined(CONFIG_MACH_RK_FAC) + #if defined(CONFIG_SOC_RK3168) || defined(CONFIG_ARCH_RK3188) || defined(CONFIG_SOC_RK3028) ||defined(CONFIG_MACH_RK3028A_86V)||defined(CONFIG_MACH_RK3028A_FAC) { .supply = "vdd_core", @@ -325,7 +325,7 @@ static struct regulator_consumer_supply tps65910_smps2_supply[] = { { .supply = "vdd2", }, - #if defined(CONFIG_MACH_RK3168_86V) || defined(CONFIG_SOC_RK3028)||defined(CONFIG_MACH_RK_FAC) ||defined(CONFIG_MACH_RK3028A_86V) + #if defined(CONFIG_MACH_RK3168_86V) || defined(CONFIG_SOC_RK3028)||defined(CONFIG_MACH_RK3168_FAC) ||defined(CONFIG_MACH_RK3028A_86V)||defined(CONFIG_MACH_RK3028A_FAC) { .supply = "vdd_cpu", diff --git a/arch/arm/mach-rk3026/board-rk3028a-86v-camera.c b/arch/arm/mach-rk3026/board-rk3028a-86v-camera.c index 67d8316ff646..256eaffebc35 100755 --- a/arch/arm/mach-rk3026/board-rk3028a-86v-camera.c +++ b/arch/arm/mach-rk3026/board-rk3028a-86v-camera.c @@ -210,7 +210,7 @@ static struct rkcamera_platform_data new_camera[] = { static void rk_cif_power(int on) { struct regulator *ldo_18,*ldo_28; - #if defined(CONFIG_MACH_RK3028A_86V) + #if defined(CONFIG_MACH_RK3028A_86V)||defined(CONFIG_MACH_RK3028A_FAC) ldo_28 = regulator_get(NULL, "ldo7"); // vcc28_cif ldo_18 = regulator_get(NULL, "ldo1"); // vcc18_cif #else diff --git a/drivers/input/touchscreen/rockchip_gslX680.c b/drivers/input/touchscreen/rockchip_gslX680.c index 7aec4abb1887..eb0738395f4e 100755 --- a/drivers/input/touchscreen/rockchip_gslX680.c +++ b/drivers/input/touchscreen/rockchip_gslX680.c @@ -27,7 +27,7 @@ #include #include #include -#if defined(CONFIG_MACH_RK3168_86V)||||defined(CONFIG_MACH_RK_FAC) +#if defined(CONFIG_MACH_RK3168_86V)||defined(CONFIG_MACH_RK3168_FAC) #include #else #include "rockchip_gslX680.h" -- 2.34.1