[PATCH 1/2] ARM: SAMSUNG: MMC: Fix build error when both DMA and PIO mode selected

[PATCH 1/2] ARM: SAMSUNG: MMC: Fix build error when both DMA and PIO mode selected

[Pinkava J.]

Signed-off-by: Jiri Pinkava <jiri.pinkava@vscht.cz>
---
 drivers/mmc/host/s3cmci.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
index 2fdf768..4426a4b 100644
--- a/drivers/mmc/host/s3cmci.c
+++ b/drivers/mmc/host/s3cmci.c
@@ -1600,7 +1600,7 @@ static int __devinit s3cmci_probe(struct platform_device
*pdev)
 	host->pio_active 	= XFER_NONE;

 #ifdef CONFIG_MMC_S3C_PIODMA
-	host->dodma		= host->pdata->dma;
+	host->dodma		= host->pdata->use_dma;
 #endif

 	host->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-- 
1.7.1

[PATCH 2/2] ARM: Fix MMC power management on Acer n30 / n35

[Pinkava J.]

Exchange on and off state, MMC is working even if "powered off", but when comes
to write it causes random failures, most frequently zeroes first/all sector(s).

Signed-off-by: Jiri Pinkava <jiri.pinkava@vscht.cz>
---
 arch/arm/mach-s3c2410/mach-n30.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-s3c2410/mach-n30.c b/arch/arm/mach-s3c2410/mach-n30.c
index 41f299d..6c3456c 100644
--- a/arch/arm/mach-s3c2410/mach-n30.c
+++ b/arch/arm/mach-s3c2410/mach-n30.c
@@ -357,11 +357,11 @@ static void n30_sdi_set_power(unsigned char power_mode,
unsigned short vdd)
 	switch (power_mode) {
 	case MMC_POWER_ON:
 	case MMC_POWER_UP:
-		gpio_set_value(S3C2410_GPG(4), 1);
+		gpio_set_value(S3C2410_GPG(4), 0);
 		break;
 	case MMC_POWER_OFF:
 	default:
-		gpio_set_value(S3C2410_GPG(4), 0);
+		gpio_set_value(S3C2410_GPG(4), 1);
 		break;
 	}
 }
-- 
1.7.1

[PATCH 1/2] ARM: SAMSUNG: MMC: Fix build error when both DMA and PIO mode selected

[Ben Dooks]

On Tue, May 25, 2010 at 03:13:39AM +0200, Pinkava J. wrote:
> 
> Signed-off-by: Jiri Pinkava <jiri.pinkava@vscht.cz>
Acked-by: Ben Dooks <ben-linux@fluff.org>

please send to the linux mmc list and/or akpm for inclusion.

> ---
>  drivers/mmc/host/s3cmci.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
> index 2fdf768..4426a4b 100644
> --- a/drivers/mmc/host/s3cmci.c
> +++ b/drivers/mmc/host/s3cmci.c
> @@ -1600,7 +1600,7 @@ static int __devinit s3cmci_probe(struct platform_device
> *pdev)
>  	host->pio_active 	= XFER_NONE;
> 
>  #ifdef CONFIG_MMC_S3C_PIODMA
> -	host->dodma		= host->pdata->dma;
> +	host->dodma		= host->pdata->use_dma;
>  #endif
> 
>  	host->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> -- 
> 1.7.1
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

-- 
-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.

[PATCH 2/2] ARM: Fix MMC power management on Acer n30 / n35

[Pinkava J.]

Dne 25.5.2010 03:22, Pinkava J. napsal(a):
> Exchange on and off state, MMC is working even if "powered off", but when comes
> to write it causes random failures, most frequently zeroes first/all sector(s).
Sorry for mess, this is idependend on previous patch and should be included.

(Or removed patch named:
ARM: n30: Add support for power on/off on Acer n30 / Acer n35 MMC card reader
)


> 
> Signed-off-by: Jiri Pinkava <jiri.pinkava@vscht.cz>
> ---
>  arch/arm/mach-s3c2410/mach-n30.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-s3c2410/mach-n30.c b/arch/arm/mach-s3c2410/mach-n30.c
> index 41f299d..6c3456c 100644
> --- a/arch/arm/mach-s3c2410/mach-n30.c
> +++ b/arch/arm/mach-s3c2410/mach-n30.c
> @@ -357,11 +357,11 @@ static void n30_sdi_set_power(unsigned char power_mode,
> unsigned short vdd)
>  	switch (power_mode) {
>  	case MMC_POWER_ON:
>  	case MMC_POWER_UP:
> -		gpio_set_value(S3C2410_GPG(4), 1);
> +		gpio_set_value(S3C2410_GPG(4), 0);
>  		break;
>  	case MMC_POWER_OFF:
>  	default:
> -		gpio_set_value(S3C2410_GPG(4), 0);
> +		gpio_set_value(S3C2410_GPG(4), 1);
>  		break;
>  	}
>  }

[PATCH 1/2] ARM: SAMSUNG: MMC: Fix build error when both DMA and PIO mode selected

[Sergei Shtylyov]

Hello.

Pinkava J. wrote:

> Signed-off-by: Jiri Pinkava <jiri.pinkava@vscht.cz>
> ---
>  drivers/mmc/host/s3cmci.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

> diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
> index 2fdf768..4426a4b 100644
> --- a/drivers/mmc/host/s3cmci.c
> +++ b/drivers/mmc/host/s3cmci.c
> @@ -1600,7 +1600,7 @@ static int __devinit s3cmci_probe(struct platform_device
> *pdev)

    Your patch is line wrapped. Should be easy to fix however...

WBR, Sergei