mend some error,Compatible with 3028a and 3168

diff --git a/arch/arm/mach-rk30/board-pmu-tps65910.c b/arch/arm/mach-rk30/board-pmu-tps65910.c
index 6d195fa9f78884d7c81c499a2228fe1b586f946e..74a9c858787977b4391e02f85344a1706b5e22ee 100755 (executable)
--- 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 67d8316ff6468219a5ff0e2c343bd434ee34662d..256eaffebc3501385195f4f65712fdff7301c252 100755 (executable)
--- 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 7aec4abb1887f75e1e86dc9b5fc8dbc17e343e8c..eb0738395f4ee046c6cb35a301b5c77f2fe1c440 100755 (executable)
--- a/drivers/input/touchscreen/rockchip_gslX680.c
+++ b/drivers/input/touchscreen/rockchip_gslX680.c
@@ -27,7 +27,7 @@
 #include <linux/workqueue.h>
 #include <linux/proc_fs.h>
 #include <linux/input/mt.h>
-#if defined(CONFIG_MACH_RK3168_86V)||||defined(CONFIG_MACH_RK_FAC)
+#if defined(CONFIG_MACH_RK3168_86V)||defined(CONFIG_MACH_RK3168_FAC)
 #include <rockchip_gslX680_86v.h>
 #else
 #include "rockchip_gslX680.h"