rpms/kernel/devel kernel.spec, 1.1569, 1.1570 via-hwmon-temp-sensor.patch, 1.1, 1.2 via-sdmmc.patch, 1.1, 1.2

Fri Jun 12 21:19:18 UTC 2009

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9418

Modified Files:
	kernel.spec via-hwmon-temp-sensor.patch via-sdmmc.patch 
Log Message:
Update VIA temp sensor and mmc drivers.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1569
retrieving revision 1.1570
diff -u -p -r1.1569 -r1.1570

--- kernel.spec	12 Jun 2009 15:24:50 -0000	1.1569
+++ kernel.spec	12 Jun 2009 21:18:47 -0000	1.1570
@@ -1827,6 +1827,9 @@ fi
 # and build.
 
 %changelog
+* Fri Jun 12 2009 Chuck Ebbert <cebbert at redhat.com>
+- Update VIA temp sensor and mmc drivers.
+
 * Fri Jun 12 2009 John W. Linville <linville at redhat.com> 2.6.30-6
 - neigh: fix state transition INCOMPLETE->FAILED via Netlink request
 - enable CONFIG_ARPD (used by OpenNHRP)

via-hwmon-temp-sensor.patch:

Index: via-hwmon-temp-sensor.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/via-hwmon-temp-sensor.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- via-hwmon-temp-sensor.patch	10 Jun 2009 19:00:55 -0000	1.1
+++ via-hwmon-temp-sensor.patch	12 Jun 2009 21:18:48 -0000	1.2
@@ -1,21 +1,12 @@
-From: Harald Welte <laforge at gnumonks.org>
-Date: Tue, 9 Jun 2009 08:32:07 +0000 (+0800)
 Subject: hwmon: Add driver for VIA CPU core temperature
-X-Git-Url: http://git.gnumonks.org/cgi-bin/gitweb.cgi?p=linux-2.6-via.git;a=commitdiff_plain;h=bb3796c7c8d2209e7c3ab112f32ec4dec63e0d48
+Now at patch ../patches/1-linux-2.6-via.git-bb3796c7c8d2209e7c3ab112f32ec4dec63e0d48.patch
 
-hwmon: Add driver for VIA CPU core temperature
+Subject: hwmon: Make sure via-cputemp complies with hwmon conventions
+Now at patch ../patches/2-linux-2.6-via.git-d2891d15eeef1033893dcc524543e8ad8fef019f.patch
 
-This is a driver for the on-die digital temperature sensor of
-VIA's recent CPU models.
-
-Signed-off-by: Harald Welte <HaraldWelte at viatech.com>
----
-
-diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
-index d73f5f4..e863833 100644
---- a/drivers/hwmon/Kconfig
-+++ b/drivers/hwmon/Kconfig
-@@ -787,6 +787,14 @@ config SENSORS_THMC50
+--- work-2.6.29.4.orig/drivers/hwmon/Kconfig
++++ work-2.6.29.4/drivers/hwmon/Kconfig
+@@ -720,6 +720,14 @@ config SENSORS_THMC50
  	  This driver can also be built as a module.  If so, the module
  	  will be called thmc50.
  
@@ -30,11 +21,9 @@ index d73f5f4..e863833 100644
  config SENSORS_VIA686A
  	tristate "VIA686A"
  	depends on PCI
-diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
-index 0ae2698..3edf7fa 100644
---- a/drivers/hwmon/Makefile
-+++ b/drivers/hwmon/Makefile
-@@ -82,6 +82,7 @@ obj-$(CONFIG_SENSORS_SMSC47B397)+= smsc47b397.o
+--- work-2.6.29.4.orig/drivers/hwmon/Makefile
++++ work-2.6.29.4/drivers/hwmon/Makefile
+@@ -75,6 +75,7 @@ obj-$(CONFIG_SENSORS_SMSC47B397)+= smsc4
  obj-$(CONFIG_SENSORS_SMSC47M1)	+= smsc47m1.o
  obj-$(CONFIG_SENSORS_SMSC47M192)+= smsc47m192.o
  obj-$(CONFIG_SENSORS_THMC50)	+= thmc50.o
@@ -42,11 +31,8 @@ index 0ae2698..3edf7fa 100644
  obj-$(CONFIG_SENSORS_VIA686A)	+= via686a.o
  obj-$(CONFIG_SENSORS_VT1211)	+= vt1211.o
  obj-$(CONFIG_SENSORS_VT8231)	+= vt8231.o
-diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
-new file mode 100644
-index 0000000..1032355
 --- /dev/null
-+++ b/drivers/hwmon/via-cputemp.c
++++ work-2.6.29.4/drivers/hwmon/via-cputemp.c
 @@ -0,0 +1,354 @@
 +/*
 + * via-cputemp.c - Driver for VIA CPU core temperature monitoring
@@ -87,7 +73,7 @@ index 0000000..1032355
 +#include <asm/msr.h>
 +#include <asm/processor.h>
 +
-+#define DRVNAME	"via-cputemp"
++#define DRVNAME	"via_cputemp"
 +
 +typedef enum { SHOW_TEMP, SHOW_LABEL, SHOW_NAME } SHOW;
 +
@@ -131,7 +117,7 @@ index 0000000..1032355
 +	if (err)
 +		return -EAGAIN;
 +
-+	err = sprintf(buf, "%d\n", eax & 0xffffff);
++	err = sprintf(buf, "%d\n", (eax & 0xffffff) * 1000);
 +
 +	return err;
 +}

via-sdmmc.patch:

Index: via-sdmmc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/via-sdmmc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- via-sdmmc.patch	10 Jun 2009 19:00:55 -0000	1.1
+++ via-sdmmc.patch	12 Jun 2009 21:18:48 -0000	1.2
@@ -1,8 +1,20 @@
-Applying patch ../patches/1-linux-2.6-via.git-c86dc84dad56ae01978456400a5a08f93cf04a59.patch
+Subject: [MMC] via-sdmmc: v5 patch from lkml / April 01
+Now at patch ../patches/1-linux-2.6-via.git-c86dc84dad56ae01978456400a5a08f93cf04a59.patch
 
-Applying patch ../patches/2-linux-2.6-via.git-50c0d950d0465929fe7e47ac5cbb64d8b48d6ddc.patch
+Subject: via-sdmmc: some cosmetic cleanups
+Now at patch ../patches/2-linux-2.6-via.git-50c0d950d0465929fe7e47ac5cbb64d8b48d6ddc.patch
 
-Applying patch ../patches/3-linux-2.6-via.git-2ef0b437301d59814fab01401dcd458b7f7af73f.patch
+Subject: via-sdmmc: high-speed SD clock support, avoid overclocking
+Now at patch ../patches/3-linux-2.6-via.git-2ef0b437301d59814fab01401dcd458b7f7af73f.patch
+
+Subject: via-sdmmc: Fix SD highspeed support
+Now at patch ../patches/4-linux-2.6-via.git-93c0e75de32e746d70379c59a1e6986eae6ead74.patch
+
+Subject: [MMC] via-sdmmc: Fix syslog in case debugging is enabled
+Now at patch ../patches/5-linux-2.6-via.git-5ea96d44e4062a60889306ddbf6cb45ba78def8f.patch
+
+Subject: mmc: via-sdmmc: Add 500ms card detection delay
+Now at patch ../patches/6-linux-2.6-via.git-306f169772343398f8786ac76d8f0ce19abf5697.patch
 
 --- work-2.6.29.4.orig/drivers/mmc/host/Kconfig
 +++ work-2.6.29.4/drivers/mmc/host/Kconfig
@@ -33,7 +45,7 @@ Applying patch ../patches/3-linux-2.6-vi
  
 --- /dev/null
 +++ work-2.6.29.4/drivers/mmc/host/via-sdmmc.c
-@@ -0,0 +1,1326 @@
+@@ -0,0 +1,1329 @@
 +/*
 + *  drivers/mmc/host/via-sdmmc.c - VIA SD/MMC Card Reader driver
 + *  Copyright (c) 2008, VIA Technologies Inc. All Rights Reserved.
@@ -365,34 +377,35 @@ Applying patch ../patches/3-linux-2.6-vi
 +
 +static void via_print_sdchc(struct via_crdr_mmc_host *host)
 +{
-+	void __iomem *addrbase;
-+
-+	addrbase = host->sdhc_mmiobase;
++	void __iomem *addrbase = host->sdhc_mmiobase;
 +
 +	pr_debug("SDC MMIO Registers:\n");
-+	pr_debug("SDCONTROL=%x ,", readl(addrbase + VIA_CRDR_SDCTRL));
-+	pr_debug("SDCMDARG=%x ,", readl(addrbase + VIA_CRDR_SDCARG));
-+	pr_debug("SDBUSMODE=%x\n", readl(addrbase + VIA_CRDR_SDBUSMODE));
-+	pr_debug("SDBLKLEN=%x ,", readl(addrbase + VIA_CRDR_SDBLKLEN));
-+	pr_debug("SDCURBLKCNT=%x,", readl(addrbase + VIA_CRDR_SDCURBLKCNT));
-+	pr_debug("SDINTMASK=%x\n", readl(addrbase + VIA_CRDR_SDINTMASK));
-+	pr_debug("SDSTATUS=%x,", readl(addrbase + VIA_CRDR_SDSTATUS));
-+	pr_debug("SDCLKSEL=%x,", readl(addrbase + VIA_CRDR_SDCLKSEL));
-+	pr_debug("SDEXTCTRL=%x\n", readl(addrbase + VIA_CRDR_SDEXTCTRL));
++	pr_debug("SDCONTROL=%08x, SDCMDARG=%08x, SDBUSMODE=%08x\n",
++		 readl(addrbase + VIA_CRDR_SDCTRL),
++		 readl(addrbase + VIA_CRDR_SDCARG),
++		 readl(addrbase + VIA_CRDR_SDBUSMODE));
++	pr_debug("SDBLKLEN=%08x, SDCURBLKCNT=%08x, SDINTMASK=%08x\n",
++		 readl(addrbase + VIA_CRDR_SDBLKLEN),
++		 readl(addrbase + VIA_CRDR_SDCURBLKCNT),
++		 readl(addrbase + VIA_CRDR_SDINTMASK));
++	pr_debug("SDSTATUS=%08x, SDCLKSEL=%08x, SDEXTCTRL=%08x\n",
++		 readl(addrbase + VIA_CRDR_SDSTATUS),
++		 readl(addrbase + VIA_CRDR_SDCLKSEL),
++		 readl(addrbase + VIA_CRDR_SDEXTCTRL));
 +}
 +
 +static void via_print_pcictrl(struct via_crdr_mmc_host *host)
 +{
-+	void __iomem *addrbase;
-+
-+	addrbase = host->pcictrl_mmiobase;
++	void __iomem *addrbase = host->pcictrl_mmiobase;
 +
 +	pr_debug("PCI Control Registers:\n");
-+	pr_debug("PCICLKGATT=%x,", readb(addrbase + VIA_CRDR_PCICLKGATT));
-+	pr_debug("PCISDCCLK=%x,", readb(addrbase + VIA_CRDR_PCISDCCLK));
-+	pr_debug("PCIDMACLK=%x\n,", readb(addrbase + VIA_CRDR_PCIDMACLK));
-+	pr_debug("PCIINTCTRL=%x,", readb(addrbase + VIA_CRDR_PCIINTCTRL));
-+	pr_debug("PCIINTSTATUS=%x\n", readb(addrbase + VIA_CRDR_PCIINTSTATUS));
++	pr_debug("PCICLKGATT=%02x, PCISDCCLK=%02x, PCIDMACLK=%02x\n",
++		 readb(addrbase + VIA_CRDR_PCICLKGATT),
++		 readb(addrbase + VIA_CRDR_PCISDCCLK),
++		 readb(addrbase + VIA_CRDR_PCIDMACLK));
++	pr_debug("PCIINTCTRL=%02x, PCIINTSTATUS=%02x\n",
++		 readb(addrbase + VIA_CRDR_PCIINTCTRL),
++		 readb(addrbase + VIA_CRDR_PCIINTSTATUS));
 +}
 +
 +static void via_save_pcictrlreg(struct via_crdr_mmc_host *host)
@@ -754,7 +767,7 @@ Applying patch ../patches/3-linux-2.6-vi
 +	struct via_crdr_mmc_host *host;
 +	unsigned long flags;
 +	void __iomem *addrbase;
-+	u32 org_data;
++	u32 org_data, sdextctrl;
 +	u8 clock;
 +
 +	host = mmc_priv(mmc);
@@ -763,6 +776,7 @@ Applying patch ../patches/3-linux-2.6-vi
 +
 +	addrbase = host->sdhc_mmiobase;
 +	org_data = readl(addrbase + VIA_CRDR_SDBUSMODE);
++	sdextctrl = readl(addrbase + VIA_CRDR_SDEXTCTRL);
 +
 +	if (ios->bus_width == MMC_BUS_WIDTH_1)
 +		org_data &= ~VIA_CRDR_SDMODE_4BIT;
@@ -775,11 +789,12 @@ Applying patch ../patches/3-linux-2.6-vi
 +		org_data |= VIA_CRDR_SDMODE_POWER;
 +
 +	if (ios->timing == MMC_TIMING_SD_HS)
-+		org_data |= VIA_CRDR_SDEXTCTRL_HISPD;
++		sdextctrl |= VIA_CRDR_SDEXTCTRL_HISPD;
 +	else
-+		org_data &= ~VIA_CRDR_SDEXTCTRL_HISPD;
++		sdextctrl &= ~VIA_CRDR_SDEXTCTRL_HISPD;
 +
 +	writel(org_data, addrbase + VIA_CRDR_SDBUSMODE);
++	writel(sdextctrl, addrbase + VIA_CRDR_SDEXTCTRL);
 +
 +	if (ios->clock >= 48000000)
 +		clock = PCI_CLK_48M;
@@ -1055,7 +1070,7 @@ Applying patch ../patches/3-linux-2.6-vi
 +	via_print_pcictrl(host);
 +	via_print_sdchc(host);
 +
-+	mmc_detect_change(host->mmc, 0);
++	mmc_detect_change(host->mmc, msecs_to_jiffies(500));
 +}
 +
 +static void via_init_mmc_host(struct via_crdr_mmc_host *host)


