lkml.org 
[lkml]   [2011]   [Oct]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the mmc tree with the mips tree
Hi Chris,

Today's linux-next merge of the mmc tree got a conflict in
drivers/mmc/host/au1xmmc.c between commit 404b3fb0b766 ("MMC: au1xmmc:
Remove Alchemy CPU subtype dependencies") from the mips tree and commit
a0c8202a148f ("mmc: replace printk with appropriate display macro") from
the mmc tree.

I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc drivers/mmc/host/au1xmmc.c
index 56e7834,707bc7d..0000000
--- a/drivers/mmc/host/au1xmmc.c
+++ b/drivers/mmc/host/au1xmmc.c
@@@ -1036,12 -1028,11 +1036,11 @@@ static int __devinit au1xmmc_probe(stru
tasklet_init(&host->finish_task, au1xmmc_tasklet_finish,
(unsigned long)host);

-#ifdef CONFIG_SOC_AU1200
- ret = au1xmmc_dbdma_init(host);
- if (ret)
- pr_info(DRIVER_NAME ": DBDMA init failed; using PIO\n");
-#endif
+ if (has_dbdma()) {
+ ret = au1xmmc_dbdma_init(host);
+ if (ret)
- printk(KERN_INFO DRIVER_NAME ": DBDMA init failed; "
- "using PIO\n");
++ pr_info(DRIVER_NAME ": DBDMA init failed; using PIO\n");
+ }

#ifdef CONFIG_LEDS_CLASS
if (host->platdata && host->platdata->led) {
@@@ -1189,15 -1181,15 +1188,15 @@@ static struct platform_driver au1xmmc_d

static int __init au1xmmc_init(void)
{
-#ifdef CONFIG_SOC_AU1200
- /* DSCR_CMD0_ALWAYS has a stride of 32 bits, we need a stride
- * of 8 bits. And since devices are shared, we need to create
- * our own to avoid freaking out other devices.
- */
- memid = au1xxx_ddma_add_device(&au1xmmc_mem_dbdev);
- if (!memid)
- pr_err("au1xmmc: cannot add memory dbdma dev\n");
-#endif
+ if (has_dbdma()) {
+ /* DSCR_CMD0_ALWAYS has a stride of 32 bits, we need a stride
+ * of 8 bits. And since devices are shared, we need to create
+ * our own to avoid freaking out other devices.
+ */
+ memid = au1xxx_ddma_add_device(&au1xmmc_mem_dbdev);
+ if (!memid)
- printk(KERN_ERR "au1xmmc: cannot add memory dbdma\n");
++ pr_err("au1xmmc: cannot add memory dbdma dev\n");
+ }
return platform_driver_register(&au1xmmc_driver);
}

[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2011-10-12 05:17    [W:0.021 / U:0.128 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site