Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3989d178 authored by Pavel Machek's avatar Pavel Machek Committed by Daniel Walker
Browse files

HTC Dream: mmc compilation fixes 



Add missing include for msm_sdcc compilation, and remove pwrsink
support that is not mainline, yet.

Signed-off-by: default avatarPavel Machek <pavel@ucw.cz>
[dwalker@codeaurora.org : fixed indent in mmc.h]
Signed-off-by: default avatarDaniel Walker <dwalker@codeaurora.org>
parent 4e00dc76

arch/arm/mach-msm/include/mach/mmc.h

0 → 100644
+26 −0
Original line number Diff line number Diff line 
/*

 *  arch/arm/include/asm/mach/mmc.h

 */

#ifndef ASMARM_MACH_MMC_H

#define ASMARM_MACH_MMC_H



#include <linux/mmc/host.h>

#include <linux/mmc/card.h>

#include <linux/mmc/sdio_func.h>



struct embedded_sdio_data {

	struct sdio_cis cis;

	struct sdio_cccr cccr;

	struct sdio_embedded_func *funcs;

	int num_funcs;

};



struct mmc_platform_data {

	unsigned int ocr_mask;			/* available voltages */

	u32 (*translate_vdd)(struct device *, unsigned int);

	unsigned int (*status)(struct device *);

	struct embedded_sdio_data *embedded_sdio;

	int (*register_status_notify)(void (*callback)(int card_present, void *dev_id), void *dev_id);

};



#endif

drivers/mmc/host/msm_sdcc.c

+1 −4
Original line number Diff line number Diff line
@@ -38,10 +38,9 @@ 
#include <asm/div64.h>

#include <asm/sizes.h>



#include <asm/mach/mmc.h>

#include <mach/mmc.h>

#include <mach/msm_iomap.h>

#include <mach/dma.h>

#include <mach/htc_pwrsink.h>



#include "msm_sdcc.h"
@@ -775,13 +774,11 @@ msmsdcc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 


	switch (ios->power_mode) {

	case MMC_POWER_OFF:

		htc_pwrsink_set(PWRSINK_SDCARD, 0);

		break;

	case MMC_POWER_UP:

		pwr |= MCI_PWR_UP;

		break;

	case MMC_POWER_ON:

		htc_pwrsink_set(PWRSINK_SDCARD, 100);

		pwr |= MCI_PWR_ON;

		break;

	}