* [PATCH v2 0/2] add support for the Marvell Dove SDHCI controller @ 2010-10-27 11:21 Mike Rapoport 2010-10-27 11:21 ` [PATCH v2 1/2] MMC: " Mike Rapoport 2010-10-27 11:21 ` [PATCH v2 2/2] [ARM] Dove: rename SDCHI devices to "sdhci-dove" Mike Rapoport 0 siblings, 2 replies; 7+ messages in thread From: Mike Rapoport @ 2010-10-27 11:21 UTC (permalink / raw) To: linux-arm-kernel These patches add support for the Marvell Dove SDHCI controller. v2 changes: * rename drivers/mmc/host/sdhci-mv.c to drivers/mmc/host/sdhci-dove.c and update Kconfig and Makefile respectively * add dependancy on ARCH_DOVE * remove unneeded includes from the driver Mike Rapoport (2): MMC: add support for the Marvell Dove SDHCI controller [ARM] Dove: rename SDCHI devices to "sdhci-dove" arch/arm/mach-dove/common.c | 4 +- drivers/mmc/host/Kconfig | 13 +++++++ drivers/mmc/host/Makefile | 1 + drivers/mmc/host/sdhci-dove.c | 72 ++++++++++++++++++++++++++++++++++++++++ drivers/mmc/host/sdhci-pltfm.c | 3 ++ drivers/mmc/host/sdhci-pltfm.h | 1 + 6 files changed, 92 insertions(+), 2 deletions(-) create mode 100644 drivers/mmc/host/sdhci-dove.c -- 1.7.3.1 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 1/2] MMC: add support for the Marvell Dove SDHCI controller 2010-10-27 11:21 [PATCH v2 0/2] add support for the Marvell Dove SDHCI controller Mike Rapoport @ 2010-10-27 11:21 ` Mike Rapoport 2010-10-27 11:56 ` Chris Ball 2010-10-27 11:21 ` [PATCH v2 2/2] [ARM] Dove: rename SDCHI devices to "sdhci-dove" Mike Rapoport 1 sibling, 1 reply; 7+ messages in thread From: Mike Rapoport @ 2010-10-27 11:21 UTC (permalink / raw) To: linux-arm-kernel Signed-off-by: Mike Rapoport <mike@compulab.co.il> CC: Saeed Bishara <saeed@marvell.com> --- drivers/mmc/host/Kconfig | 13 +++++++ drivers/mmc/host/Makefile | 1 + drivers/mmc/host/sdhci-dove.c | 72 ++++++++++++++++++++++++++++++++++++++++ drivers/mmc/host/sdhci-pltfm.c | 3 ++ drivers/mmc/host/sdhci-pltfm.h | 1 + 5 files changed, 90 insertions(+), 0 deletions(-) create mode 100644 drivers/mmc/host/sdhci-dove.c diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index 68d1279..4958839 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -130,6 +130,19 @@ config MMC_SDHCI_CNS3XXX If unsure, say N. +config MMC_SDHCI_DOVE + bool "SDHCI support on Marvell's Dove SoC" + depends on ARCH_DOVE + depends on MMC_SDHCI_PLTFM + select MMC_SDHCI_IO_ACCESSORS + help + This selects the Secure Digital Host Controller Interface in + Marvell's Dove SoC. + + If you have a controller with this interface, say Y or M here. + + If unsure, say N. + config MMC_SDHCI_S3C tristate "SDHCI support on Samsung S3C SoC" depends on MMC_SDHCI && PLAT_SAMSUNG diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile index 840bcb5..9e1c418 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile @@ -40,6 +40,7 @@ obj-$(CONFIG_MMC_JZ4740) += jz4740_mmc.o obj-$(CONFIG_MMC_SDHCI_PLTFM) += sdhci-platform.o sdhci-platform-y := sdhci-pltfm.o sdhci-platform-$(CONFIG_MMC_SDHCI_CNS3XXX) += sdhci-cns3xxx.o +sdhci-platform-$(CONFIG_MMC_SDHCI_DOVE) += sdhci-dove.o obj-$(CONFIG_MMC_SDHCI_OF) += sdhci-of.o sdhci-of-y := sdhci-of-core.o diff --git a/drivers/mmc/host/sdhci-dove.c b/drivers/mmc/host/sdhci-dove.c new file mode 100644 index 0000000..ac844d1 --- /dev/null +++ b/drivers/mmc/host/sdhci-dove.c @@ -0,0 +1,72 @@ +/* + * sdhci-dove.c Support for SDHCI on Marvell's Dove SoC + * + * Author: Saeed Bishara <saeed@marvell.com> + * Based on sdhci-cns3xxx.c + * + * 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. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +/* #include <linux/clk.h> */ +/* #include <linux/delay.h> */ +#include <linux/err.h> +#include <linux/platform_device.h> +#include <linux/io.h> +#include <linux/mmc/host.h> +#include "sdhci.h" +#include "sdhci-pltfm.h" + +static u16 sdhci_dove_readw(struct sdhci_host *host, int reg) +{ + u16 ret; + + switch (reg) { + case SDHCI_HOST_VERSION: + case SDHCI_SLOT_INT_STATUS: + /* those registers don't exist */ + return 0; + default: + ret = readw(host->ioaddr + reg); + } + return ret; +} + +static u32 sdhci_dove_readl(struct sdhci_host *host, int reg) +{ + u32 ret; + + switch (reg) { + case SDHCI_CAPABILITIES: + ret = readl(host->ioaddr + reg); + /* Mask the support for 3.0V */ + ret &= ~SDHCI_CAN_VDD_300; + break; + default: + ret = readl(host->ioaddr + reg); + } + return ret; +} + +static struct sdhci_ops sdhci_dove_ops = { + .read_w = sdhci_dove_readw, + .read_l = sdhci_dove_readl, +}; + +struct sdhci_pltfm_data sdhci_dove_pdata = { + .ops = &sdhci_dove_ops, + .quirks = SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER | + SDHCI_QUIRK_NO_BUSY_IRQ | + SDHCI_QUIRK_BROKEN_TIMEOUT_VAL | + SDHCI_QUIRK_FORCE_DMA, +}; diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c index e045e3c..28d818e 100644 --- a/drivers/mmc/host/sdhci-pltfm.c +++ b/drivers/mmc/host/sdhci-pltfm.c @@ -161,6 +161,9 @@ static const struct platform_device_id sdhci_pltfm_ids[] = { #ifdef CONFIG_MMC_SDHCI_CNS3XXX { "sdhci-cns3xxx", (kernel_ulong_t)&sdhci_cns3xxx_pdata }, #endif +#ifdef CONFIG_MMC_SDHCI_DOVE + { "sdhci-dove", (kernel_ulong_t)&sdhci_dove_pdata }, +#endif { }, }; MODULE_DEVICE_TABLE(platform, sdhci_pltfm_ids); diff --git a/drivers/mmc/host/sdhci-pltfm.h b/drivers/mmc/host/sdhci-pltfm.h index 900f329..718d837 100644 --- a/drivers/mmc/host/sdhci-pltfm.h +++ b/drivers/mmc/host/sdhci-pltfm.h @@ -14,5 +14,6 @@ #include <linux/sdhci-pltfm.h> extern struct sdhci_pltfm_data sdhci_cns3xxx_pdata; +extern struct sdhci_pltfm_data sdhci_dove_pdata; #endif /* _DRIVERS_MMC_SDHCI_PLTFM_H */ -- 1.7.3.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v2 1/2] MMC: add support for the Marvell Dove SDHCI controller 2010-10-27 11:21 ` [PATCH v2 1/2] MMC: " Mike Rapoport @ 2010-10-27 11:56 ` Chris Ball 2010-10-27 12:35 ` Saeed Bishara 2010-10-27 12:41 ` Mike Rapoport 0 siblings, 2 replies; 7+ messages in thread From: Chris Ball @ 2010-10-27 11:56 UTC (permalink / raw) To: linux-arm-kernel Hi Mike, adding Wolfram to CC in case he has comments, On Wed, Oct 27, 2010 at 01:21:58PM +0200, Mike Rapoport wrote: > Let's add a little text here -- something like "Implement an sdhci-pltfm driver for the controller found on Marvell Dove and MMP SoCs" is fine. > Signed-off-by: Mike Rapoport <mike@compulab.co.il> > CC: Saeed Bishara <saeed@marvell.com> > --- > drivers/mmc/host/Kconfig | 13 +++++++ > drivers/mmc/host/Makefile | 1 + > drivers/mmc/host/sdhci-dove.c | 72 ++++++++++++++++++++++++++++++++++++++++ > drivers/mmc/host/sdhci-pltfm.c | 3 ++ > drivers/mmc/host/sdhci-pltfm.h | 1 + > 5 files changed, 90 insertions(+), 0 deletions(-) > create mode 100644 drivers/mmc/host/sdhci-dove.c > > diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig > index 68d1279..4958839 100644 > --- a/drivers/mmc/host/Kconfig > +++ b/drivers/mmc/host/Kconfig > @@ -130,6 +130,19 @@ config MMC_SDHCI_CNS3XXX > > If unsure, say N. > > +config MMC_SDHCI_DOVE > + bool "SDHCI support on Marvell's Dove SoC" > + depends on ARCH_DOVE The previous submission included ARCH_MMP, so I expect you'll want to resubmit with the extra dependency added once Saeed replies. > + depends on MMC_SDHCI_PLTFM > + select MMC_SDHCI_IO_ACCESSORS > + help > + This selects the Secure Digital Host Controller Interface in > + Marvell's Dove SoC. > + > + If you have a controller with this interface, say Y or M here. > + > + If unsure, say N. > + > config MMC_SDHCI_S3C > tristate "SDHCI support on Samsung S3C SoC" > depends on MMC_SDHCI && PLAT_SAMSUNG > diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile > index 840bcb5..9e1c418 100644 > --- a/drivers/mmc/host/Makefile > +++ b/drivers/mmc/host/Makefile > @@ -40,6 +40,7 @@ obj-$(CONFIG_MMC_JZ4740) += jz4740_mmc.o > obj-$(CONFIG_MMC_SDHCI_PLTFM) += sdhci-platform.o > sdhci-platform-y := sdhci-pltfm.o > sdhci-platform-$(CONFIG_MMC_SDHCI_CNS3XXX) += sdhci-cns3xxx.o > +sdhci-platform-$(CONFIG_MMC_SDHCI_DOVE) += sdhci-dove.o > > obj-$(CONFIG_MMC_SDHCI_OF) += sdhci-of.o > sdhci-of-y := sdhci-of-core.o > diff --git a/drivers/mmc/host/sdhci-dove.c b/drivers/mmc/host/sdhci-dove.c > new file mode 100644 > index 0000000..ac844d1 > --- /dev/null > +++ b/drivers/mmc/host/sdhci-dove.c > @@ -0,0 +1,72 @@ > +/* > + * sdhci-dove.c Support for SDHCI on Marvell's Dove SoC > + * > + * Author: Saeed Bishara <saeed@marvell.com> If Saeed is indeed the author of this code, the commit should be: From: Saeed Bishara <saeed@marvell.com> rather than in your name. (If it's not correct, it should be changed.) > + * Based on sdhci-cns3xxx.c > + * > + * 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. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, write to the Free Software > + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. > + */ > + > +/* #include <linux/clk.h> */ > +/* #include <linux/delay.h> */ Please don't submit commented out code to mainline -- if these aren't needed, they should just be dropped. Thanks! -- Chris Ball <cjb@laptop.org> <http://printf.net/> One Laptop Per Child ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 1/2] MMC: add support for the Marvell Dove SDHCI controller 2010-10-27 11:56 ` Chris Ball @ 2010-10-27 12:35 ` Saeed Bishara 2010-10-27 13:52 ` Haojian Zhuang 2010-10-27 12:41 ` Mike Rapoport 1 sibling, 1 reply; 7+ messages in thread From: Saeed Bishara @ 2010-10-27 12:35 UTC (permalink / raw) To: linux-arm-kernel > >Let's add a little text here -- something like "Implement an >sdhci-pltfm >driver for the controller found on Marvell Dove and MMP SoCs" is fine. This driver for Dove only. I think MMP uses sdhci-pxa. > >> Signed-off-by: Mike Rapoport <mike@compulab.co.il> >> CC: Saeed Bishara <saeed@marvell.com> > >> --- >> drivers/mmc/host/Kconfig | 13 +++++++ >> drivers/mmc/host/Makefile | 1 + >> drivers/mmc/host/sdhci-dove.c | 72 >++++++++++++++++++++++++++++++++++++++++ >> drivers/mmc/host/sdhci-pltfm.c | 3 ++ >> drivers/mmc/host/sdhci-pltfm.h | 1 + >> 5 files changed, 90 insertions(+), 0 deletions(-) >> create mode 100644 drivers/mmc/host/sdhci-dove.c >> >> diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig >> index 68d1279..4958839 100644 >> --- a/drivers/mmc/host/Kconfig >> +++ b/drivers/mmc/host/Kconfig >> @@ -130,6 +130,19 @@ config MMC_SDHCI_CNS3XXX >> >> If unsure, say N. >> >> +config MMC_SDHCI_DOVE >> + bool "SDHCI support on Marvell's Dove SoC" >> + depends on ARCH_DOVE > >The previous submission included ARCH_MMP, so I expect you'll want to >resubmit with the extra dependency added once Saeed replies. > >> + depends on MMC_SDHCI_PLTFM >> + select MMC_SDHCI_IO_ACCESSORS >> + help >> + This selects the Secure Digital Host Controller Interface in >> + Marvell's Dove SoC. >> + >> + If you have a controller with this interface, say Y or M here. >> + >> + If unsure, say N. >> + >> config MMC_SDHCI_S3C >> tristate "SDHCI support on Samsung S3C SoC" >> depends on MMC_SDHCI && PLAT_SAMSUNG >> diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile >> index 840bcb5..9e1c418 100644 >> --- a/drivers/mmc/host/Makefile >> +++ b/drivers/mmc/host/Makefile >> @@ -40,6 +40,7 @@ obj-$(CONFIG_MMC_JZ4740) += jz4740_mmc.o >> obj-$(CONFIG_MMC_SDHCI_PLTFM) += >sdhci-platform.o >> sdhci-platform-y := sdhci-pltfm.o >> sdhci-platform-$(CONFIG_MMC_SDHCI_CNS3XXX) += sdhci-cns3xxx.o >> +sdhci-platform-$(CONFIG_MMC_SDHCI_DOVE) += sdhci-dove.o >> >> obj-$(CONFIG_MMC_SDHCI_OF) += sdhci-of.o >> sdhci-of-y := sdhci-of-core.o >> diff --git a/drivers/mmc/host/sdhci-dove.c >b/drivers/mmc/host/sdhci-dove.c >> new file mode 100644 >> index 0000000..ac844d1 >> --- /dev/null >> +++ b/drivers/mmc/host/sdhci-dove.c >> @@ -0,0 +1,72 @@ >> +/* >> + * sdhci-dove.c Support for SDHCI on Marvell's Dove SoC >> + * >> + * Author: Saeed Bishara <saeed@marvell.com> > >If Saeed is indeed the author of this code, the commit should be: > From: Saeed Bishara <saeed@marvell.com> >rather than in your name. (If it's not correct, it should be changed.) This code partially based on a code that I previously sent. So I think it's enough to add Mike to the Author's list. > >> + * Based on sdhci-cns3xxx.c >> + * >> + * 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. >> + * >> + * This program is distributed in the hope that it will be useful, >> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >> + * GNU General Public License for more details. >> + * >> + * You should have received a copy of the GNU General Public License >> + * along with this program; if not, write to the Free Software >> + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. >> + */ >> + >> +/* #include <linux/clk.h> */ >> +/* #include <linux/delay.h> */ > >Please don't submit commented out code to mainline -- if these aren't >needed, they should just be dropped. > >Thanks! > >-- >Chris Ball <cjb@laptop.org> <http://printf.net/> >One Laptop Per Child > ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 1/2] MMC: add support for the Marvell Dove SDHCI controller 2010-10-27 12:35 ` Saeed Bishara @ 2010-10-27 13:52 ` Haojian Zhuang 0 siblings, 0 replies; 7+ messages in thread From: Haojian Zhuang @ 2010-10-27 13:52 UTC (permalink / raw) To: linux-arm-kernel On Wed, Oct 27, 2010 at 8:35 PM, Saeed Bishara <saeed@marvell.com> wrote: > >> >>Let's add a little text here -- something like "Implement an >>sdhci-pltfm >>driver for the controller found on Marvell Dove and MMP SoCs" is fine. > This driver for Dove only. I think MMP uses sdhci-pxa. Yes, MMP can use sdhci-pxa. ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 1/2] MMC: add support for the Marvell Dove SDHCI controller 2010-10-27 11:56 ` Chris Ball 2010-10-27 12:35 ` Saeed Bishara @ 2010-10-27 12:41 ` Mike Rapoport 1 sibling, 0 replies; 7+ messages in thread From: Mike Rapoport @ 2010-10-27 12:41 UTC (permalink / raw) To: linux-arm-kernel On 10/27/10 13:56, Chris Ball wrote: > Hi Mike, adding Wolfram to CC in case he has comments, > > On Wed, Oct 27, 2010 at 01:21:58PM +0200, Mike Rapoport wrote: >> > > Let's add a little text here -- something like "Implement an sdhci-pltfm > driver for the controller found on Marvell Dove and MMP SoCs" is fine. Ok. >> Signed-off-by: Mike Rapoport <mike@compulab.co.il> >> CC: Saeed Bishara <saeed@marvell.com> > >> --- >> drivers/mmc/host/Kconfig | 13 +++++++ >> drivers/mmc/host/Makefile | 1 + >> drivers/mmc/host/sdhci-dove.c | 72 ++++++++++++++++++++++++++++++++++++++++ >> drivers/mmc/host/sdhci-pltfm.c | 3 ++ >> drivers/mmc/host/sdhci-pltfm.h | 1 + >> 5 files changed, 90 insertions(+), 0 deletions(-) >> create mode 100644 drivers/mmc/host/sdhci-dove.c >> >> diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig >> index 68d1279..4958839 100644 >> --- a/drivers/mmc/host/Kconfig >> +++ b/drivers/mmc/host/Kconfig >> @@ -130,6 +130,19 @@ config MMC_SDHCI_CNS3XXX >> >> If unsure, say N. >> >> +config MMC_SDHCI_DOVE >> + bool "SDHCI support on Marvell's Dove SoC" >> + depends on ARCH_DOVE > > The previous submission included ARCH_MMP, so I expect you'll want to > resubmit with the extra dependency added once Saeed replies. I've understood Saeed's comment that he prefers to limit this to Dove only. I'll add MMP if it'll also work with this driver. >> + depends on MMC_SDHCI_PLTFM >> + select MMC_SDHCI_IO_ACCESSORS >> + help >> + This selects the Secure Digital Host Controller Interface in >> + Marvell's Dove SoC. >> + >> + If you have a controller with this interface, say Y or M here. >> + >> + If unsure, say N. >> + >> config MMC_SDHCI_S3C >> tristate "SDHCI support on Samsung S3C SoC" >> depends on MMC_SDHCI && PLAT_SAMSUNG >> diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile >> index 840bcb5..9e1c418 100644 >> --- a/drivers/mmc/host/Makefile >> +++ b/drivers/mmc/host/Makefile >> @@ -40,6 +40,7 @@ obj-$(CONFIG_MMC_JZ4740) += jz4740_mmc.o >> obj-$(CONFIG_MMC_SDHCI_PLTFM) += sdhci-platform.o >> sdhci-platform-y := sdhci-pltfm.o >> sdhci-platform-$(CONFIG_MMC_SDHCI_CNS3XXX) += sdhci-cns3xxx.o >> +sdhci-platform-$(CONFIG_MMC_SDHCI_DOVE) += sdhci-dove.o >> >> obj-$(CONFIG_MMC_SDHCI_OF) += sdhci-of.o >> sdhci-of-y := sdhci-of-core.o >> diff --git a/drivers/mmc/host/sdhci-dove.c b/drivers/mmc/host/sdhci-dove.c >> new file mode 100644 >> index 0000000..ac844d1 >> --- /dev/null >> +++ b/drivers/mmc/host/sdhci-dove.c >> @@ -0,0 +1,72 @@ >> +/* >> + * sdhci-dove.c Support for SDHCI on Marvell's Dove SoC >> + * >> + * Author: Saeed Bishara <saeed@marvell.com> > > If Saeed is indeed the author of this code, the commit should be: > From: Saeed Bishara <saeed@marvell.com> > rather than in your name. (If it's not correct, it should be changed.) Sure, indeed. Saeed, shall I add your "Signed-off" as well? >> + * Based on sdhci-cns3xxx.c >> + * >> + * 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. >> + * >> + * This program is distributed in the hope that it will be useful, >> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >> + * GNU General Public License for more details. >> + * >> + * You should have received a copy of the GNU General Public License >> + * along with this program; if not, write to the Free Software >> + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. >> + */ >> + >> +/* #include <linux/clk.h> */ >> +/* #include <linux/delay.h> */ > > Please don't submit commented out code to mainline -- if these aren't > needed, they should just be dropped. will fix. > Thanks! > -- Sincerely yours, Mike. ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 2/2] [ARM] Dove: rename SDCHI devices to "sdhci-dove" 2010-10-27 11:21 [PATCH v2 0/2] add support for the Marvell Dove SDHCI controller Mike Rapoport 2010-10-27 11:21 ` [PATCH v2 1/2] MMC: " Mike Rapoport @ 2010-10-27 11:21 ` Mike Rapoport 1 sibling, 0 replies; 7+ messages in thread From: Mike Rapoport @ 2010-10-27 11:21 UTC (permalink / raw) To: linux-arm-kernel Signed-off-by: Mike Rapoport <mike@compulab.co.il> CC: Saeed Bishara <saeed@marvell.com> --- arch/arm/mach-dove/common.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c index f7a1258..fe627ab 100644 --- a/arch/arm/mach-dove/common.c +++ b/arch/arm/mach-dove/common.c @@ -770,7 +770,7 @@ static struct resource dove_sdio0_resources[] = { }; static struct platform_device dove_sdio0 = { - .name = "sdhci-mv", + .name = "sdhci-dove", .id = 0, .dev = { .dma_mask = &sdio_dmamask, @@ -798,7 +798,7 @@ static struct resource dove_sdio1_resources[] = { }; static struct platform_device dove_sdio1 = { - .name = "sdhci-mv", + .name = "sdhci-dove", .id = 1, .dev = { .dma_mask = &sdio_dmamask, -- 1.7.3.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2010-10-27 13:52 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-10-27 11:21 [PATCH v2 0/2] add support for the Marvell Dove SDHCI controller Mike Rapoport 2010-10-27 11:21 ` [PATCH v2 1/2] MMC: " Mike Rapoport 2010-10-27 11:56 ` Chris Ball 2010-10-27 12:35 ` Saeed Bishara 2010-10-27 13:52 ` Haojian Zhuang 2010-10-27 12:41 ` Mike Rapoport 2010-10-27 11:21 ` [PATCH v2 2/2] [ARM] Dove: rename SDCHI devices to "sdhci-dove" Mike Rapoport
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).