MMC: add support of sdhci-pxa driver
Subsystems (4)
PATCH v3 1/1 MMC: add support of sdhci-pxa driver
Update with comments from Matt and Eric.
Test with sd and emmc.
Quoted 1 line
From
e5dd554ed4d3488a83d9a4888d68d1d85482f747Mon Sep 17 00:00:00 2001
From: Zhangfei Gao <[email protected]>
Date: Mon, 20 Sep 2010 10:51:28 -0400
Subject: [PATCH] mmc: add support of sdhci-pxa driver
Support Marvell PXA168/PXA910/MMP2 SD Host Controller
--- arch/arm/plat-pxa/include/plat/sdhci.h | 32 ++++ drivers/mmc/host/Kconfig | 12 ++ drivers/mmc/host/Makefile | 1 + drivers/mmc/host/sdhci-pxa.c | 259 ++++++++++++++++++++++++++++++++ 4 files changed, 304 insertions(+), 0 deletions(-) create mode 100644 arch/arm/plat-pxa/include/plat/sdhci.h create mode 100644 drivers/mmc/host/sdhci-pxa.c
(quoted diff) +0 -0
b/arch/arm/plat-pxa/include/plat/sdhci.h
new file mode 100644
index 0000000..38e86ad
arch/arm/plat-pxa/include/plat/sdhci.h new file +32 -0
@@ -0,0 +1,32 @@ +/* linux/arch/arm/plat-pxa/include/plat/sdhci.h +* +* Copyright 2010 Marvell +* Zhangfei Gao <[email protected]> +* +* PXA Platform - SDHCI platform data definitions +* +* 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. +*/ + +#ifndef __PLAT_PXA_SDHCI_H +#define __PLAT_PXA_SDHCI_H + +/* pxa specific flag */ +/* Require clock free running */ +#define PXA_FLAG_DISABLE_CLOCK_GATING (1<<0) + +/** +* struct pxa_sdhci_platdata() - Platform device data for PXA SDHCI +* @max_speed: The maximum speed supported. +* @quirks: quirks of specific device +* @flags: flags for platfrom requirement +*/ +struct sdhci_pxa_platdata { +unsigned int max_speed; +unsigned int quirks; +unsigned int flags; +}; + +#endif /* __PLAT_PXA_SDHCI_H */
drivers/mmc/host/Kconfig +12 -0
@@ -155,6 +155,18 @@ config MMC_SDHCI_S3C If unsure, say N. +config MMC_SDHCI_PXA + tristate "Marvell PXA168/PXA910/MMP2 SD Host Controller support" + depends on ARCH_PXA || ARCH_MMP + select MMC_SDHCI + select MMC_SDHCI_IO_ACCESSORS + help + This selects the Marvell(R) PXA168/PXA910/MMP2 SD Host Controller. + If you have a PXA168/PXA910/MMP2 platform with SD Host Controller and a + card slot,say Y or M here. + + If unsure, say N. + config MMC_SDHCI_SPEAR tristate "SDHCI support on ST SPEAr platform" depends on MMC_SDHCI && PLAT_SPEAR
drivers/mmc/host/Makefile +1 -0
@@ -8,6 +8,7 @@ obj-$(CONFIG_MMC_IMX) += imxmmc.o obj-$(CONFIG_MMC_MXC) += mxcmmc.o obj-$(CONFIG_MMC_SDHCI) += sdhci.o obj-$(CONFIG_MMC_SDHCI_PCI) += sdhci-pci.o +obj-$(CONFIG_MMC_SDHCI_PXA) += sdhci-pxa.o obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o obj-$(CONFIG_MMC_SDHCI_SPEAR) += sdhci-spear.o obj-$(CONFIG_MMC_WBSD) += wbsd.o
drivers/mmc/host/sdhci-pxa.c new file +259 -0
259 lines not on this page · raw message
Signature · 1 line
1.7.0.4
From e5dd554ed4d3488a83d9a4888d68d1d85482f747 Mon Sep 17 00:00:00 2001
From: Zhangfei Gao <[email protected]>
Date: Mon, 20 Sep 2010 10:51:28 -0400
Subject: [PATCH] mmc: add support of sdhci-pxa driver
Support Marvell PXA168/PXA910/MMP2 SD Host Controller
--- arch/arm/plat-pxa/include/plat/sdhci.h | 32 ++++ drivers/mmc/host/Kconfig | 12 ++ drivers/mmc/host/Makefile | 1 + drivers/mmc/host/sdhci-pxa.c | 259 ++++++++++++++++++++++++++++++++ 4 files changed, 304 insertions(+), 0 deletions(-) create mode 100644 arch/arm/plat-pxa/include/plat/sdhci.h create mode 100644 drivers/mmc/host/sdhci-pxa.c
arch/arm/plat-pxa/include/plat/sdhci.h new file +32 -0
@@ -0,0 +1,32 @@ +/* linux/arch/arm/plat-pxa/include/plat/sdhci.h +* +* Copyright 2010 Marvell +* Zhangfei Gao <[email protected]> +* +* PXA Platform - SDHCI platform data definitions +* +* 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. +*/ + +#ifndef __PLAT_PXA_SDHCI_H +#define __PLAT_PXA_SDHCI_H + +/* pxa specific flag */ +/* Require clock free running */ +#define PXA_FLAG_DISABLE_CLOCK_GATING (1<<0) + +/** +* struct pxa_sdhci_platdata() - Platform device data for PXA SDHCI +* @max_speed: The maximum speed supported. +* @quirks: quirks of specific device +* @flags: flags for platfrom requirement +*/ +struct sdhci_pxa_platdata { +unsigned int max_speed; +unsigned int quirks; +unsigned int flags; +}; + +#endif /* __PLAT_PXA_SDHCI_H */
drivers/mmc/host/Kconfig +12 -0
@@ -155,6 +155,18 @@ config MMC_SDHCI_S3C If unsure, say N. +config MMC_SDHCI_PXA + tristate "Marvell PXA168/PXA910/MMP2 SD Host Controller support" + depends on ARCH_PXA || ARCH_MMP + select MMC_SDHCI + select MMC_SDHCI_IO_ACCESSORS + help + This selects the Marvell(R) PXA168/PXA910/MMP2 SD Host Controller. + If you have a PXA168/PXA910/MMP2 platform with SD Host Controller and a + card slot,say Y or M here. + + If unsure, say N. + config MMC_SDHCI_SPEAR tristate "SDHCI support on ST SPEAr platform" depends on MMC_SDHCI && PLAT_SPEAR
drivers/mmc/host/Makefile +1 -0
@@ -8,6 +8,7 @@ obj-$(CONFIG_MMC_IMX) += imxmmc.o obj-$(CONFIG_MMC_MXC) += mxcmmc.o obj-$(CONFIG_MMC_SDHCI) += sdhci.o obj-$(CONFIG_MMC_SDHCI_PCI) += sdhci-pci.o +obj-$(CONFIG_MMC_SDHCI_PXA) += sdhci-pxa.o obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o obj-$(CONFIG_MMC_SDHCI_SPEAR) += sdhci-spear.o obj-$(CONFIG_MMC_WBSD) += wbsd.o
drivers/mmc/host/sdhci-pxa.c new file +259 -0
259 lines not on this page · raw message
Signature · 1 line
1.7.0.4
Quoted 2 lines · zhangfei gao
Update with comments from Matt and Eric.
Test with sd and emmc.
Sorry if I am blind, but why again can't you use the (updated) platform driver?
Signature · 2 lines
Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ |
Quoted 5 lines · Wolfram Sang
Quoted 2 lines · zhangfei gao
Update with comments from Matt and Eric.
Test with sd and emmc.Sorry if I am blind, but why again can't you use the (updated) platform driver?
Currently platform driver can not support well of the requirement for several device sharing one driver, each one has different quirk, different max_speed, and each device need some specific vectors. We prefer using independent driver first.
Quoted 14 lines
--
Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ |-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)iEYEARECAAYFAky8YJkACgkQD27XaX1/VRtQqACfUOXAYcCu0ui25S/2pXIaQdWK hJEAn3ZW7tKsIn7cSg8gkehIzPS8im4p
=04el
-----END PGP SIGNATURE-----
Quoted 4 lines
Currently platform driver can not support well of the requirement for several device sharing one driver, each one has different quirk, different
max_speed, and each device need some specific vectors. We prefer using independent driver first.
What about a custom init-call reading out the platform_data?
Signature · 2 lines
Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ |
Quoted 6 lines · Wolfram Sang
Quoted 4 lines
Currently platform driver can not support well of the requirement for several device sharing one driver, each one has different quirk, different
max_speed, and each device need some specific vectors. We prefer using independent driver first.What about a custom init-call reading out the
platform_data?
Which one are you talking?
For the different quirk, we have already discussed before, the quirk in sdhci_pltfm_data is shared in different device, which may impact each other.
We don't want to be blocked in using what manner.
Quoted 14 lines
--
Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ |-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)iEYEARECAAYFAky8/IQACgkQD27XaX1/VRuYkQCfaPUOLkDwZ+mCW9ztlGJnAy85 S4oAn1MEL5UhA7bTi8+H5fcMSEEPmZwC
=6MTu
-----END PGP SIGNATURE-----
Hi Zhangfei,
Quoted 11 lines · zhangfei gao
Update with comments from Matt and Eric. Test with sd and emmc.
Quoted 1 line
From
e5dd554ed4d3488a83d9a4888d68d1d85482f747Mon Sep 17 00:00:00 2001From: Zhangfei Gao <[email protected]>
Date: Mon, 20 Sep 2010 10:51:28 -0400
Subject: [PATCH] mmc: add support of sdhci-pxa driverSupport Marvell PXA168/PXA910/MMP2 SD Host Controller
Signed-off-by Zhangfei Gao <[email protected]>
Quoted 8 lines
--- arch/arm/plat-pxa/include/plat/sdhci.h | 32 ++++ drivers/mmc/host/Kconfig | 12 ++ drivers/mmc/host/Makefile | 1 + drivers/mmc/host/sdhci-pxa.c | 259 ++++++++++++++++++++++++++++++++ 4 files changed, 304 insertions(+), 0 deletions(-) create mode 100644 arch/arm/plat-pxa/include/plat/sdhci.h create mode 100644 drivers/mmc/host/sdhci-pxa.c
I'll take the drivers/mmc/ hunks, but you should send the plat-pxa/ patch through the ARM tree.
Thanks,
Signature · 2 lines
Chris Ball <[email protected]> <http://printf.net/> One Laptop Per Child
Quoted 23 lines · Chris Ball
Hi Zhangfei,
Quoted 11 lines · zhangfei gao
Update with comments from Matt and Eric. Test with sd and emmc.
Quoted 1 line
From
e5dd554ed4d3488a83d9a4888d68d1d85482f747Mon Sep 17 00:00:00 2001From: Zhangfei Gao <[email protected]>
Date: Mon, 20 Sep 2010 10:51:28 -0400
Subject: [PATCH] mmc: add support of sdhci-pxa driverSupport Marvell PXA168/PXA910/MMP2 SD Host Controller
Signed-off-by Zhangfei Gao <[email protected]>Quoted 8 lines
---
arch/arm/plat-pxa/include/plat/sdhci.h | 32 ++++drivers/mmc/host/Kconfig| 12 ++drivers/mmc/host/Makefile| 1 +drivers/mmc/host/sdhci-pxa.c| 259 ++++++++++++++++++++++++++++++++4 files changed, 304 insertions(+), 0 deletions(-)create mode 100644
arch/arm/plat-pxa/include/plat/sdhci.hcreate mode 100644drivers/mmc/host/sdhci-pxa.c
Quoted 2 lines
I'll take the
drivers/mmc/hunks, but you should send the plat-pxa/ patch through the ARM tree.
Thanks a lot, what a relief :)
Quoted 7 lines
Thanks,
--
Chris Ball <[email protected]> <http://printf.net/>
One Laptop Per Child
PATCH v3 1/1 MMC: add support of sdhci-pxa driver
In reply to Chris BallHi,
Quoted 21 lines · Chris Ball
Quoted 11 lines · zhangfei gao
Update with comments from Matt and Eric. Test with sd and emmc.
Quoted 1 line
From
e5dd554ed4d3488a83d9a4888d68d1d85482f747Mon Sep 17 00:00:00 2001From: Zhangfei Gao <[email protected]>
Date: Mon, 20 Sep 2010 10:51:28 -0400
Subject: [PATCH] mmc: add support of sdhci-pxa driverSupport Marvell PXA168/PXA910/MMP2 SD Host Controller
Signed-off-by Zhangfei Gao <[email protected]>Quoted 8 lines
--- arch/arm/plat-pxa/include/plat/sdhci.h | 32 ++++ drivers/mmc/host/Kconfig | 12 ++ drivers/mmc/host/Makefile | 1 + drivers/mmc/host/sdhci-pxa.c | 259 ++++++++++++++++++++++++++++++++ 4 files changed, 304 insertions(+), 0 deletions(-) create mode 100644 arch/arm/plat-pxa/include/plat/sdhci.h create mode 100644 drivers/mmc/host/sdhci-pxa.c
Quoted 2 lines
I'll take the
drivers/mmc/hunks, but you should send the plat-pxa/ patch through the ARM tree.
Oh. If we do that then the driver won't compile until everything's together, because it #includes <plat/sdhci.h>. Haojian/Eric, what do you prefer here? Should I take the arch/arm/ hunk via the MMC tree? (If so, please provide ACKs.)
Thanks,
Signature · 2 lines
Chris Ball <[email protected]> <http://printf.net/> One Laptop Per Child
PATCH v3 1/1 MMC: add support of sdhci-pxa driver
Dne ?t 21. ??jna 2010 16:52:49 Chris Ball napsal(a):
Quoted 30 lines
Hi,
Quoted 24 lines · Chris Ball
Quoted 14 lines · zhangfei gao
Update with comments from Matt and Eric. Test with sd and emmc.
Quoted 1 line
From
e5dd554ed4d3488a83d9a4888d68d1d85482f747Mon Sep 17 00:00:00 2001From: Zhangfei Gao <[email protected]>
Date: Mon, 20 Sep 2010 10:51:28 -0400
Subject: [PATCH] mmc: add support of sdhci-pxa driverSupport Marvell PXA168/PXA910/MMP2 SD Host Controller
Signed-off-by Zhangfei Gao <[email protected]>---
Quoted 8 lines
arch/arm/plat-pxa/include/plat/sdhci.h | 32 ++++ drivers/mmc/host/Kconfig | 12 ++ drivers/mmc/host/Makefile | 1 + drivers/mmc/host/sdhci-pxa.c | 259 ++++++++++++++++++++++++++++++++ 4 files changed, 304 insertions(+), 0 deletions(-) create mode 100644 arch/arm/plat-pxa/include/plat/sdhci.h create mode 100644 drivers/mmc/host/sdhci-pxa.cQuoted 2 lines
I'll take the
drivers/mmc/hunks, but you should send the plat-pxa/ patch through the ARM tree.
Quoted 6 lines
Oh. If we do that then the driver won't compile until everything's together, because it #includes <
plat/sdhci.h>. Haojian/Eric, what do you prefer here? Should I take thearch/arm/hunk via the MMC tree? (If so, please provide ACKs.)Thanks,
Hi, where can I find the whole driver so I can take a look? It didn't crash into linux-arm-kernel for some reason.
Thanks
PATCH v3 1/1 MMC: add support of sdhci-pxa driver
Hi Marek,
Quoted 10 lines · Marek Vasut
Quoted 7 lines
Quoted 2 lines
I'll take the
drivers/mmc/hunks, but you should send the plat-pxa/ patch through the ARM tree.Oh. If we do that then the driver won't compile until everything's together, because it #includes <
plat/sdhci.h>. Haojian/Eric, what do you prefer here? Should I take thearch/arm/hunk via the MMC tree? (If so, please provide ACKs.)Hi, where can I find the whole driver so I can take a look? It didn't crash into linux-arm-kernel for some reason.
Here it is:
http://thread.gmane.org/gmane.linux.kernel.mmc/4190
Signature · 2 lines
Chris Ball <[email protected]> <http://printf.net/> One Laptop Per Child
PATCH v3 1/1 MMC: add support of sdhci-pxa driver
In reply to Chris BallQuoted 24 lines · Chris Ball
Hi,
Quoted 21 lines · Chris Ball
Quoted 19 lines · zhangfei gao
Update with comments from Matt and Eric. Test with sd and emmc.
Quoted 1 line
From
e5dd554ed4d3488a83d9a4888d68d1d85482f747Mon Sep 17 00:00:00 2001From: Zhangfei Gao <[email protected]>
Date: Mon, 20 Sep 2010 10:51:28 -0400
Subject: [PATCH] mmc: add support of sdhci-pxa driver? ? Support Marvell PXA168/PXA910/MMP2 SD Host Controller
Signed-off-by Zhangfei Gao <[email protected]>---
?arch/arm/plat-pxa/include/plat/sdhci.h | ? 32 ++++ ?drivers/mmc/host/Kconfig ? ? ? ? ? ? ? | ? 12 ++ ?drivers/mmc/host/Makefile ? ? ? ? ? ? ?| ? ?1 + ?drivers/mmc/host/sdhci-pxa.c ? ? ? ? ? | ?259 ++++++++++++++++++++++++++++++++?4 files changed, 304 insertions(+), 0 deletions(-) ?create mode 100644
arch/arm/plat-pxa/include/plat/sdhci.h?create mode 100644drivers/mmc/host/sdhci-pxa.c
Quoted 8 lines
Quoted 2 lines
I'll take the
drivers/mmc/hunks, but you should send the plat-pxa/ patch through the ARM tree.Oh. ?If we do that then the driver won't compile until everything's together, because it #includes <
plat/sdhci.h>. ?Haojian/Eric, what do you prefer here? ?Should I take thearch/arm/hunk via the MMC tree? (If so, please provide ACKs.)
I'm fine on this. Please merge it via the MMC tree.
Thanks
Haojian
PATCH v3 1/1 MMC: add support of sdhci-pxa driver
Hi Russell,
Quoted 1 line · Haojian Zhuang
I'm fine on this. Please merge it via the MMC tree.
I'm planning on merging this patch via the MMC tree, please let me know if you object. Thanks.
From: Zhangfei Gao <[email protected]>
Date: Mon, 20 Sep 2010 10:51:28 -0400
Subject: [PATCH] mmc: add new sdhci-pxa driver for Marvell SoCs
Support Marvell PXA168/PXA910/MMP2 SD Host Controller.
--- arch/arm/plat-pxa/include/plat/sdhci.h | 32 ++++ drivers/mmc/host/Kconfig | 12 ++ drivers/mmc/host/Makefile | 1 + drivers/mmc/host/sdhci-pxa.c | 258 ++++++++++++++++++++++++++++++++ 4 files changed, 303 insertions(+), 0 deletions(-) create mode 100644 arch/arm/plat-pxa/include/plat/sdhci.h create mode 100644 drivers/mmc/host/sdhci-pxa.c
arch/arm/plat-pxa/include/plat/sdhci.h new file +32 -0
@@ -0,0 +1,32 @@ +/* linux/arch/arm/plat-pxa/include/plat/sdhci.h +* +* Copyright 2010 Marvell +* Zhangfei Gao <[email protected]> +* +* PXA Platform - SDHCI platform data definitions +* +* 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. +*/ + +#ifndef __PLAT_PXA_SDHCI_H +#define __PLAT_PXA_SDHCI_H + +/* pxa specific flag */ +/* Require clock free running */ +#define PXA_FLAG_DISABLE_CLOCK_GATING (1<<0) + +/** +* struct pxa_sdhci_platdata() - Platform device data for PXA SDHCI +* @max_speed: the maximum speed supported +* @quirks: quirks of specific device +* @flags: flags for platform requirement +*/ +struct sdhci_pxa_platdata { +unsigned int max_speed; +unsigned int quirks; +unsigned int flags; +}; + +#endif /* __PLAT_PXA_SDHCI_H */
drivers/mmc/host/Kconfig +12 -0
@@ -155,6 +155,18 @@ config MMC_SDHCI_S3C If unsure, say N. +config MMC_SDHCI_PXA + tristate "Marvell PXA168/PXA910/MMP2 SD Host Controller support" + depends on ARCH_PXA || ARCH_MMP + select MMC_SDHCI + select MMC_SDHCI_IO_ACCESSORS + help + This selects the Marvell(R) PXA168/PXA910/MMP2 SD Host Controller. + If you have a PXA168/PXA910/MMP2 platform with SD Host Controller + and a card slot, say Y or M here. + + If unsure, say N. + config MMC_SDHCI_SPEAR tristate "SDHCI support on ST SPEAr platform" depends on MMC_SDHCI && PLAT_SPEAR
drivers/mmc/host/Makefile +1 -0
@@ -8,6 +8,7 @@ obj-$(CONFIG_MMC_IMX) += imxmmc.o obj-$(CONFIG_MMC_MXC) += mxcmmc.o obj-$(CONFIG_MMC_SDHCI) += sdhci.o obj-$(CONFIG_MMC_SDHCI_PCI) += sdhci-pci.o +obj-$(CONFIG_MMC_SDHCI_PXA) += sdhci-pxa.o obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o obj-$(CONFIG_MMC_SDHCI_SPEAR) += sdhci-spear.o obj-$(CONFIG_MMC_WBSD) += wbsd.o
drivers/mmc/host/sdhci-pxa.c new file +258 -0
258 lines not on this page · raw message
Signature · 2 lines
Chris Ball <[email protected]> <http://printf.net/> One Laptop Per Child
PATCH v3 1/1 MMC: add support of sdhci-pxa driver
Hi,
On Fri, Oct 22, 2010 at 10:58:14AM +0100, Chris Ball wrote:
[...]
drivers/mmc/host/sdhci-pxa.c line 211
Quoted 10 lines
drivers/mmc/host/sdhci-pxa.c new file +10
-0+#ifdef CONFIG_PM +static int sdhci_pxa_suspend (struct platform_device *dev) +{ +struct sdhci_host *host =platform_get_drvdata (to_platform_device (dev)); + +return sdhci_suspend_host (host, state); +} + +static int sdhci_pxa_resume (struct platform_device *dev) +{
These prototypes are not correct, leading to:
CC [M] drivers/mmc/host/sdhci-pxa.odrivers/mmc/host/sdhci-pxa.c: In function ?sdhci_pxa_suspend?:drivers/mmc/host/sdhci-pxa.c:205: warning: initialization from incompatible pointer type drivers/mmc/host/sdhci-pxa.c:207: error: ?state? undeclared (first use in this function) drivers/mmc/host/sdhci-pxa.c:207: error: (Each undeclared identifier is reported only once drivers/mmc/host/sdhci-pxa.c:207: error: for each function it appears in.) drivers/mmc/host/sdhci-pxa.c: In function ?sdhci_pxa_resume?:drivers/mmc/host/sdhci-pxa.c:212: warning: initialization from incompatible pointer type drivers/mmc/host/sdhci-pxa.c: At top level:drivers/mmc/host/sdhci-pxa.c:222: warning: initialization from incompatible pointer type drivers/mmc/host/sdhci-pxa.c:223: warning: initialization from incompatible pointer type
when compiled with CONFIG_PM=y.
Signature · 2 lines
Chris Ball <[email protected]> <http://printf.net/> One Laptop Per Child
PATCH v3 1/1 MMC: add support of sdhci-pxa driver
Quoted 29 lines · Chris Ball
Hi,
On Fri, Oct 22, 2010 at 10:58:14AM +0100, Chris Ball wrote:
[...]drivers/mmc/host/sdhci-pxa.c line 211
Quoted 10 lines
drivers/mmc/host/sdhci-pxa.c new file +10
-0+#ifdef CONFIG_PM +static int sdhci_pxa_suspend (struct platform_device *dev) +{ + ? ? struct sdhci_host *host = platform_get_drvdata(to_platform_device(dev)); + + ? ? return sdhci_suspend_host(host, state); +} + +static int sdhci_pxa_resume (struct platform_device *dev) +{These prototypes are not correct, leading to:
?CC [M] ?drivers/mmc/host/sdhci-pxa.o
drivers/mmc/host/sdhci-pxa.c: In function ?sdhci_pxa_suspend?:drivers/mmc/host/sdhci-pxa.c:205: warning: initialization from incompatible pointer typedrivers/mmc/host/sdhci-pxa.c:207: error: ?state? undeclared (first use in this function)drivers/mmc/host/sdhci-pxa.c:207: error: (Each undeclared identifier is reported only oncedrivers/mmc/host/sdhci-pxa.c:207: error: for each function it appears in.)drivers/mmc/host/sdhci-pxa.c: In function ?sdhci_pxa_resume?:drivers/mmc/host/sdhci-pxa.c:212: warning: initialization from incompatible pointer typedrivers/mmc/host/sdhci-pxa.c: At top level:drivers/mmc/host/sdhci-pxa.c:222: warning: initialization from incompatible pointer typedrivers/mmc/host/sdhci-pxa.c:223: warning: initialization from incompatible pointer type
Quoted 6 lines
when compiled with
CONFIG_PM=y.--
Chris Ball ? <[email protected]> ? <http://printf.net/>
One Laptop Per Child
Sorry, forgot open CONFIG_PM.
Updated patch, thanks
PATCH v3 1/1 MMC: add support of sdhci-pxa driver
Dne P? 22. ??jna 2010 16:09:03 zhangfei gao napsal(a):
Quoted 204 lines · Chris Ball
Quoted 33 lines
Hi,
On Fri, Oct 22, 2010 at 10:58:14AM +0100, Chris Ball wrote:
[...]drivers/mmc/host/sdhci-pxa.c line 211
Quoted 10 lines
drivers/mmc/host/sdhci-pxa.c new file +4
-0+#ifdef CONFIG_PM +static int sdhci_pxa_suspend (struct platform_device *dev) +{ + struct sdhci_host *host =platform_get_drvdata(to_platform_device(dev)); +
drivers/mmc/host/sdhci-pxa.c new file +5
-0+return sdhci_suspend_host (host, state); +} + +static int sdhci_pxa_resume (struct platform_device *dev) +{These prototypes are not correct, leading to:
CC [M]
drivers/mmc/host/sdhci-pxa.odrivers/mmc/host/sdhci-pxa.c: In function ?sdhci_pxa_suspend?:drivers/mmc/host/sdhci-pxa.c:205: warning: initialization from incompatible pointer typedrivers/mmc/host/sdhci-pxa.c:207: error:
?state? undeclared (first use in this function)drivers/mmc/host/sdhci-pxa.c:207: error: (Each undeclared identifier is reported only oncedrivers/mmc/host/sdhci-pxa.c:207: error: for each function it appears in.)drivers/mmc/host/sdhci-pxa.c: In function ?sdhci_pxa_resume?:drivers/mmc/host/sdhci-pxa.c:212: warning: initialization from incompatible pointer typedrivers/mmc/host/sdhci-pxa.c: At top level:drivers/mmc/host/sdhci-pxa.c:222: warning: initialization from incompatible pointer typedrivers/mmc/host/sdhci-pxa.c:223: warning:
initialization from incompatible pointer typeQuoted 5 lines
when compiled with
CONFIG_PM=y.--
Chris Ball <[email protected]> <http://printf.net/>
One Laptop Per ChildSorry, forgot open
CONFIG_PM.
Updated patch, thanksFrom
88e7f028433fe87b211bf3d75b54261979d0d176Mon Sep 17 00:00:00 2001
From: Zhangfei Gao <[email protected]>
Date: Mon, 20 Sep 2010 10:51:28 -0400
Subject: [PATCH] mmc: add support of sdhci-pxa driverSupport Marvell PXA168/PXA910/MMP2 SD Host Controller
Signed-off-by Zhangfei Gao <[email protected]>Acked-by Haojian Zhuang <[email protected]>--- arch/arm/plat-pxa/include/plat/sdhci.h | 32 ++++ drivers/mmc/host/Kconfig | 12 ++ drivers/mmc/host/Makefile | 1 + drivers/mmc/host/sdhci-pxa.c | 254 ++++++++++++++++++++++++++++++++ 4 files changed, 299 insertions(+), 0 deletions(-) create mode 100644 arch/arm/plat-pxa/include/plat/sdhci.h create mode 100644 drivers/mmc/host/sdhci-pxa.carch/arm/plat-pxa/include/plat/sdhci.h new file +32
-0@@ -0,0 +1,32 @@ +/* linux/arch/arm/plat-pxa/include/plat/sdhci.h +* +* Copyright 2010 Marvell +* Zhangfei Gao <[email protected]> +* +* PXA Platform - SDHCI platform data definitions +* +* 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. +*/ + +#ifndef __PLAT_PXA_SDHCI_H +#define __PLAT_PXA_SDHCI_H + +/* pxa specific flag */ +/* Require clock free running */ +#define PXA_FLAG_DISABLE_CLOCK_GATING (1<<0) + +/** +* struct pxa_sdhci_platdata() - Platform device data for PXA SDHCI +* @max_speed: The maximum speed supported. +* @quirks: quirks of specific device +* @flags: flags for platfrom requirement +*/ +struct sdhci_pxa_platdata { +unsigned int max_speed; +unsigned int quirks; +unsigned int flags; +}; + +#endif /* __PLAT_PXA_SDHCI_H */ drivers/mmc/host/Kconfig +12
-0@@ -155,6 +155,18 @@ config MMC_SDHCI_S3C If unsure, say N. +config MMC_SDHCI_PXA + tristate "Marvell PXA168/PXA910/MMP2 SD Host Controller support" + depends on ARCH_PXA || ARCH_MMP + select MMC_SDHCI + select MMC_SDHCI_IO_ACCESSORS + help + This selects the Marvell(R) PXA168/PXA910/MMP2 SD Host Controller. + If you have a PXA168/PXA910/MMP2 platform with SD Host Controller and a + card slot,say Y or M here. + + If unsure, say N. + config MMC_SDHCI_SPEAR tristate "SDHCI support on ST SPEAr platform" depends on MMC_SDHCI && PLAT_SPEARdrivers/mmc/host/Makefile +1
-0@@ -8,6 +8,7 @@ obj-$(CONFIG_MMC_IMX) += imxmmc.o obj-$(CONFIG_MMC_MXC) += mxcmmc.o obj-$(CONFIG_MMC_SDHCI) += sdhci.o obj-$(CONFIG_MMC_SDHCI_PCI) += sdhci-pci.o +obj-$(CONFIG_MMC_SDHCI_PXA) += sdhci-pxa.o obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o obj-$(CONFIG_MMC_SDHCI_SPEAR) += sdhci-spear.o obj-$(CONFIG_MMC_WBSD) += wbsd.odrivers/mmc/host/sdhci-pxa.c new file +44
-0@@ -0,0 +1,254 @@ +/* linux/drivers/mmc/host/sdhci-pxa.c +* +* Copyright (C) 2010 Marvell International Ltd. +* Zhangfei Gao <[email protected]> +* Kevin Wang <[email protected]> +* Mingwei Wang <[email protected]> +* Philip Rakity <[email protected]> +* Mark Brown <[email protected]> +* +* 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. +*/ + +/* Supports: +* SDHCI support for MMP2/PXA910/PXA168 +* +* Refer sdhci-s3c.c +*/ + +#include <linux/delay.h> +#include <linux/platform_device.h> +#include <linux/mmc/host.h> +#include <linux/clk.h> +#include <linux/io.h> +#include <linux/err.h> +#include <plat/sdhci.h> +#include "sdhci.h" + +#define DRIVER_NAME "sdhci-pxa" + +#define SD_FIFO_PARAM 0x104 +#define DIS_PAD_SD_CLK_GATE 0x400 + +struct sdhci_pxa { +struct sdhci_host *host; +struct sdhci_pxa_platdata *pdata; +struct clk *clk; +struct resource *res; + +u8 clk_enable; +}; + +/************************************************************************* ****\ + *
* + * SDHCI core callbacks
* + *
*
+\************************************************************************ *****/ +static voidset_clock(struct sdhci_host *host, unsigned int clock)drivers/mmc/host/sdhci-pxa.c new file +12
-0+{ +struct sdhci_pxa *pxa =sdhci_priv (host); +u32 tmp =0 ; + +if (clock ==0 ) { +if (pxa->clk_enable) { +clk_disable (pxa->clk); + pxa->clk_enable =0 ; + } + }else { +if (0 == pxa->clk_enable) { + if (pxa->pdata->flags
drivers/mmc/host/sdhci-pxa.c line 70
Quoted 10 lines
drivers/mmc/host/sdhci-pxa.c new file +10
-0+ & PXA_FLAG_DISABLE_CLOCK_GATING) { + tmp =readl (host->ioaddr +SD_FIFO_PARAM ); + tmp |=DIS_PAD_SD_CLK_GATE ; +writel (tmp, host->ioaddr +SD_FIFO_PARAM ); + } +clk_enable (pxa->clk); + pxa->clk_enable =1 ; + } + } +}
Doesn't the clock framework have something like clk_is_already_enabled() function ?
Quoted 61 lines
drivers/mmc/host/sdhci-pxa.c new file +6
-0+ +static struct sdhci_ops sdhci_pxa_ops = { + .set_clock = set_clock, +}; + +/************************************************************************* ****\ + *
* + * Device probing/removal
* + *
*
+\************************************************************************ *****/ +drivers/mmc/host/sdhci-pxa.c new file +49
-0+static int __devinit sdhci_pxa_probe (struct platform_device *pdev) +{ +struct sdhci_pxa_platdata *pdata = pdev->dev.platform_data; +struct device *dev = &pdev->dev; +struct sdhci_host *host =NULL ; +struct resource *iomem =NULL ; +struct sdhci_pxa *pxa =NULL ; +int ret, irq; + + irq =platform_get_irq (pdev,0 ); +if (irq <0 ) { +dev_err (dev,"no irq specified\n" ); +return irq; + } + + iomem =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!iomem) { +dev_err (dev,"no memory specified\n" ); +return -ENOENT ; + } + + host =sdhci_alloc_host (&pdev->dev,sizeof (struct sdhci_pxa )); +if (IS_ERR (host)) { +dev_err (dev,"failed to alloc host\n" ); +return PTR_ERR (host); + } + + pxa =sdhci_priv (host); + pxa->host = host; + pxa->pdata = pdata; + pxa->clk_enable =0 ; + + pxa->clk =clk_get (dev,"PXA-SDHCLK" ); +if (IS_ERR (pxa->clk)) { +dev_err (dev,"failed to get io clock\n" ); + ret =PTR_ERR (pxa->clk); + goto out; + } + + pxa->res =request_mem_region (iomem->start,resource_size (iomem), +mmc_hostname (host->mmc)); +if (!pxa->res) { +dev_err (&pdev->dev,"cannot request region\n" ); + ret = -EBUSY ; + goto out; + } + + host->ioaddr =ioremap (iomem->start,resource_size (iomem)); +if (!host->ioaddr) {
drivers/mmc/host/sdhci-pxa.c line 140
Quoted 10 lines
drivers/mmc/host/sdhci-pxa.c new file +10
-0+dev_err (&pdev->dev,"failed to remap registers\n" ); + ret = -ENOMEM ; + goto out; + } + + host->hw_name ="MMC" ; + host->ops = &sdhci_pxa_ops; + host->irq = irq; + host->quirks =SDHCI_QUIRK_BROKEN_ADMA |SDHCI_QUIRK_BROKEN_TIMEOUT_VAL ; +
Maybe check if these aren't already set in pdata and warn user ?
drivers/mmc/host/sdhci-pxa.c line 151
Quoted 11 lines
drivers/mmc/host/sdhci-pxa.c new file +11
-0+if (pdata->quirks) + host->quirks |= pdata->quirks; + + ret =sdhci_add_host (host); +if (ret) { +dev_err (&pdev->dev,"failed to add host\n" ); + goto out; + } + +if (pxa->pdata->max_speed) + host->mmc->f_max = pxa->pdata->max_speed;
What happens otherwise ?
Quoted 93 lines
drivers/mmc/host/sdhci-pxa.c new file +52
-0+ +platform_set_drvdata (pdev, host); + +return 0 ; +out: +if (host) { +clk_put (pxa->clk); +if (host->ioaddr) +iounmap (host->ioaddr); +if (pxa->res) +release_mem_region (pxa->res->start, +resource_size (pxa->res)); +sdhci_free_host (host); + } + +return ret; +} + +static int __devexit sdhci_pxa_remove(struct platform_device *pdev) +{ +struct sdhci_host *host =platform_get_drvdata (pdev); +struct sdhci_pxa *pxa =sdhci_priv (host); +int dead =0 ; +u32 scratch; + +if (host) { + scratch =readl (host->ioaddr +SDHCI_INT_STATUS ); +if (scratch == (u32)-1 ) + dead =1 ; + +sdhci_remove_host (host, dead); + +if (host->ioaddr) +iounmap (host->ioaddr); +if (pxa->res) +release_mem_region (pxa->res->start, +resource_size (pxa->res)); +if (pxa->clk_enable) { +clk_disable (pxa->clk); + pxa->clk_enable =0 ; + } +clk_put (pxa->clk); + +sdhci_free_host (host); +platform_set_drvdata (pdev,NULL ); + } + +return 0 ; +} + +#ifdef CONFIG_PM +static int sdhci_pxa_suspend(struct platform_device *dev, pm_message_tstate) +{
drivers/mmc/host/sdhci-pxa.c new file +28
-0+struct sdhci_host *host =platform_get_drvdata (dev); + + return sdhci_suspend_host(host, state); +} + +static int sdhci_pxa_resume (struct platform_device *dev) +{ +struct sdhci_host *host =platform_get_drvdata (dev); + +return sdhci_resume_host (host); +} +#else +#define sdhci_pxa_suspend NULL +#define sdhci_pxa_resume NULL +#endif + +static struct platform_driver sdhci_pxa_driver = { + .probe = sdhci_pxa_probe, + .remove =__devexit_p (sdhci_pxa_remove), + .suspend = sdhci_pxa_suspend, + .resume = sdhci_pxa_resume, + .driver = { + .name =DRIVER_NAME , + .owner =THIS_MODULE , + }, +}; + +/************************************************************************* ****\ + *
* + * Driver init/exit
* + *
*
+\************************************************************************ *****/ +drivers/mmc/host/sdhci-pxa.c new file +6
-0+static int __init sdhci_pxa_init (void ) +{ +return platform_driver_register (&sdhci_pxa_driver); +} + +static void __exit sdhci_pxa_exit(void)
drivers/mmc/host/sdhci-pxa.c line 258
Quoted 10 lines
drivers/mmc/host/sdhci-pxa.c new file +10
-0+{ +platform_driver_unregister (&sdhci_pxa_driver); +} + +module_init (sdhci_pxa_init); +module_exit (sdhci_pxa_exit); + +MODULE_DESCRIPTION ("SDH controller driver for PXA168/PXA910/MMP2" ); +MODULE_AUTHOR ("Zhangfei Gao <[email protected]>" ); +MODULE_LICENSE ("GPL v2" );
Thanks!
Cheers
PATCH v3 1/1 MMC: add support of sdhci-pxa driver
Quoted 60 lines · Marek Vasut
Quoted 60 lines
+/************************************************************************* ****\ + *
? ? ? ? * + * Device probing/removal
? ? ? ? ? ? ?* + *
? ? ? ? ? ? ? ? ? * +\************************************************************************ *****/ +(quoted diff) +53
-0+static int __devinit sdhci_pxa_probe(struct platform_device *pdev) +{ + ? ? struct sdhci_pxa_platdata *pdata = pdev->dev.platform_data; + ? ? struct device *dev = &pdev->dev; + ? ? struct sdhci_host *host = NULL; + ? ? struct resource *iomem = NULL; + ? ? struct sdhci_pxa *pxa = NULL; + ? ? int ret, irq; + + ? ? irq = platform_get_irq(pdev, 0); + ? ? if (irq < 0) { + ? ? ? ? ? ? dev_err(dev, "no irq specified\n"); + ? ? ? ? ? ? return irq; + ? ? } + + ? ? iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0); + ? ? if (!iomem) { + ? ? ? ? ? ? dev_err(dev, "no memory specified\n"); + ? ? ? ? ? ? return -ENOENT; + ? ? } + + ? ? host = sdhci_alloc_host(&pdev->dev, sizeof(struct sdhci_pxa)); + ? ? if (IS_ERR(host)) { + ? ? ? ? ? ? dev_err(dev, "failed to alloc host\n"); + ? ? ? ? ? ? return PTR_ERR(host); + ? ? } + + ? ? pxa = sdhci_priv(host); + ? ? pxa->host = host; + ? ? pxa->pdata = pdata; + ? ? pxa->clk_enable = 0; + + ? ? pxa->clk = clk_get(dev, "PXA-SDHCLK"); + ? ? if (IS_ERR(pxa->clk)) { + ? ? ? ? ? ? dev_err(dev, "failed to get io clock\n"); + ? ? ? ? ? ? ret = PTR_ERR(pxa->clk); + ? ? ? ? ? ? goto out; + ? ? } + + ? ? pxa->res = request_mem_region(iomem->start, resource_size(iomem), + ? ? ? ? ? ? mmc_hostname(host->mmc)); + ? ? if (!pxa->res) { + ? ? ? ? ? ? dev_err(&pdev->dev, "cannot request region\n"); + ? ? ? ? ? ? ret = -EBUSY; + ? ? ? ? ? ? goto out; + ? ? } + + ? ? host->ioaddr = ioremap(iomem->start, resource_size(iomem)); + ? ? if (!host->ioaddr) { + ? ? ? ? ? ? dev_err(&pdev->dev, "failed to remap registers\n"); + ? ? ? ? ? ? ret = -ENOMEM; + ? ? ? ? ? ? goto out; + ? ? }
Quoted 8 lines
Review
Quoted 6 lines
(quoted diff) +6
-0+ + ? ? host->hw_name = "MMC"; + ? ? host->ops = &sdhci_pxa_ops; + ? ? host->irq = irq; + ? ? host->quirks = SDHCI_QUIRK_BROKEN_ADMA | SDHCI_QUIRK_BROKEN_TIMEOUT_VAL; +Maybe check if these aren't already set in pdata and warn user ?
Here pdata->quirks only provide specific quirk like SDHCI_QUIRK_BROKEN_CARD_DETECTION for on-chip device, the common quirk is provided above.
In sdhci-s3c, host->quirks is modified here via pdata->cd_type, which is also a good method.
Here we transfer SDHCI_QUIRK_BROKEN_CARD_DETECTION directly from pdata since it already move to include folder.
Quoted 14 lines
Review
Quoted 12 lines
+ ? ? if (
pdata->quirks)
+ ? ? ? ? ? ?host->quirks|=pdata->quirks;(quoted diff) +9
-0+ + ? ? ret = sdhci_add_host(host); + ? ? if (ret) { + ? ? ? ? ? ? dev_err(&pdev->dev, "failed to add host\n"); + ? ? ? ? ? ? goto out; + ? ? } + + ? ? if (pxa->pdata->max_speed) + ? ? ? ? ? ? host->mmc->f_max = pxa->pdata->max_speed;What happens otherwise ?
Otherwise, host->mmc->f_max = host->max_clk set in sdhci_add_host, host->max_clk is 50M in 2.0 controller, and 200M in 3.0 controller, if controller does not need to provide get_max_clock.
it's better add defalut value in else condition.
Thanks Marek for review.
Quoted 25 lines
Quoted 9 lines
(quoted diff) +8
-0+ + ? ? platform_set_drvdata(pdev, host); + + ? ? return 0; +out: + ? ? if (host) { + ? ? ? ? ? ? clk_put(pxa->clk); + ? ? ? ? ? ? if (host->ioaddr)Review
Quoted 10 lines
(quoted diff) +10
-0+ ? ? ? ? ? ? ? ? ? ? iounmap(host->ioaddr); + ? ? ? ? ? ? if (pxa->res) + ? ? ? ? ? ? ? ? ? ? release_mem_region(pxa->res->start, + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? resource_size(pxa->res)); + ? ? ? ? ? ? sdhci_free_host(host); + ? ? } + + ? ? return ret; +} +Thanks!
Cheers
PATCH v3 1/1 MMC: add support of sdhci-pxa driver
Dne So 23. ??jna 2010 18:47:10 zhangfei gao napsal(a):
Quoted 70 lines · Marek Vasut
Quoted 60 lines
Quoted 60 lines
+/********************************************************************** *** ****\ + *
* + * Device probing/removal
* + *
*
+\********************************************************************** ** *****/ +drivers/mmc/host/sdhci-pxa.c new file +53
-0+static int __devinit sdhci_pxa_probe (struct platform_device *pdev) +{ +struct sdhci_pxa_platdata *pdata = pdev->dev.platform_data; +struct device *dev = &pdev->dev; +struct sdhci_host *host =NULL ; +struct resource *iomem =NULL ; +struct sdhci_pxa *pxa =NULL ; +int ret, irq; + + irq =platform_get_irq (pdev,0 ); +if (irq <0 ) { +dev_err (dev,"no irq specified\n" ); +return irq; + } + + iomem =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!iomem) { +dev_err (dev,"no memory specified\n" ); +return -ENOENT ; + } + + host =sdhci_alloc_host (&pdev->dev,sizeof (struct sdhci_pxa )); +if (IS_ERR (host)) { +dev_err (dev,"failed to alloc host\n" ); +return PTR_ERR (host); + } + + pxa =sdhci_priv (host); + pxa->host = host; + pxa->pdata = pdata; + pxa->clk_enable =0 ; + + pxa->clk =clk_get (dev,"PXA-SDHCLK" ); +if (IS_ERR (pxa->clk)) { +dev_err (dev,"failed to get io clock\n" ); + ret =PTR_ERR (pxa->clk); + goto out; + } + + pxa->res =request_mem_region (iomem->start,resource_size (iomem), +mmc_hostname (host->mmc)); +if (!pxa->res) { +dev_err (&pdev->dev,"cannot request region\n" ); + ret = -EBUSY ; + goto out; + } + + host->ioaddr =ioremap (iomem->start,resource_size (iomem)); +if (!host->ioaddr) { +dev_err (&pdev->dev,"failed to remap registers\n" ); + ret = -ENOMEM ; + goto out; + }Quoted 8 lines
Quoted 6 lines
drivers/mmc/host/sdhci-pxa.c new file +5
-0+ + host->hw_name ="MMC" ; + host->ops = &sdhci_pxa_ops; + host->irq = irq; + host->quirks = SDHCI_QUIRK_BROKEN_ADMA |
SDHCI_QUIRK_BROKEN_TIMEOUT_VAL; +Maybe check if these aren't already set in pdata and warn user ?
Quoted 3 lines
Here
pdata->quirksonly provide specific quirk likeSDHCI_QUIRK_BROKEN_CARD_DETECTIONfor on-chip device, the common quirk is provided above.
Right, but what if the user also provides such a quirk? It's unnecessary ... and in case the quirk was removed from here later, it'd have to be removed from user's code too ...
Quoted 19 lines
In sdhci-s3c,
host->quirksis modified here viapdata->cd_type, which is also a good method.
Here we transferSDHCI_QUIRK_BROKEN_CARD_DETECTIONdirectly from pdata since it already move to include folder.Quoted 5 lines
Quoted 5 lines
drivers/mmc/host/sdhci-pxa.c new file +5
-0+if (pdata->quirks) + host->quirks |= pdata->quirks; + + ret =sdhci_add_host (host); +if (ret) {Quoted 8 lines
drivers/mmc/host/sdhci-pxa.c line 151
Quoted 6 lines
drivers/mmc/host/sdhci-pxa.c new file +6
-0+dev_err (&pdev->dev,"failed to add host\n" ); + goto out; + } + +if (pxa->pdata->max_speed) + host->mmc->f_max = pxa->pdata->max_speed;What happens otherwise ?
Quoted 4 lines
Otherwise,
host->mmc->f_max=host->max_clkset insdhci_add_host,host->max_clkis 50M in 2.0 controller, and 200M in 3.0 controller, if controller does not need to provideget_max_clock.
it's better add defalut value in else condition.
Thanks for clearing this
Quoted 25 lines
Thanks Marek for review.
Quoted 22 lines
Quoted 8 lines
drivers/mmc/host/sdhci-pxa.c new file +8
-0+ +platform_set_drvdata (pdev, host); + +return 0 ; +out: +if (host) { +clk_put (pxa->clk); +if (host->ioaddr)drivers/mmc/host/sdhci-pxa.c line 169
Quoted 10 lines
drivers/mmc/host/sdhci-pxa.c new file +10
-0+iounmap (host->ioaddr); +if (pxa->res) +release_mem_region (pxa->res->start, +resource_size (pxa->res)); +sdhci_free_host (host); + } + +return ret; +} +Thanks!
Cheers
PATCH v3 1/1 MMC: add support of sdhci-pxa driver
Quoted 71 lines · Marek Vasut
Dne So 23. ??jna 2010 18:47:10 zhangfei gao napsal(a):
Quoted 70 lines · Marek Vasut
Quoted 68 lines
Quoted 65 lines
+/********************************************************************** *** ****\ + *
? ? ? ? * + * Device probing/removal
? ? ? ? ? ? ?* + *
? ? ? ? ? ? ? ? ? * +\********************************************************************** ** *****/ +(quoted diff) +58
-0+static int __devinit sdhci_pxa_probe(struct platform_device *pdev) +{ + ? ? struct sdhci_pxa_platdata *pdata = pdev->dev.platform_data; + ? ? struct device *dev = &pdev->dev; + ? ? struct sdhci_host *host = NULL; + ? ? struct resource *iomem = NULL; + ? ? struct sdhci_pxa *pxa = NULL; + ? ? int ret, irq; + + ? ? irq = platform_get_irq(pdev, 0); + ? ? if (irq < 0) { + ? ? ? ? ? ? dev_err(dev, "no irq specified\n"); + ? ? ? ? ? ? return irq; + ? ? } + + ? ? iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0); + ? ? if (!iomem) { + ? ? ? ? ? ? dev_err(dev, "no memory specified\n"); + ? ? ? ? ? ? return -ENOENT; + ? ? } + + ? ? host = sdhci_alloc_host(&pdev->dev, sizeof(struct sdhci_pxa)); + ? ? if (IS_ERR(host)) { + ? ? ? ? ? ? dev_err(dev, "failed to alloc host\n"); + ? ? ? ? ? ? return PTR_ERR(host); + ? ? } + + ? ? pxa = sdhci_priv(host); + ? ? pxa->host = host; + ? ? pxa->pdata = pdata; + ? ? pxa->clk_enable = 0; + + ? ? pxa->clk = clk_get(dev, "PXA-SDHCLK"); + ? ? if (IS_ERR(pxa->clk)) { + ? ? ? ? ? ? dev_err(dev, "failed to get io clock\n"); + ? ? ? ? ? ? ret = PTR_ERR(pxa->clk); + ? ? ? ? ? ? goto out; + ? ? } + + ? ? pxa->res = request_mem_region(iomem->start, resource_size(iomem), + ? ? ? ? ? ? mmc_hostname(host->mmc)); + ? ? if (!pxa->res) { + ? ? ? ? ? ? dev_err(&pdev->dev, "cannot request region\n"); + ? ? ? ? ? ? ret = -EBUSY; + ? ? ? ? ? ? goto out; + ? ? } + + ? ? host->ioaddr = ioremap(iomem->start, resource_size(iomem)); + ? ? if (!host->ioaddr) { + ? ? ? ? ? ? dev_err(&pdev->dev, "failed to remap registers\n"); + ? ? ? ? ? ? ret = -ENOMEM; + ? ? ? ? ? ? goto out; + ? ? } + + ? ? host->hw_name = "MMC"; + ? ? host->ops = &sdhci_pxa_ops; + ? ? host->irq = irq; + ? ? host->quirks = SDHCI_QUIRK_BROKEN_ADMA |Quoted 1 line
SDHCI_QUIRK_BROKEN_TIMEOUT_VAL; +Maybe check if these aren't already set in pdata and warn user ?
Quoted 7 lines
Quoted 3 lines
Here
pdata->quirksonly provide specific quirk likeSDHCI_QUIRK_BROKEN_CARD_DETECTIONfor on-chip device, the common quirk is provided above.Right, but what if the user also provides such a quirk? It's unnecessary ... and in case the quirk was removed from here later, it'd have to be removed from user's code too ...
What do you mean 'in case the quirk was removed from here later'. SDHCI_QUIRK_* is just move from drivers/mmc/host/sdhci.h to include/linux/mmc/sdhci.h, so code in arch/arm could access them directly.
We also consider use one flag here, like sdhci-s3c.c. Code like this,
if (pdata->flags & PXA_FLAG_CARD_PERMENT)
host->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION;
If SDHCI_QUIRK_* not permitted to access, it would be better to use this method.
Quoted 52 lines
Quoted 20 lines
In sdhci-s3c,
host->quirksis modified here viapdata->cd_type, which is also a good method.
Here we transferSDHCI_QUIRK_BROKEN_CARD_DETECTIONdirectly from pdata since it already move to include folder.Quoted 5 lines
Quoted 5 lines
+ ? ? if (
pdata->quirks)
+ ? ? ? ? ? ?host->quirks|=pdata->quirks;
+
+ ? ? ret =sdhci_add_host(host);
+ ? ? if (ret) {Quoted 8 lines
Quoted 6 lines
+ ? ? ? ? ? ?
dev_err(&pdev->dev, "failed to add host\n");
+ ? ? ? ? ? ? goto out;
+ ? ? }
+
+ ? ? if (pxa->pdata->max_speed)
+ ? ? ? ? ? ?host->mmc->f_max=pxa->pdata->max_speed;What happens otherwise ?
Quoted 4 lines
Otherwise,
host->mmc->f_max=host->max_clkset insdhci_add_host,host->max_clkis 50M in 2.0 controller, and 200M in 3.0 controller, if controller does not need to provideget_max_clock.
it's better add defalut value in else condition.Thanks for clearing this
Quoted 25 lines
Thanks Marek for review.
Quoted 22 lines
Quoted 8 lines
(quoted diff) +8
-0+ + ? ? platform_set_drvdata(pdev, host); + + ? ? return 0; +out: + ? ? if (host) { + ? ? ? ? ? ? clk_put(pxa->clk); + ? ? ? ? ? ? if (host->ioaddr)Review
Quoted 10 lines
(quoted diff) +10
-0+ ? ? ? ? ? ? ? ? ? ? iounmap(host->ioaddr); + ? ? ? ? ? ? if (pxa->res) + ? ? ? ? ? ? ? ? ? ? release_mem_region(pxa->res->start, + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? resource_size(pxa->res)); + ? ? ? ? ? ? sdhci_free_host(host); + ? ? } + + ? ? return ret; +} +Thanks!
Cheers
PATCH v3 1/1 MMC: add support of sdhci-pxa driver
Dne Ne 24. ??jna 2010 05:26:38 zhangfei gao napsal(a):
Quoted 3 lines · Marek Vasut
Quoted 2 lines
Dne So 23. ??jna 2010 18:47:10 zhangfei gao napsal(a):
Quoted 1 line
On Sat, Oct 23, 2010 at 10:24 PM, Marek Vasut <[email protected]>
Quoted 73 lines · wrote:
Quoted 73 lines
Quoted 72 lines
Quoted 60 lines
Quoted 60 lines
+/******************************************************************* *** *** ****\ + *
* + * Device probing/removal
* + *
*
+\******************************************************************* *** ** *****/ +(quoted diff) +40
-0+static int __devinit sdhci_pxa_probe(struct platform_device *pdev) +{ + struct sdhci_pxa_platdata *pdata = pdev->dev.platform_data; + struct device *dev = &pdev->dev; + struct sdhci_host *host = NULL; + struct resource *iomem = NULL; + struct sdhci_pxa *pxa = NULL; + int ret, irq; + + irq = platform_get_irq(pdev, 0); + if (irq < 0) { + dev_err(dev, "no irq specified\n"); + return irq; + } + + iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!iomem) { + dev_err(dev, "no memory specified\n"); + return -ENOENT; + } + + host = sdhci_alloc_host(&pdev->dev, sizeof(struct sdhci_pxa)); + if (IS_ERR(host)) { + dev_err(dev, "failed to alloc host\n"); + return PTR_ERR(host); + } + + pxa = sdhci_priv(host); + pxa->host = host; + pxa->pdata = pdata; + pxa->clk_enable = 0; + + pxa->clk = clk_get(dev, "PXA-SDHCLK"); + if (IS_ERR(pxa->clk)) { + dev_err(dev, "failed to get io clock\n"); + ret = PTR_ERR(pxa->clk); + goto out; + } + + pxa->res = request_mem_region(iomem->start,
resource_size(iomem), +mmc_hostname(host->mmc));(quoted diff) +12
-0+ if (!pxa->res) { + dev_err(&pdev->dev, "cannot request region\n"); + ret = -EBUSY; + goto out; + } + + host->ioaddr = ioremap(iomem->start, resource_size(iomem)); + if (!host->ioaddr) { + dev_err(&pdev->dev, "failed to remap registers\n"); + ret = -ENOMEM; + goto out; + }Quoted 8 lines
Quoted 6 lines
(quoted diff) +5
-0+ + host->hw_name = "MMC"; + host->ops = &sdhci_pxa_ops; + host->irq = irq; + host->quirks = SDHCI_QUIRK_BROKEN_ADMA |
SDHCI_QUIRK_BROKEN_TIMEOUT_VAL; +Maybe check if these aren't already set in pdata and warn user ?
Here
pdata->quirksonly provide specific quirk likeSDHCI_QUIRK_BROKEN_CARD_DETECTIONfor on-chip device, the common quirk is provided above.
Quoted 5 lines
Quoted 3 lines
Right, but what if the user also provides such a quirk? It's unnecessary ... and in case the quirk was removed from here later, it'd have to be removed from user's code too ...
What do you mean 'in case the quirk was removed from here later'.
I mean ... if setting the quirk was removed from the driver source, it'd have to be removed from user code that uses the driver as well -- in case user also set such a quirk in pdata->quirks. So it might be a good idea to warn user that he's setting something that's getting set elsewhere (in the driver) anyway.
Quoted 62 lines
SDHCI_QUIRK_* is just move from
drivers/mmc/host/sdhci.htoinclude/linux/mmc/sdhci.h, so code inarch/armcould access them directly.We also consider use one flag here, like
sdhci-s3c.c. Code like this,
if (pdata->flags&PXA_FLAG_CARD_PERMENT)host->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION;If SDHCI_QUIRK_* not permitted to access, it would be better to use this method.
Quoted 50 lines
Quoted 19 lines
In sdhci-s3c,
host->quirksis modified here viapdata->cd_type, which is also a good method.
Here we transferSDHCI_QUIRK_BROKEN_CARD_DETECTIONdirectly from pdata since it already move to include folder.Quoted 5 lines
Quoted 5 lines
(quoted diff) +5
-0+ if (pdata->quirks) + host->quirks |= pdata->quirks; + + ret = sdhci_add_host(host); + if (ret) {Quoted 8 lines
Review
Quoted 6 lines
(quoted diff) +6
-0+ dev_err(&pdev->dev, "failed to add host\n"); + goto out; + } + + if (pxa->pdata->max_speed) + host->mmc->f_max = pxa->pdata->max_speed;What happens otherwise ?
Quoted 4 lines
Otherwise,
host->mmc->f_max=host->max_clkset insdhci_add_host,host->max_clkis 50M in 2.0 controller, and 200M in 3.0 controller, if controller does not need to provideget_max_clock.
it's better add defalut value in else condition.Thanks for clearing this
Quoted 24 lines
Thanks Marek for review.
Quoted 22 lines
Quoted 8 lines
(quoted diff) +8
-0+ + platform_set_drvdata(pdev, host); + + return 0; +out: + if (host) { + clk_put(pxa->clk); + if (host->ioaddr)Review
Quoted 10 lines
(quoted diff) +10
-0+ iounmap(host->ioaddr); + if (pxa->res) + release_mem_region(pxa->res->start, + resource_size(pxa->res)); + sdhci_free_host(host); + } + + return ret; +} +Thanks!
Cheers
PATCH v3 1/1 MMC: add support of sdhci-pxa driver
2010/10/24 Marek Vasut <[email protected]>:
Quoted 82 lines
Dne Ne 24. ??jna 2010 05:26:38 zhangfei gao napsal(a):
Quoted 3 lines · Marek Vasut
Quoted 2 lines
Dne So 23. ??jna 2010 18:47:10 zhangfei gao napsal(a):
Quoted 1 line
On Sat, Oct 23, 2010 at 10:24 PM, Marek Vasut <[email protected]>
Quoted 77 lines · wrote:
Quoted 76 lines
Quoted 69 lines
Quoted 60 lines
Quoted 60 lines
+/******************************************************************* *** *** ****\ + *
? ? ? ? * + * Device probing/removal
? ? ? ? ? ? ?* + *
? ? ? ? ? ? ? ? ? * +\******************************************************************* *** ** *****/ +(quoted diff) +40
-0+static int __devinit sdhci_pxa_probe(struct platform_device *pdev) +{ + ? ? struct sdhci_pxa_platdata *pdata = pdev->dev.platform_data; + ? ? struct device *dev = &pdev->dev; + ? ? struct sdhci_host *host = NULL; + ? ? struct resource *iomem = NULL; + ? ? struct sdhci_pxa *pxa = NULL; + ? ? int ret, irq; + + ? ? irq = platform_get_irq(pdev, 0); + ? ? if (irq < 0) { + ? ? ? ? ? ? dev_err(dev, "no irq specified\n"); + ? ? ? ? ? ? return irq; + ? ? } + + ? ? iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0); + ? ? if (!iomem) { + ? ? ? ? ? ? dev_err(dev, "no memory specified\n"); + ? ? ? ? ? ? return -ENOENT; + ? ? } + + ? ? host = sdhci_alloc_host(&pdev->dev, sizeof(struct sdhci_pxa)); + ? ? if (IS_ERR(host)) { + ? ? ? ? ? ? dev_err(dev, "failed to alloc host\n"); + ? ? ? ? ? ? return PTR_ERR(host); + ? ? } + + ? ? pxa = sdhci_priv(host); + ? ? pxa->host = host; + ? ? pxa->pdata = pdata; + ? ? pxa->clk_enable = 0; + + ? ? pxa->clk = clk_get(dev, "PXA-SDHCLK"); + ? ? if (IS_ERR(pxa->clk)) { + ? ? ? ? ? ? dev_err(dev, "failed to get io clock\n"); + ? ? ? ? ? ? ret = PTR_ERR(pxa->clk); + ? ? ? ? ? ? goto out; + ? ? } + + ? ? pxa->res = request_mem_region(iomem->start,
resource_size(iomem), + ? ? ? ? ? ?mmc_hostname(host->mmc));
+ ? ? if (!pxa->res) {
+ ? ? ? ? ? ?dev_err(&pdev->dev, "cannot request region\n");
+ ? ? ? ? ? ? ret =-EBUSY;
+ ? ? ? ? ? ? goto out;
+ ? ? }
+
+ ? ?host->ioaddr=ioremap(iomem->start, resource_size(iomem));
+ ? ? if (!host->ioaddr) {
+ ? ? ? ? ? ?dev_err(&pdev->dev, "failed to remap registers\n");
+ ? ? ? ? ? ? ret =-ENOMEM;
+ ? ? ? ? ? ? goto out;
+ ? ? }Quoted 8 lines
Quoted 6 lines
+
+ ? ?host->hw_name= "MMC";
+ ? ?host->ops=&sdhci_pxa_ops;
+ ? ?host->irq= irq;
+ ? ?host->quirks=SDHCI_QUIRK_BROKEN_ADMA|SDHCI_QUIRK_BROKEN_TIMEOUT_VAL; +Maybe check if these aren't already set in pdata and warn user ?
Quoted 3 lines
Here
pdata->quirksonly provide specific quirk likeSDHCI_QUIRK_BROKEN_CARD_DETECTIONfor on-chip device, the common quirk is provided above.Right, but what if the user also provides such a quirk? It's unnecessary ... and in case the quirk was removed from here later, it'd have to be removed from user's code too ...
Quoted 6 lines
Quoted 1 line
What do you mean 'in case the quirk was removed from here later'.
I mean ... if setting the quirk was removed from the driver source, it'd have to be removed from user code that uses the driver as well -- in case user also set such a quirk in
pdata->quirks. So it might be a good idea to warn user that he's setting something that's getting set elsewhere (in the driver) anyway.
Thanks for suggestion, but I think it is OK here.
In our design, driver set common limitation quirk, and pdata set specific quirk for some device.
Quoted 64 lines
Quoted 63 lines
SDHCI_QUIRK_* is just move from
drivers/mmc/host/sdhci.htoinclude/linux/mmc/sdhci.h, so code inarch/armcould access them directly.We also consider use one flag here, like
sdhci-s3c.c. Code like this,
if (pdata->flags&PXA_FLAG_CARD_PERMENT)
? ? ?host->quirks |=SDHCI_QUIRK_BROKEN_CARD_DETECTION;If SDHCI_QUIRK_* not permitted to access, it would be better to use this method.
Quoted 50 lines
Quoted 19 lines
In sdhci-s3c,
host->quirksis modified here viapdata->cd_type, which is also a good method.
Here we transferSDHCI_QUIRK_BROKEN_CARD_DETECTIONdirectly from pdata since it already move to include folder.Quoted 5 lines
Quoted 5 lines
+ ? ? if (
pdata->quirks)
+ ? ? ? ? ? ?host->quirks|=pdata->quirks;
+
+ ? ? ret =sdhci_add_host(host);
+ ? ? if (ret) {Quoted 8 lines
Quoted 6 lines
+ ? ? ? ? ? ?
dev_err(&pdev->dev, "failed to add host\n");
+ ? ? ? ? ? ? goto out;
+ ? ? }
+
+ ? ? if (pxa->pdata->max_speed)
+ ? ? ? ? ? ?host->mmc->f_max=pxa->pdata->max_speed;What happens otherwise ?
Quoted 4 lines
Otherwise,
host->mmc->f_max=host->max_clkset insdhci_add_host,host->max_clkis 50M in 2.0 controller, and 200M in 3.0 controller, if controller does not need to provideget_max_clock.
it's better add defalut value in else condition.Thanks for clearing this
Quoted 24 lines
Thanks Marek for review.
Quoted 22 lines
Quoted 8 lines
(quoted diff) +8
-0+ + ? ? platform_set_drvdata(pdev, host); + + ? ? return 0; +out: + ? ? if (host) { + ? ? ? ? ? ? clk_put(pxa->clk); + ? ? ? ? ? ? if (host->ioaddr)Review
Quoted 10 lines
(quoted diff) +10
-0+ ? ? ? ? ? ? ? ? ? ? iounmap(host->ioaddr); + ? ? ? ? ? ? if (pxa->res) + ? ? ? ? ? ? ? ? ? ? release_mem_region(pxa->res->start, + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? resource_size(pxa->res)); + ? ? ? ? ? ? sdhci_free_host(host); + ? ? } + + ? ? return ret; +} +Thanks!
Cheers