shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 12:57:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

no battery ic set and sdmmc timeout add more

Browse Source
This commit is contained in:
lhh
2010-12-11 11:48:24 +08:00
parent 40a1ab5ca9
commit 0845aeb21d
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-rk29/board-rk29sdk.c
View File

@@ -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|

4
drivers/mmc/host/rk29_sdmmc.c
View File

@@ -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,

10
drivers/power/bq27510_battery.c
View File

@@ -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);