add support for the Marvell Dove SDHCI controller
Subsystems (5)
v2 cover add support for the Marvell Dove SDHCI controller
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
Signature · 1 line
1.7.3.1
PATCH v2 1/2 MMC: add support for the Marvell Dove SDHCI controller
--- 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
drivers/mmc/host/Kconfig +13 -0
@@ -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
drivers/mmc/host/Makefile +1 -0
@@ -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
drivers/mmc/host/sdhci-dove.c new file +72 -0
72 lines not on this page · raw message
drivers/mmc/host/sdhci-pltfm.c +3 -0
@@ -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);
drivers/mmc/host/sdhci-pltfm.h +1 -0
@@ -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 */
Signature · 1 line
1.7.3.1
PATCH v2 1/2 MMC: add support for the Marvell Dove SDHCI controller
Hi Mike, adding Wolfram to CC in case he has comments,
Quoted 1 line · Mike Rapoport
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.
Quoted 17 lines
Signed-off-by Mike Rapoport <[email protected]>CC Saeed Bishara <[email protected]>--- 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.cdrivers/mmc/host/Kconfig +0
-0
drivers/mmc/host/Kconfig config MMC_SDHCI_CNS3XXX · line 135
Quoted 6 lines
drivers/mmc/host/Kconfig +3
-0@@ -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.
Quoted 31 lines
drivers/mmc/host/Kconfig +10
-0+ 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_SAMSUNGdrivers/mmc/host/Makefile +1
-0@@ -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.odrivers/mmc/host/sdhci-dove.c new file +0
-0
drivers/mmc/host/sdhci-dove.c line 4
Quoted 4 lines
drivers/mmc/host/sdhci-dove.c new file +4
-0@@ -0,0 +1,72 @@ +/* +* sdhci-dove.c Support for SDHCI on Marvell's Dove SoC +* +* Author: Saeed Bishara <[email protected]>
If Saeed is indeed the author of this code, the commit should be:
From: Saeed Bishara <[email protected]>
rather than in your name. (If it's not correct, it should be changed.)
Quoted 8 lines
drivers/mmc/host/sdhci-dove.c new file +8
-0+* 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
drivers/mmc/host/sdhci-dove.c line 22
Quoted 10 lines
drivers/mmc/host/sdhci-dove.c new file +10
-0+* 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!
Signature · 2 lines
Chris Ball <[email protected]> <http://printf.net/> One Laptop Per Child
PATCH v2 1/2 MMC: add support for the Marvell Dove SDHCI controller
Quoted 5 lines
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.
Quoted 57 lines
Quoted 8 lines
Signed-off-by Mike Rapoport <[email protected]>CC Saeed Bishara <[email protected]>--- drivers/mmc/host/Kconfig | 13 +++++++ drivers/mmc/host/Makefile | 1 + drivers/mmc/host/sdhci-dove.c | 72++++++++++++++++++++++++++++++++++++++++
Quoted 10 lines
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.cdrivers/mmc/host/Kconfig +0
-0drivers/mmc/host/Kconfig config MMC_SDHCI_CNS3XXX · line 135
Quoted 6 lines
drivers/mmc/host/Kconfig +3
-0@@ -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_DOVEThe previous submission included
ARCH_MMP, so I expect you'll want to resubmit with the extra dependency added once Saeed replies.Quoted 18 lines
drivers/mmc/host/Kconfig +10
-0+ 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_SAMSUNGdrivers/mmc/host/Makefile +0
-0drivers/mmc/host/Makefile obj-$(CONFIG_MMC_JZ4740) += jz4740_mmc.o · line 40
Quoted 1 line
drivers/mmc/host/Makefile +0
-0@@ -40,6 +40,7 @@ obj-$(CONFIG_MMC_JZ4740) += jz4740_mmc.o obj-$(CONFIG_MMC_SDHCI_PLTFM) +=sdhci-platform.o
Review
Quoted 7 lines
drivers/mmc/host/Makefile +1
-0sdhci-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(quoted diff) +0
-0
b/drivers/mmc/host/sdhci-dove.c
Quoted 13 lines
drivers/mmc/host/sdhci-dove.c line 4
Quoted 9 lines
new file mode 100644
index 0000000..ac844d1drivers/mmc/host/sdhci-dove.c new file +4
-0@@ -0,0 +1,72 @@ +/* +* sdhci-dove.c Support for SDHCI on Marvell's Dove SoC +* +* Author: Saeed Bishara <[email protected]> If Saeed is indeed the author of this code, the commit should be:
From: Saeed Bishara <[email protected]>
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.
Quoted 30 lines
drivers/mmc/host/sdhci-dove.c
Quoted 4 lines
drivers/mmc/host/sdhci-dove.c new file +3
-0+* Based on sdhci-cns3xxx.c +* +* This program is free software; you can redistribute it and/or modify
Quoted 5 lines
drivers/mmc/host/sdhci-dove.c new file +5
-0+* 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 drivers/mmc/host/sdhci-dove.c line 22
Quoted 10 lines
drivers/mmc/host/sdhci-dove.c new file +10
-0+* 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!
Signature · 2 lines
Chris Ball <[email protected]> <http://printf.net/> One Laptop Per Child
PATCH v2 1/2 MMC: add support for the Marvell Dove SDHCI controller
Quoted 6 lines · Saeed Bishara
Quoted 5 lines
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.
PATCH v2 1/2 MMC: add support for the Marvell Dove SDHCI controller
In reply to Chris BallQuoted 7 lines · Chris Ball
Hi Mike, adding Wolfram to CC in case he has comments,
Quoted 1 line · Mike Rapoport
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.
Quoted 18 lines
Quoted 18 lines
Signed-off-by Mike Rapoport <[email protected]>CC Saeed Bishara <[email protected]>--- 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.cdrivers/mmc/host/Kconfig +0
-0@@ -130,6 +130,19 @@ config MMC_SDHCI_CNS3XXX
Quoted 8 lines
drivers/mmc/host/Kconfig config MMC_SDHCI_CNS3XXX · line 135
Quoted 5 lines
drivers/mmc/host/Kconfig +3
-0If unsure, say N. +config MMC_SDHCI_DOVE + bool "SDHCI support on Marvell's Dove SoC" + depends on ARCH_DOVEThe 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.
Quoted 23 lines
Quoted 23 lines
drivers/mmc/host/Kconfig +10
-0+ 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_SAMSUNGdrivers/mmc/host/Makefile +1
-0@@ -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
Quoted 16 lines
drivers/mmc/host/sdhci-dove.c line 4
Quoted 12 lines
drivers/mmc/host/Makefile +0
-0obj-$(CONFIG_MMC_SDHCI_OF) += sdhci-of.o sdhci-of-y := sdhci-of-core.odrivers/mmc/host/sdhci-dove.c new file +4
-0@@ -0,0 +1,72 @@ +/* +* sdhci-dove.c Support for SDHCI on Marvell's Dove SoC +* +* Author: Saeed Bishara <[email protected]> If Saeed is indeed the author of this code, the commit should be:
From: Saeed Bishara <[email protected]>
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?
Quoted 13 lines
Quoted 13 lines
drivers/mmc/host/sdhci-dove.c new file +13
-0+* 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
Quoted 8 lines
drivers/mmc/host/sdhci-dove.c line 22
Quoted 5 lines
drivers/mmc/host/sdhci-dove.c new file +5
-0+* 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.
Quoted 2 lines
Thanks!
Signature · 2 lines
Sincerely yours, Mike.
PATCH v2 2/2 Dove: rename SDCHI devices to "sdhci-dove"
In reply to Mike Rapoport--- arch/arm/mach-dove/common.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-dove/common.c +2 -2
@@ -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,
Signature · 1 line
1.7.3.1