rpms/kernel/F-11 via-sdmmc.patch,1.2,1.3

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1571

Modified Files:
	via-sdmmc.patch 
Log Message:
update via-sdmmc to a working driver

via-sdmmc.patch:

Index: via-sdmmc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/via-sdmmc.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- via-sdmmc.patch	16 Jun 2009 19:37:34 -0000	1.2
+++ via-sdmmc.patch	17 Jun 2009 02:56:12 -0000	1.3
@@ -19,9 +19,6 @@ Now at patch ../patches/06-linux-2.6-via
 Subject: mmc: via-sdmmc: Rename register definition for more clarity
 Now at patch ../patches/07-linux-2.6-via.git-7f2a6ca468c282cb5176fa4059fd57b9b7026677.patch
 
-Subject: mmc: via-sdmmc: Make sure we actually power off when requested
-Now at patch ../patches/08-linux-2.6-via.git-0a5ee01234050c19e0b7e9a9168086e5df620145.patch
-
 Subject: mmc: via-mmc: Make sure we switch back from 3.3V to 1.8V
 Now at patch ../patches/09-linux-2.6-via.git-9799bc252796a2c4f9719755785d91febff454fe.patch
 
@@ -57,7 +54,7 @@ Now at patch ../patches/10-linux-2.6-via
  
 --- /dev/null
 +++ work-2.6.29.4/drivers/mmc/host/via-sdmmc.c
-@@ -0,0 +1,1336 @@
+@@ -0,0 +1,1331 @@
 +/*
 + *  drivers/mmc/host/via-sdmmc.c - VIA SD/MMC Card Reader driver
 + *  Copyright (c) 2008, VIA Technologies Inc. All Rights Reserved.
@@ -736,7 +733,7 @@ Now at patch ../patches/10-linux-2.6-via
 +}
 +
 +static void via_sdc_set_power(struct via_crdr_mmc_host *host,
-+			      unsigned short power, unsigned int on)
++	unsigned short power)
 +{
 +	unsigned long flags;
 +	u8 gatt, pwr = VIA_CRDR_POW_180;
@@ -763,10 +760,7 @@ Now at patch ../patches/10-linux-2.6-via
 +	host->power = pwr;
 +
 +	gatt = readb(host->pcictrl_mmiobase + VIA_CRDR_PCICLKGATT);
-+	if (on)
-+		gatt |= VIA_CRDR_PCICLKGATT_PAD_PWRON;
-+	else
-+		gatt &= ~VIA_CRDR_PCICLKGATT_PAD_PWRON;
++	gatt |= VIA_CRDR_PCICLKGATT_PAD_PWRON;
 +	if (pwr == VIA_CRDR_POW_330)
 +		gatt |= VIA_CRDR_PCICLKGATT_POWSEL;
 +	else
@@ -836,9 +830,7 @@ Now at patch ../patches/10-linux-2.6-via
 +	spin_unlock_irqrestore(&host->lock, flags);
 +
 +	if (ios->power_mode != MMC_POWER_OFF)
-+		via_sdc_set_power(host, ios->vdd, 1);
-+	else
-+		via_sdc_set_power(host, ios->vdd, 0);
++		via_sdc_set_power(host, ios->vdd);
 +}
 +
 +static int via_sdc_get_ro(struct mmc_host *mmc)