aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorArnd Hannemann <arnd@arndnet.de>2010-08-24 11:27:00 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2010-10-28 18:29:11 -0400
commit998283e2e359249133f2f47db26669a55ff25c98 (patch)
tree3c5866f8d91ee453491db747d7893dc379239ae5 /drivers
parent19ca7502c508595edfb963e5dbcf62854a926506 (diff)
mfd: Allow the platform to specify the sh_mobile_sdhi get_cd handler
On some platforms (e.g. AP4EVB) the card detect pin of a slot is not directly connected to the sdhi hardware, so that polling needs to be used with tmio_mmc and card detection is handled in the platform code. This patch allows to set tmio_mmc capabilities (to pass the MMC_CAP_NEEDS_POLL flag) and exposes a get_cd hook for that purpose. Signed-off-by: Arnd Hannemann <arnd@arndnet.de> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mfd/sh_mobile_sdhi.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/mfd/sh_mobile_sdhi.c b/drivers/mfd/sh_mobile_sdhi.c
index 49b4d069cbf9..01d83a41d570 100644
--- a/drivers/mfd/sh_mobile_sdhi.c
+++ b/drivers/mfd/sh_mobile_sdhi.c
@@ -65,6 +65,17 @@ static void sh_mobile_sdhi_set_pwr(struct platform_device *tmio, int state)
65 p->set_pwr(pdev, state); 65 p->set_pwr(pdev, state);
66} 66}
67 67
68static int sh_mobile_sdhi_get_cd(struct platform_device *tmio)
69{
70 struct platform_device *pdev = to_platform_device(tmio->dev.parent);
71 struct sh_mobile_sdhi_info *p = pdev->dev.platform_data;
72
73 if (p && p->get_cd)
74 return p->get_cd(pdev);
75 else
76 return -ENOSYS;
77}
78
68static int __devinit sh_mobile_sdhi_probe(struct platform_device *pdev) 79static int __devinit sh_mobile_sdhi_probe(struct platform_device *pdev)
69{ 80{
70 struct sh_mobile_sdhi *priv; 81 struct sh_mobile_sdhi *priv;
@@ -106,10 +117,12 @@ static int __devinit sh_mobile_sdhi_probe(struct platform_device *pdev)
106 117
107 mmc_data->hclk = clk_get_rate(priv->clk); 118 mmc_data->hclk = clk_get_rate(priv->clk);
108 mmc_data->set_pwr = sh_mobile_sdhi_set_pwr; 119 mmc_data->set_pwr = sh_mobile_sdhi_set_pwr;
120 mmc_data->get_cd = sh_mobile_sdhi_get_cd;
109 mmc_data->capabilities = MMC_CAP_MMC_HIGHSPEED; 121 mmc_data->capabilities = MMC_CAP_MMC_HIGHSPEED;
110 if (p) { 122 if (p) {
111 mmc_data->flags = p->tmio_flags; 123 mmc_data->flags = p->tmio_flags;
112 mmc_data->ocr_mask = p->tmio_ocr_mask; 124 mmc_data->ocr_mask = p->tmio_ocr_mask;
125 mmc_data->capabilities |= p->tmio_caps;
113 } 126 }
114 127
115 if (p && p->dma_slave_tx >= 0 && p->dma_slave_rx >= 0) { 128 if (p && p->dma_slave_tx >= 0 && p->dma_slave_rx >= 0) {