* [patch 1/5] s3cmci: Make general protocol errors less noisy
2008-10-10 10:32 [patch 0/5] MMC: S3C24XX updates for s3cmci driver Ben Dooks
@ 2008-10-10 10:32 ` Ben Dooks
2008-10-10 10:32 ` [patch 2/5] s3cmci: cpufreq support Ben Dooks
` (4 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Ben Dooks @ 2008-10-10 10:32 UTC (permalink / raw)
To: drzeus-mmc, linux-kernel, linux-arm-kernel; +Cc: Ben Dooks
[-- Attachment #1: simtec/simtec-drivers-mmc-make-errors-less-noisy.patch --]
[-- Type: text/plain, Size: 1028 bytes --]
General errors, such as timeouts during probe do not need to
be sent to the console, so move them down to be included if the
debug is enabled.
Such errors include:
s3c2440-sdi s3c2440-sdi: s3cmci_request: no medium present
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Index: linux-2.6.26-quilt8/drivers/mmc/host/s3cmci.c
===================================================================
--- linux-2.6.26-quilt8.orig/drivers/mmc/host/s3cmci.c 2008-08-11 22:38:12.000000000 +0100
+++ linux-2.6.26-quilt8/drivers/mmc/host/s3cmci.c 2008-08-11 22:45:52.000000000 +0100
@@ -39,9 +39,9 @@ enum dbg_channels {
dbg_conf = (1 << 8),
};
-static const int dbgmap_err = dbg_err | dbg_fail;
+static const int dbgmap_err = dbg_fail;
static const int dbgmap_info = dbg_info | dbg_conf;
-static const int dbgmap_debug = dbg_debug;
+static const int dbgmap_debug = dbg_err | dbg_debug;
#define dbg(host, channels, args...) \
do { \
--
Ben (ben@fluff.org, http://www.fluff.org/)
'a smiley only costs 4 bytes'
^ permalink raw reply [flat|nested] 9+ messages in thread* [patch 2/5] s3cmci: cpufreq support
2008-10-10 10:32 [patch 0/5] MMC: S3C24XX updates for s3cmci driver Ben Dooks
2008-10-10 10:32 ` [patch 1/5] s3cmci: Make general protocol errors less noisy Ben Dooks
@ 2008-10-10 10:32 ` Ben Dooks
2008-10-12 8:58 ` Pierre Ossman
2008-10-10 10:32 ` [patch 3/5] s3cmci: Support transfers which are not multiple of 32 bits Ben Dooks
` (3 subsequent siblings)
5 siblings, 1 reply; 9+ messages in thread
From: Ben Dooks @ 2008-10-10 10:32 UTC (permalink / raw)
To: drzeus-mmc, linux-kernel, linux-arm-kernel; +Cc: Ben Dooks
[-- Attachment #1: simtec/cpufreq/s3c24xx-cpufreq-driver-mmc.patch --]
[-- Type: text/plain, Size: 4985 bytes --]
Support for cpu frequency changing.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Index: linux-2.6.27-rc2-quilt3/drivers/mmc/host/s3cmci.c
===================================================================
--- linux-2.6.27-rc2-quilt3.orig/drivers/mmc/host/s3cmci.c 2008-08-12 20:10:07.000000000 +0100
+++ linux-2.6.27-rc2-quilt3/drivers/mmc/host/s3cmci.c 2008-08-12 20:12:39.000000000 +0100
@@ -13,6 +13,7 @@
#include <linux/clk.h>
#include <linux/mmc/host.h>
#include <linux/platform_device.h>
+#include <linux/cpufreq.h>
#include <linux/irq.h>
#include <linux/io.h>
@@ -1033,10 +1034,33 @@ static void s3cmci_request(struct mmc_ho
s3cmci_send_request(mmc);
}
+static void s3cmci_set_clk(struct s3cmci_host *host, struct mmc_ios *ios)
+{
+ u32 mci_psc;
+
+ /* Set clock */
+ for (mci_psc = 0; mci_psc < 255; mci_psc++) {
+ host->real_rate = host->clk_rate / (host->clk_div*(mci_psc+1));
+
+ if (host->real_rate <= ios->clock)
+ break;
+ }
+
+ if (mci_psc > 255)
+ mci_psc = 255;
+
+ host->prescaler = mci_psc;
+ writel(host->prescaler, host->base + S3C2410_SDIPRE);
+
+ /* If requested clock is 0, real_rate will be 0, too */
+ if (ios->clock == 0)
+ host->real_rate = 0;
+}
+
static void s3cmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
{
struct s3cmci_host *host = mmc_priv(mmc);
- u32 mci_psc, mci_con;
+ u32 mci_con;
/* Set the power state */
@@ -1074,23 +1098,7 @@ static void s3cmci_set_ios(struct mmc_ho
break;
}
- /* Set clock */
- for (mci_psc = 0; mci_psc < 255; mci_psc++) {
- host->real_rate = host->clk_rate / (host->clk_div*(mci_psc+1));
-
- if (host->real_rate <= ios->clock)
- break;
- }
-
- if (mci_psc > 255)
- mci_psc = 255;
-
- host->prescaler = mci_psc;
- writel(host->prescaler, host->base + S3C2410_SDIPRE);
-
- /* If requested clock is 0, real_rate will be 0, too */
- if (ios->clock == 0)
- host->real_rate = 0;
+ s3cmci_set_clk(host, ios);
/* Set CLOCK_ENABLE */
if (ios->clock)
@@ -1148,6 +1156,61 @@ static struct s3c24xx_mci_pdata s3cmci_d
* checks. Any zero fields to ensure reaonable defaults are picked. */
};
+#ifdef CONFIG_CPU_FREQ
+
+static int s3cmci_cpufreq_transition(struct notifier_block *nb,
+ unsigned long val, void *data)
+{
+ struct s3cmci_host *host;
+ struct mmc_host *mmc;
+ unsigned long newclk;
+ unsigned long flags;
+
+ host = container_of(nb, struct s3cmci_host, freq_transition);
+ newclk = clk_get_rate(host->clk);
+ mmc = host->mmc;
+
+ if ((val == CPUFREQ_PRECHANGE && host->clk_rate > newclk) ||
+ (val == CPUFREQ_POSTCHANGE && host->clk_rate < newclk)) {
+ spin_lock_irqsave(&mmc->lock, flags);
+
+ host->clk_rate = newclk;
+
+ if (mmc->ios.power_mode != MMC_POWER_OFF &&
+ mmc->ios.clock != 0)
+ s3cmci_set_clk(host, &mmc->ios);
+
+ spin_unlock_irqrestore(&mmc->lock, flags);
+ }
+
+ return 0;
+}
+
+static inline int s3cmci_cpufreq_register(struct s3cmci_host *host)
+{
+ host->freq_transition.notifier_call = s3cmci_cpufreq_transition;
+
+ return cpufreq_register_notifier(&host->freq_transition,
+ CPUFREQ_TRANSITION_NOTIFIER);
+}
+
+static inline void s3cmci_cpufreq_deregister(struct s3cmci_host *host)
+{
+ cpufreq_unregister_notifier(&host->freq_transition,
+ CPUFREQ_TRANSITION_NOTIFIER);
+}
+
+#else
+static inline int s3cmci_cpufreq_register(struct s3cmci_host *host)
+{
+ return 0;
+}
+
+static inline void s3cmci_cpufreq_deregister(struct s3cmci_host *host)
+{
+}
+#endif
+
static int __devinit s3cmci_probe(struct platform_device *pdev, int is2440)
{
struct s3cmci_host *host;
@@ -1298,10 +1361,16 @@ static int __devinit s3cmci_probe(struct
(host->is2440?"2440":""),
host->base, host->irq, host->irq_cd, host->dma);
+ ret = s3cmci_cpufreq_register(host);
+ if (ret) {
+ dev_err(&pdev->dev, "failed to register cpufreq\n");
+ goto free_dmabuf;
+ }
+
ret = mmc_add_host(mmc);
if (ret) {
dev_err(&pdev->dev, "failed to add mmc host.\n");
- goto free_dmabuf;
+ goto free_cpufreq;
}
platform_set_drvdata(pdev, mmc);
@@ -1309,6 +1378,9 @@ static int __devinit s3cmci_probe(struct
return 0;
+ free_cpufreq:
+ s3cmci_cpufreq_deregister(host);
+
free_dmabuf:
clk_disable(host->clk);
@@ -1342,6 +1414,7 @@ static void s3cmci_shutdown(struct platf
if (host->irq_cd >= 0)
free_irq(host->irq_cd, host);
+ s3cmci_cpufreq_deregister(host);
mmc_remove_host(mmc);
clk_disable(host->clk);
}
Index: linux-2.6.27-rc2-quilt3/drivers/mmc/host/s3cmci.h
===================================================================
--- linux-2.6.27-rc2-quilt3.orig/drivers/mmc/host/s3cmci.h 2008-08-12 20:10:07.000000000 +0100
+++ linux-2.6.27-rc2-quilt3/drivers/mmc/host/s3cmci.h 2008-08-12 20:10:29.000000000 +0100
@@ -67,4 +67,8 @@ struct s3cmci_host {
unsigned int ccnt, dcnt;
struct tasklet_struct pio_tasklet;
+
+#ifdef CONFIG_CPU_FREQ
+ struct notifier_block freq_transition;
+#endif
};
--
Ben (ben@fluff.org, http://www.fluff.org/)
'a smiley only costs 4 bytes'
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [patch 2/5] s3cmci: cpufreq support
2008-10-10 10:32 ` [patch 2/5] s3cmci: cpufreq support Ben Dooks
@ 2008-10-12 8:58 ` Pierre Ossman
0 siblings, 0 replies; 9+ messages in thread
From: Pierre Ossman @ 2008-10-12 8:58 UTC (permalink / raw)
To: Ben Dooks; +Cc: linux-kernel, linux-arm-kernel, Ben Dooks
On Fri, 10 Oct 2008 11:32:23 +0100
Ben Dooks <ben-linux@fluff.org> wrote:
> + host = container_of(nb, struct s3cmci_host, freq_transition);
> + newclk = clk_get_rate(host->clk);
> + mmc = host->mmc;
> +
> + if ((val == CPUFREQ_PRECHANGE && host->clk_rate > newclk) ||
> + (val == CPUFREQ_POSTCHANGE && host->clk_rate < newclk)) {
Isn't this backwards? The goal should be to avoid overclocking the
card, so if the old clock (which I assume is clk_rate) is slower than
the new clock (newclk), then we should adjust before the change happens,
temporarily underclocking the card.
(and vice versa for when the old clock is faster than the new clock)
--
-- Pierre Ossman
Linux kernel, MMC maintainer http://www.kernel.org
rdesktop, core developer http://www.rdesktop.org
WARNING: This correspondence is being monitored by the
Swedish government. Make sure your server uses encryption
for SMTP traffic and consider using PGP for end-to-end
encryption.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [patch 3/5] s3cmci: Support transfers which are not multiple of 32 bits.
2008-10-10 10:32 [patch 0/5] MMC: S3C24XX updates for s3cmci driver Ben Dooks
2008-10-10 10:32 ` [patch 1/5] s3cmci: Make general protocol errors less noisy Ben Dooks
2008-10-10 10:32 ` [patch 2/5] s3cmci: cpufreq support Ben Dooks
@ 2008-10-10 10:32 ` Ben Dooks
2008-10-10 10:32 ` [patch 4/5] s3cmci: fix continual accesses to host->pio_ptr Ben Dooks
` (2 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Ben Dooks @ 2008-10-10 10:32 UTC (permalink / raw)
To: drzeus-mmc, linux-kernel, linux-arm-kernel; +Cc: Christer Weinigel, Ben Dooks
[-- Attachment #1: thirdparty/christer-mmc-byte-alignment.patch --]
[-- Type: text/plain, Size: 6890 bytes --]
From: Christer Weinigel <christer@weinigel.se>
To be able to do SDIO the s3cmci driver has to support non-word-sized
transfers. Change pio_words into pio_bytes and fix up all the places
where it is used.
This variant of the patch will not overrun the buffer when reading an
odd number of bytes. When writing, this variant will still read past
the end of the buffer, but since the driver can't support non-word-
aligned transfers anyway, this should not be a problem, since a
word-aligned transfer will never cross a page boundary.
This has been tested with a CSR SDIO Bluetooth Type A device on a
Samsung S3C24A0 processor.
Signed-off-by: Christer Weinigel <christer@weinigel.se>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Index: linux-2.6.27-rc5-quilt1/drivers/mmc/host/s3cmci.c
===================================================================
--- linux-2.6.27-rc5-quilt1.orig/drivers/mmc/host/s3cmci.c 2008-09-04 11:35:38.000000000 +0100
+++ linux-2.6.27-rc5-quilt1/drivers/mmc/host/s3cmci.c 2008-09-08 16:23:58.000000000 +0100
@@ -190,7 +190,7 @@ static inline void clear_imask(struct s3
}
static inline int get_data_buffer(struct s3cmci_host *host,
- u32 *words, u32 **pointer)
+ u32 *bytes, u32 **pointer)
{
struct scatterlist *sg;
@@ -207,7 +207,7 @@ static inline int get_data_buffer(struct
}
sg = &host->mrq->data->sg[host->pio_sgptr];
- *words = sg->length >> 2;
+ *bytes = sg->length;
*pointer = sg_virt(sg);
host->pio_sgptr++;
@@ -223,7 +223,7 @@ static inline u32 fifo_count(struct s3cm
u32 fifostat = readl(host->base + S3C2410_SDIFSTA);
fifostat &= S3C2410_SDIFSTA_COUNTMASK;
- return fifostat >> 2;
+ return fifostat;
}
static inline u32 fifo_free(struct s3cmci_host *host)
@@ -231,13 +231,14 @@ static inline u32 fifo_free(struct s3cmc
u32 fifostat = readl(host->base + S3C2410_SDIFSTA);
fifostat &= S3C2410_SDIFSTA_COUNTMASK;
- return (63 - fifostat) >> 2;
+ return 63 - fifostat;
}
static void do_pio_read(struct s3cmci_host *host)
{
int res;
u32 fifo;
+ u32 fifo_words;
void __iomem *from_ptr;
/* write real prescaler to host, it might be set slow to fix */
@@ -246,8 +247,8 @@ static void do_pio_read(struct s3cmci_ho
from_ptr = host->base + host->sdidata;
while ((fifo = fifo_count(host))) {
- if (!host->pio_words) {
- res = get_data_buffer(host, &host->pio_words,
+ if (!host->pio_bytes) {
+ res = get_data_buffer(host, &host->pio_bytes,
&host->pio_ptr);
if (res) {
host->pio_active = XFER_NONE;
@@ -260,26 +261,45 @@ static void do_pio_read(struct s3cmci_ho
dbg(host, dbg_pio,
"pio_read(): new target: [%i]@[%p]\n",
- host->pio_words, host->pio_ptr);
+ host->pio_bytes, host->pio_ptr);
}
dbg(host, dbg_pio,
"pio_read(): fifo:[%02i] buffer:[%03i] dcnt:[%08X]\n",
- fifo, host->pio_words,
+ fifo, host->pio_bytes,
readl(host->base + S3C2410_SDIDCNT));
- if (fifo > host->pio_words)
- fifo = host->pio_words;
+ /* If we have reached the end of the block, we can
+ * read a word and get 1 to 3 bytes. If we in the
+ * middle of the block, we have to read full words,
+ * otherwise we will write garbage, so round down to
+ * an even multiple of 4. */
+ if (fifo >= host->pio_bytes)
+ fifo = host->pio_bytes;
+ else
+ fifo -= fifo & 3;
- host->pio_words -= fifo;
+ host->pio_bytes -= fifo;
host->pio_count += fifo;
- while (fifo--)
+ fifo_words = fifo >> 2;
+ while (fifo_words--)
*(host->pio_ptr++) = readl(from_ptr);
+
+ if (fifo & 3) {
+ u32 n = fifo & 3;
+ u32 data = readl(from_ptr);
+ u8 *p = (u8 *)host->pio_ptr;
+
+ while (n--) {
+ *p++ = data;
+ data >>= 8;
+ }
+ }
}
- if (!host->pio_words) {
- res = get_data_buffer(host, &host->pio_words, &host->pio_ptr);
+ if (!host->pio_bytes) {
+ res = get_data_buffer(host, &host->pio_bytes, &host->pio_ptr);
if (res) {
dbg(host, dbg_pio,
"pio_read(): complete (no more buffers).\n");
@@ -303,8 +323,8 @@ static void do_pio_write(struct s3cmci_h
to_ptr = host->base + host->sdidata;
while ((fifo = fifo_free(host))) {
- if (!host->pio_words) {
- res = get_data_buffer(host, &host->pio_words,
+ if (!host->pio_bytes) {
+ res = get_data_buffer(host, &host->pio_bytes,
&host->pio_ptr);
if (res) {
dbg(host, dbg_pio,
@@ -316,16 +336,23 @@ static void do_pio_write(struct s3cmci_h
dbg(host, dbg_pio,
"pio_write(): new source: [%i]@[%p]\n",
- host->pio_words, host->pio_ptr);
+ host->pio_bytes, host->pio_ptr);
}
- if (fifo > host->pio_words)
- fifo = host->pio_words;
+ /* If we have reached the end of the block, we have to
+ * write exactly the remaining number of bytes. If we
+ * in the middle of the block, we have to write full
+ * words, so round down to an even multiple of 4. */
+ if (fifo >= host->pio_bytes)
+ fifo = host->pio_bytes;
+ else
+ fifo -= fifo & 3;
- host->pio_words -= fifo;
+ host->pio_bytes -= fifo;
host->pio_count += fifo;
+ fifo = (fifo + 3) >> 2;
while (fifo--)
writel(*(host->pio_ptr++), to_ptr);
}
@@ -350,9 +377,9 @@ static void pio_tasklet(unsigned long da
clear_imask(host);
if (host->pio_active != XFER_NONE) {
dbg(host, dbg_err, "unfinished %s "
- "- pio_count:[%u] pio_words:[%u]\n",
+ "- pio_count:[%u] pio_bytes:[%u]\n",
(host->pio_active == XFER_READ) ? "read" : "write",
- host->pio_count, host->pio_words);
+ host->pio_count, host->pio_bytes);
if (host->mrq->data)
host->mrq->data->error = -EINVAL;
@@ -813,11 +840,10 @@ static int s3cmci_setup_data(struct s3cm
/* We cannot deal with unaligned blocks with more than
* one block being transfered. */
- if (data->blocks > 1)
+ if (data->blocks > 1) {
+ pr_warning("%s: can't do non-word sized block transfers (blksz %d)\n", __func__, data->blksz);
return -EINVAL;
-
- /* No support yet for non-word block transfers. */
- return -EINVAL;
+ }
}
while (readl(host->base + S3C2410_SDIDSTA) &
@@ -897,7 +923,7 @@ static int s3cmci_prepare_pio(struct s3c
BUG_ON((data->flags & BOTH_DIR) == BOTH_DIR);
host->pio_sgptr = 0;
- host->pio_words = 0;
+ host->pio_bytes = 0;
host->pio_count = 0;
host->pio_active = rw ? XFER_WRITE : XFER_READ;
Index: linux-2.6.27-rc5-quilt1/drivers/mmc/host/s3cmci.h
===================================================================
--- linux-2.6.27-rc5-quilt1.orig/drivers/mmc/host/s3cmci.h 2008-09-04 11:35:38.000000000 +0100
+++ linux-2.6.27-rc5-quilt1/drivers/mmc/host/s3cmci.h 2008-09-08 16:23:58.000000000 +0100
@@ -51,7 +51,7 @@ struct s3cmci_host {
int dma_complete;
u32 pio_sgptr;
- u32 pio_words;
+ u32 pio_bytes;
u32 pio_count;
u32 *pio_ptr;
#define XFER_NONE 0
--
Ben (ben@fluff.org, http://www.fluff.org/)
'a smiley only costs 4 bytes'
^ permalink raw reply [flat|nested] 9+ messages in thread* [patch 4/5] s3cmci: fix continual accesses to host->pio_ptr
2008-10-10 10:32 [patch 0/5] MMC: S3C24XX updates for s3cmci driver Ben Dooks
` (2 preceding siblings ...)
2008-10-10 10:32 ` [patch 3/5] s3cmci: Support transfers which are not multiple of 32 bits Ben Dooks
@ 2008-10-10 10:32 ` Ben Dooks
2008-10-10 10:32 ` [patch 5/5] s3cmci: Add Ben Dooks/Simtec Electronics to header & copyright Ben Dooks
2008-10-12 8:53 ` [patch 0/5] MMC: S3C24XX updates for s3cmci driver Pierre Ossman
5 siblings, 0 replies; 9+ messages in thread
From: Ben Dooks @ 2008-10-10 10:32 UTC (permalink / raw)
To: drzeus-mmc, linux-kernel, linux-arm-kernel; +Cc: Ben Dooks
[-- Attachment #1: simtec/s3c24xx-mmc-faster-transfer-core.patch --]
[-- Type: text/plain, Size: 2146 bytes --]
The s3cmci driver uses the host->pio_ptr field to
point to the current position into the buffer for data
transfer. During the transfers it does the following:
while (fifo_words--)
*(host->pio_ptr++) = readl(from_ptr);
This is inefficent, as host->pio_ptr is not used in any
other part of the transfer but the compiler emits code
which does the following:
while (fifo_words--) {
u32 *ptr = host->pio_ptr;
*ptr = readl(from_ptr);
ptr++;
host->pio_ptr = ptr;
}
This is obviously a waste of a load and store each time
around the loop, which could be up to 16 times depending
on how much needs to be transfered.
Move the ptr accesses to outside the while loop so that
we do not end up reloading/re-writing the pointer.
Note, this seems to make the code 16 bytes larger.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Index: linux-2.6.27-rc5-quilt1/drivers/mmc/host/s3cmci.c
===================================================================
--- linux-2.6.27-rc5-quilt1.orig/drivers/mmc/host/s3cmci.c 2008-09-08 16:50:27.000000000 +0100
+++ linux-2.6.27-rc5-quilt1/drivers/mmc/host/s3cmci.c 2008-09-08 16:52:21.000000000 +0100
@@ -238,6 +238,7 @@ static void do_pio_read(struct s3cmci_ho
{
int res;
u32 fifo;
+ u32 *ptr;
u32 fifo_words;
void __iomem *from_ptr;
@@ -283,8 +284,10 @@ static void do_pio_read(struct s3cmci_ho
host->pio_count += fifo;
fifo_words = fifo >> 2;
+ ptr = host->pio_ptr;
while (fifo_words--)
- *(host->pio_ptr++) = readl(from_ptr);
+ *ptr++ = readl(from_ptr);
+ host->pio_ptr = ptr;
if (fifo & 3) {
u32 n = fifo & 3;
@@ -319,6 +322,7 @@ static void do_pio_write(struct s3cmci_h
void __iomem *to_ptr;
int res;
u32 fifo;
+ u32 *ptr;
to_ptr = host->base + host->sdidata;
@@ -353,8 +357,10 @@ static void do_pio_write(struct s3cmci_h
host->pio_count += fifo;
fifo = (fifo + 3) >> 2;
+ ptr = host->pio_ptr;
while (fifo--)
- writel(*(host->pio_ptr++), to_ptr);
+ writel(*ptr++, to_ptr);
+ host->pio_ptr = ptr;
}
enable_imask(host, S3C2410_SDIIMSK_TXFIFOHALF);
--
Ben (ben@fluff.org, http://www.fluff.org/)
'a smiley only costs 4 bytes'
^ permalink raw reply [flat|nested] 9+ messages in thread* [patch 5/5] s3cmci: Add Ben Dooks/Simtec Electronics to header & copyright
2008-10-10 10:32 [patch 0/5] MMC: S3C24XX updates for s3cmci driver Ben Dooks
` (3 preceding siblings ...)
2008-10-10 10:32 ` [patch 4/5] s3cmci: fix continual accesses to host->pio_ptr Ben Dooks
@ 2008-10-10 10:32 ` Ben Dooks
2008-10-12 8:53 ` [patch 0/5] MMC: S3C24XX updates for s3cmci driver Pierre Ossman
5 siblings, 0 replies; 9+ messages in thread
From: Ben Dooks @ 2008-10-10 10:32 UTC (permalink / raw)
To: drzeus-mmc, linux-kernel, linux-arm-kernel; +Cc: Ben Dooks
[-- Attachment #1: simtec/drivers-s3c24xx-mmc-add-us-to-copyright-header.patch --]
[-- Type: text/plain, Size: 1592 bytes --]
Since the original authour (Thomas Kleffel) has been too busy to
merge the s3cmci driver and keep it up to date, I (mostly as part
of my role with Simtec Electronics) got the driver to a mergable
state and have been maintaining it since I think that I should
be added to the header. Also add a copyright statement for the
new work.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Index: linux-2.6.27-rc6-quilt3/drivers/mmc/host/s3cmci.c
===================================================================
--- linux-2.6.27-rc6-quilt3.orig/drivers/mmc/host/s3cmci.c 2008-09-21 21:06:47.000000000 +0100
+++ linux-2.6.27-rc6-quilt3/drivers/mmc/host/s3cmci.c 2008-09-21 21:10:24.000000000 +0100
@@ -3,6 +3,9 @@
*
* Copyright (C) 2004-2006 maintech GmbH, Thomas Kleffel <tk@maintech.de>
*
+ * Current driver maintained by Ben Dooks and Simtec Electronics
+ * Copyright (C) 2008 Simtec Electronics <ben-linux@fluff.org>
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
@@ -1560,7 +1563,7 @@ module_exit(s3cmci_exit);
MODULE_DESCRIPTION("Samsung S3C MMC/SD Card Interface driver");
MODULE_LICENSE("GPL v2");
-MODULE_AUTHOR("Thomas Kleffel <tk@maintech.de>");
+MODULE_AUTHOR("Thomas Kleffel <tk@maintech.de>, Ben Dooks <ben-linux@fluff.org>");
MODULE_ALIAS("platform:s3c2410-sdi");
MODULE_ALIAS("platform:s3c2412-sdi");
MODULE_ALIAS("platform:s3c2440-sdi");
--
Ben (ben@fluff.org, http://www.fluff.org/)
'a smiley only costs 4 bytes'
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [patch 0/5] MMC: S3C24XX updates for s3cmci driver
2008-10-10 10:32 [patch 0/5] MMC: S3C24XX updates for s3cmci driver Ben Dooks
` (4 preceding siblings ...)
2008-10-10 10:32 ` [patch 5/5] s3cmci: Add Ben Dooks/Simtec Electronics to header & copyright Ben Dooks
@ 2008-10-12 8:53 ` Pierre Ossman
5 siblings, 0 replies; 9+ messages in thread
From: Pierre Ossman @ 2008-10-12 8:53 UTC (permalink / raw)
To: Ben Dooks; +Cc: linux-kernel, linux-arm-kernel
On Fri, 10 Oct 2008 11:32:21 +0100
Ben Dooks <ben-linux@fluff.org> wrote:
> Updates and fixes for drivers/mmc/host/s3cmci.c
>
In the future, please try to send them a bit earlier so that I have a
reasonable amount of time to look at them. It also doesn't hurt to have
them in linux-next for a bit (which might be a requirement soon anyway).
Rgds
--
-- Pierre Ossman
Linux kernel, MMC maintainer http://www.kernel.org
rdesktop, core developer http://www.rdesktop.org
WARNING: This correspondence is being monitored by the
Swedish government. Make sure your server uses encryption
for SMTP traffic and consider using PGP for end-to-end
encryption.
^ permalink raw reply [flat|nested] 9+ messages in thread