From 0845aeb21de42639e51d522c2842cdb2862eb948 Mon Sep 17 00:00:00 2001 From: lhh Date: Sat, 11 Dec 2010 11:48:24 +0800 Subject: [PATCH] no battery ic set and sdmmc timeout add more --- arch/arm/mach-rk29/board-rk29sdk.c | 2 +- drivers/mmc/host/rk29_sdmmc.c | 4 ++-- drivers/power/bq27510_battery.c | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-rk29/board-rk29sdk.c b/arch/arm/mach-rk29/board-rk29sdk.c index 18e140985851..5112273ac9af 100755 --- 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; } -#define CONFIG_SDMMC0_USE_DMA +//#define CONFIG_SDMMC0_USE_DMA struct rk29_sdmmc_platform_data default_sdmmc0_data = { .host_ocr_avail = (MMC_VDD_25_26|MMC_VDD_26_27|MMC_VDD_27_28|MMC_VDD_28_29|MMC_VDD_29_30| MMC_VDD_30_31|MMC_VDD_31_32|MMC_VDD_32_33| diff --git a/drivers/mmc/host/rk29_sdmmc.c b/drivers/mmc/host/rk29_sdmmc.c index 99c268f83568..676fd88ca3fc 100755 --- 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 eb3472c0b43a..00194fe6e7ab 100644 --- 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); -- 2.34.1