2009-12-06 20:00:00

by Pavel Machek

Subject: HTC Dream: mmc compilation fixes

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

Signed-off-by: Pavel Machek <[email protected]>


diff --git a/arch/arm/mach-msm/include/mach/mmc.h b/arch/arm/mach-msm/include/mach/mmc.h
new file mode 100644
index 0000000..8948dec
--- /dev/null
+++ b/arch/arm/mach-msm/include/mach/mmc.h
@@ -0,0 +1,26 @@
+/*
+ * 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
diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c
index dba4600..b31946e 100644
--- a/drivers/mmc/host/msm_sdcc.c
+++ b/drivers/mmc/host/msm_sdcc.c
@@ -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;
}

--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

2009-12-08 20:45:21

by Daniel Walker

Subject: Re: HTC Dream: mmc compilation fixes

On Sun, 2009-12-06 at 20:59 +0100, Pavel Machek wrote:
> +
> +struct embedded_sdio_data {
> + struct sdio_cis cis;
> + struct sdio_cccr cccr;
> + struct sdio_embedded_func *funcs;
> + int num_funcs;
> +};


There's some indentation problems in this block, I'll fix it prior to
merging it..

Daniel

2009-12-08 21:42:46

by Pavel Machek

Subject: Re: HTC Dream: mmc compilation fixes

On Tue 2009-12-08 12:45:22, Daniel Walker wrote:
> On Sun, 2009-12-06 at 20:59 +0100, Pavel Machek wrote:
> > +
> > +struct embedded_sdio_data {
> > + struct sdio_cis cis;
> > + struct sdio_cccr cccr;
> > + struct sdio_embedded_func *funcs;
> > + int num_funcs;
> > +};
>
>
> There's some indentation problems in this block, I'll fix it prior to
> merging it..

Thanks!
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html