update fih board ddr init and i2c1 pll to irq.

diff --git a/arch/arm/mach-rk29/board-rk29-fih.c b/arch/arm/mach-rk29/board-rk29-fih.c
index b588c031f7e6922bc28e18da759726734dd2f19d..bd67083d059474f026400354e920408b366c8843 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-fih.c
+++ b/arch/arm/mach-rk29/board-rk29-fih.c
@@ -46,6 +46,7 @@
 #include <mach/vpu_mem.h>
 #include <mach/sram.h>
 #include <mach/rk29_lightsensor.h>
+#include <mach/ddr.h>
 
 #include <linux/regulator/rk29-pwm-regulator.h>
 #include <linux/regulator/machine.h>
@@ -963,7 +964,7 @@ struct rk29_i2c_platform_data default_i2c1_data = {
        .flags      = 0,
        .slave_addr = 0xff,
        .scl_rate  = 200*1000,
-       .mode           = I2C_MODE_POLL,
+       .mode           = I2C_MODE_IRQ,
        .io_init = rk29_i2c1_io_init,
 };
 
@@ -2564,6 +2565,7 @@ static void __init machine_rk29_mapio(void)
        rk29_sram_init();
        rk29_clock_init(periph_pll_288mhz);
        rk29_iomux_init();
+       ddr_init(DDR_TYPE,DDR_FREQ);  // DDR3_1333H, 400
 }
 
 MACHINE_START(RK29, "RK29board")

diff --git a/drivers/mfd/tps65910-core.c b/drivers/mfd/tps65910-core.c
index 8333719284142e9fa9625543ea7753a405c7caa4..01c6439603c49ebacb5af59badf2262fa07d1bd1 100644 (file)
--- a/drivers/mfd/tps65910-core.c
+++ b/drivers/mfd/tps65910-core.c
@@ -711,13 +711,13 @@ static int proc_tps65910_show(struct seq_file *s, void *v)
     struct regulator *vldo;
        
        vldo = regulator_get(NULL, "vcore");
-       if (vldo != NULL)
+       if (!IS_ERR(vldo))
        {
                int uV = 0;
-               
+#if 0          
                seq_printf(s, "Set VCORE.\n");
-               regulator_set_voltage(vldo,1100000,1100000);
-
+               regulator_set_voltage(vldo,1350000,1350000);
+#endif
                uV = regulator_get_voltage(vldo);
                seq_printf(s, "Get VCORE=%d(uV).\n", uV);
        }
@@ -727,14 +727,17 @@ static int proc_tps65910_show(struct seq_file *s, void *v)
 #if 0
 {
     struct regulator *vldo;
-       
+
+#if 1
        vldo = regulator_get(NULL, "vaux1");
        if (!IS_ERR(vldo))
        {               
                seq_printf(s, "Disable VAUX1.\n");
                regulator_disable(vldo);
        }
+#endif
 
+#if 1
        vldo = regulator_get(NULL, "vdig1");
        if (!IS_ERR(vldo))
        {               
@@ -748,20 +751,25 @@ static int proc_tps65910_show(struct seq_file *s, void *v)
                seq_printf(s, "Disable VDIG2.\n");
                regulator_disable(vldo);
        }
+#endif
 
+#if 0  //      fih board is for hdmi
        vldo = regulator_get(NULL, "vdac");
        if (!IS_ERR(vldo))
        {               
                seq_printf(s, "Disable VDAC.\n");
                regulator_disable(vldo);
        }
+#endif
 
+#if 1
        vldo = regulator_get(NULL, "vaux2");
        if (!IS_ERR(vldo))
        {               
                seq_printf(s, "Disable VAUX2.\n");
                regulator_disable(vldo);
        }
+#endif
 }
 #endif