no battery ic set and sdmmc timeout add more

diff --git a/arch/arm/mach-rk29/board-rk29sdk.c b/arch/arm/mach-rk29/board-rk29sdk.c
index 18e14098585150c3ed654095b892a299d1af8c9b..5112273ac9af2d07ddccd823af5d8dbdd75fbe75 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29sdk.c
+++ b/arch/arm/mach-rk29/board-rk29sdk.c
@@ -750,7 +750,7 @@ static int rk29_sdmmc0_cfg_gpio(void)
        return 0;\r
 }\r
 \r
-#define CONFIG_SDMMC0_USE_DMA\r
+//#define CONFIG_SDMMC0_USE_DMA\r
 struct rk29_sdmmc_platform_data default_sdmmc0_data = {\r
        .host_ocr_avail = (MMC_VDD_25_26|MMC_VDD_26_27|MMC_VDD_27_28|MMC_VDD_28_29|MMC_VDD_29_30|\r
                                           MMC_VDD_30_31|MMC_VDD_31_32|MMC_VDD_32_33|\r

diff --git a/drivers/mmc/host/rk29_sdmmc.c b/drivers/mmc/host/rk29_sdmmc.c
index 99c268f835684b74df3c040ef83acab7be13b834..676fd88ca3fc30c368d335799b22ac0279d7a2a3 100755 (executable)
--- a/drivers/mmc/host/rk29_sdmmc.c
+++ b/drivers/mmc/host/rk29_sdmmc.c
@@ -300,8 +300,8 @@ static void rk29_sdmmc_set_timeout(struct rk29_sdmmc *host,struct mmc_data *data
        unsigned timeout;
 
        timeout = ns_to_clocks(host->clock, data->timeout_ns) + data->timeout_clks;
-       ///rk29_sdmmc_write(host->regs, SDMMC_TMOUT, 0xffffffff);
-       rk29_sdmmc_write(host->regs, SDMMC_TMOUT, (timeout << 8) | (70));
+       rk29_sdmmc_write(host->regs, SDMMC_TMOUT, 0xffffffff);
+       ///rk29_sdmmc_write(host->regs, SDMMC_TMOUT, (timeout << 8) | (70));
 }
 
 static u32 rk29_sdmmc_prepare_command(struct mmc_host *mmc,

diff --git a/drivers/power/bq27510_battery.c b/drivers/power/bq27510_battery.c
index eb3472c0b43a73fdd5246f7adde88d532cebe471..00194fe6e7ab835d1082222969fc14b806286bcb 100644 (file)
--- a/drivers/power/bq27510_battery.c
+++ b/drivers/power/bq27510_battery.c
@@ -66,10 +66,10 @@ static enum power_supply_property bq27510_battery_props[] = {
        POWER_SUPPLY_PROP_VOLTAGE_NOW,
        POWER_SUPPLY_PROP_CURRENT_NOW,
        POWER_SUPPLY_PROP_CAPACITY,
-       POWER_SUPPLY_PROP_TEMP,
-       POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW,
-       POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG,
-       POWER_SUPPLY_PROP_TIME_TO_FULL_NOW,
+       //POWER_SUPPLY_PROP_TEMP,
+       //POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW,
+       //POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG,
+       //POWER_SUPPLY_PROP_TIME_TO_FULL_NOW,
 };
 
 /*
@@ -241,7 +241,7 @@ static int bq27510_battery_get_property(struct power_supply *psy,
                val->intval = bq27510_battery_current(di);
                break;
        case POWER_SUPPLY_PROP_CAPACITY:
-               val->intval = bq27510_battery_rsoc(di);
+               val->intval = 100; ///bq27510_battery_rsoc(di);
                break;
        case POWER_SUPPLY_PROP_TEMP:
                val->intval = bq27510_battery_temperature(di);