From: kfx <kfx@rock-chips.com>
Date: Mon, 5 Nov 2012 02:57:03 +0000 (+0800)
Subject: rk2928 defconfig: fix lcd_aclk(15M-->150M)
X-Git-Tag: firefly_0821_release~8277
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=167c08d35019bc9086cba06294b8d4bc813c88c8;p=firefly-linux-kernel-4.4.55.git

rk2928 defconfig: fix lcd_aclk(15M-->150M)
---

diff --git a/arch/arm/mach-rk2928/board-rk2928.c b/arch/arm/mach-rk2928/board-rk2928.c
index af5a6dea927d..8bede4822e81 100755
--- a/arch/arm/mach-rk2928/board-rk2928.c
+++ b/arch/arm/mach-rk2928/board-rk2928.c
@@ -731,7 +731,7 @@ static int __init pmic_board_init(void)
                 port = get_port_config(pmic_irq);
                 pmic_info.irq = port.gpio;
         }
-        if(pmic_type == PMIC_TYPE_TPS65910){
+        if(pmic_is_tps65910()){
                 strcpy(pmic_info.type, "tps65910");
                 pmic_info.platform_data = &tps65910_data;
 
@@ -745,7 +745,7 @@ static int __init pmic_board_init(void)
                         tps65910_ldo_info[i].max_uv = tps65910_ldo[2*i + 1];
                 }
         }
-        if(pmic_type == PMIC_TYPE_ACT8931){
+        if(pmic_is_act8931()){
                 strcpy(pmic_info.type, "act8931");
                 pmic_info.platform_data = &act8931_data;
                 for(i = 0; i < ARRAY_SIZE(act8931_dcdc_info); i++){
@@ -1044,7 +1044,7 @@ static int __init rtc_board_init(void)
         struct port_config port;
         int ret;
 
-        if(pmic_type == PMIC_TYPE_TPS65910)
+        if(pmic_is_tps65910())
                 return 0;
                 
         ret = check_rtc_param();
@@ -1119,7 +1119,7 @@ static void rk2928_pm_power_off(void)
 {
 	printk(KERN_ERR "rk2928_pm_power_off start...\n");
         #if defined(CONFIG_REGULATOR_ACT8931)
-        if(pmic_type == PMIC_TYPE_ACT8931)
+        if(pmic_is_act8931())
         {
               if(act8931_charge_det)
                    arm_pm_restart(0, NULL);
diff --git a/arch/arm/mach-rk2928/include/mach/config.h b/arch/arm/mach-rk2928/include/mach/config.h
index 587d754a0a1f..4f3b1a58a7e5 100644
--- a/arch/arm/mach-rk2928/include/mach/config.h
+++ b/arch/arm/mach-rk2928/include/mach/config.h
@@ -2,11 +2,11 @@
 #define __MACH_CONFIG_H
 #include <mach/board.h>
 
-//#define RK2926_TB_DEFAULT_CONFIG
+#define RK2926_TB_DEFAULT_CONFIG
 //#define RK2928_TB_DEFAULT_CONFIG
 //#define RK2926_SDK_DEFAULT_CONFIG
 //#define RK2928_SDK_DEFAULT_CONFIG
-#define RK2928_PHONEPAD_DEFAULT_CONFIG
+//#define RK2928_PHONEPAD_DEFAULT_CONFIG
 
 
 /* camera id */
@@ -96,7 +96,7 @@ enum {
 };
 
 #define DEF_LCD_PARAM {SCREEN_LVDS, OUT_D888_P666, \
-                        65000000, 30000000, \
+                        65000000, 300000000, \
                         10, 100, 1024, 210, \
                         10, 10, 768, 18, \
                         202, 102, \
@@ -233,7 +233,7 @@ enum {
 };
 
 #define DEF_LCD_PARAM {SCREEN_LVDS, OUT_D888_P666, \
-                        65000000, 30000000, \
+                        65000000, 300000000, \
                         10, 100, 1024, 210, \
                         10, 10, 768, 18, \
                         202, 102, \
@@ -372,7 +372,7 @@ enum {
 };
 
 #define DEF_LCD_PARAM {SCREEN_RGB, OUT_P666, \
-                        33000000, 15000000, \
+                        33000000, 150000000, \
                         30, 10, 800, 210, \
                         13, 10, 480, 22, \
                         154, 85, \
@@ -510,7 +510,7 @@ enum {
 };
 
 #define DEF_LCD_PARAM {SCREEN_RGB, OUT_P666, \
-                        33000000, 15000000, \
+                        33000000, 150000000, \
                         30, 10, 800, 210, \
                         13, 10, 480, 22, \
                         154, 85, \
@@ -648,7 +648,7 @@ enum {
 };
 
 #define DEF_LCD_PARAM {SCREEN_RGB, OUT_P666, \
-                        30000000, 15000000, \
+                        30000000, 150000000, \
                         48, 88, 800, 40, \
                         3, 32, 480, 13, \
                         154, 85, \