DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add ifdefs for CONFIG_MMC_MSM_SDC[25]_SUPPORT

Browse Source
This commit is contained in:
James Sullins
2012-02-01 12:48:02 -06:00
parent 3851646ddc
commit 74230aa1fb
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-msm/board-msm8x60.c
View File

@@ -8023,6 +8023,7 @@ struct sdcc_reg {
unsigned int lpm_uA; unsigned int lpm_uA;
unsigned int hpm_uA; unsigned int hpm_uA;
}; };
/* all SDCC controllers require VDD/VCC voltage */ /* all SDCC controllers require VDD/VCC voltage */
static struct sdcc_reg sdcc_vdd_reg_data[MAX_SDCC_CONTROLLER]; static struct sdcc_reg sdcc_vdd_reg_data[MAX_SDCC_CONTROLLER];
/* only SDCC1 requires VCCQ voltage */ /* only SDCC1 requires VCCQ voltage */
@@ -8282,6 +8283,7 @@ setup_vreg:
return rc; return rc;
} }
#if defined(CONFIG_MMC_MSM_SDC2_SUPPORT) || defined(CONFIG_MMC_MSM_SDC5_SUPPORT)
static void msm_sdcc_sdio_lpm_gpio(struct device *dv, unsigned int active) static void msm_sdcc_sdio_lpm_gpio(struct device *dv, unsigned int active)
{ {
struct msm_sdcc_pin_cfg *curr_pin_cfg; struct msm_sdcc_pin_cfg *curr_pin_cfg;
@@ -8301,6 +8303,7 @@ static void msm_sdcc_sdio_lpm_gpio(struct device *dv, unsigned int active)
msm_sdcc_setup_pad(pdev->id, active); msm_sdcc_setup_pad(pdev->id, active);
curr_pin_cfg->sdio_lpm_gpio_cfg = 0; curr_pin_cfg->sdio_lpm_gpio_cfg = 0;
} }
#endif
static int msm_sdc3_get_wpswitch(struct device *dev) static int msm_sdc3_get_wpswitch(struct device *dev)
{ {