From 4b591ac599a97d39451614c4556c2bcf278bd90f Mon Sep 17 00:00:00 2001 From: lyx Date: Fri, 8 Oct 2010 04:27:21 -0700 Subject: [PATCH] battery & sdmmc: add board raho 0928 support --- drivers/mmc/host/rk2818-sdmmc.c | 2 +- drivers/power/rk2818_battery.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/rk2818-sdmmc.c b/drivers/mmc/host/rk2818-sdmmc.c index 726c778bfa3e..d8be448ed72d 100755 --- a/drivers/mmc/host/rk2818-sdmmc.c +++ b/drivers/mmc/host/rk2818-sdmmc.c @@ -904,7 +904,7 @@ static int rk2818_sdmmc_get_cd(struct mmc_host *mmc) struct rk2818_sdmmc_host *host = mmc_priv(mmc); u32 cdetect = readl(host->regs + SDMMC_CDETECT); -#ifdef CONFIG_MACH_RAHO +#if defined(CONFIG_MACH_RAHO)||defined(CONFIG_MACH_RAHO_0928) return 1; #else return (cdetect & SDMMC_CARD_DETECT_N)?0:1; diff --git a/drivers/power/rk2818_battery.c b/drivers/power/rk2818_battery.c index fad822e27c0d..a0cf53cdc586 100755 --- a/drivers/power/rk2818_battery.c +++ b/drivers/power/rk2818_battery.c @@ -218,7 +218,7 @@ static void rk2818_get_bat_voltage(struct rk2818_battery_data *bat) int temp[2] = {0,0}; value = gAdcValue[CHN_BAT_ADC]; if(0 != gAdcValue[3]) -#ifdef CONFIG_MACH_RAHO +#if defined(CONFIG_MACH_RAHO)||defined(CONFIG_MACH_RAHO_0928) gBatVoltage = (value * BAT_1V2_VALUE * 3)/(gAdcValue[3]*2); #else gBatVoltage = (value * BAT_1V2_VALUE * 2)/gAdcValue[3]; // channel 3 is about 1.42v,need modified -- 2.34.1