battery & sdmmc: add board raho 0928 support
authorlyx <lyx@rock-chips.com>
Fri, 8 Oct 2010 11:27:21 +0000 (04:27 -0700)
committerlyx <lyx@rock-chips.com>
Fri, 8 Oct 2010 11:27:21 +0000 (04:27 -0700)
drivers/mmc/host/rk2818-sdmmc.c
drivers/power/rk2818_battery.c

index 726c778bfa3e7c0d4c7bf1b2f157108b66c0433f..d8be448ed72dc2f72a0e853547c60c2f3449c5b5 100755 (executable)
@@ -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;
index fad822e27c0d96c0a4e76c729b6099882ee31e72..a0cf53cdc5869ca37b1875ea0597b718d1004be8 100755 (executable)
@@ -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