diff options
author | Paul Parsons <lost.distance@yahoo.com> | 2012-04-05 12:45:04 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-05-01 06:00:22 -0400 |
commit | f22a9c6fd56f0a7b24ee43466e524ad4576c6dfd (patch) | |
tree | 5dc0b20cfda2a19ada33a5e48b5d176031b6a7f1 /drivers/mfd/asic3.c | |
parent | 18996db262d0f1e79357315e033ace24488f92ad (diff) |
mfd: Add PCMCIA/CF support to asic3
This patch is part of a set which adds PCMCIA/CF support for the hx4700.
This patch adds asic3_set_register() calls to:
1. Enable the PCMCIA/CF in asic3_probe().
2. Disable the PCMCIA/CF in asic3_remove().
Signed-off-by: Paul Parsons <lost.distance@yahoo.com>
Acked-by: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/asic3.c')
-rw-r--r-- | drivers/mfd/asic3.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c index 1582c3d95257..f75dc6733f49 100644 --- a/drivers/mfd/asic3.c +++ b/drivers/mfd/asic3.c | |||
@@ -1000,6 +1000,9 @@ static int __init asic3_probe(struct platform_device *pdev) | |||
1000 | 1000 | ||
1001 | asic3_mfd_probe(pdev, pdata, mem); | 1001 | asic3_mfd_probe(pdev, pdata, mem); |
1002 | 1002 | ||
1003 | asic3_set_register(asic, ASIC3_OFFSET(EXTCF, SELECT), | ||
1004 | (ASIC3_EXTCF_CF0_BUF_EN|ASIC3_EXTCF_CF0_PWAIT_EN), 1); | ||
1005 | |||
1003 | dev_info(asic->dev, "ASIC3 Core driver\n"); | 1006 | dev_info(asic->dev, "ASIC3 Core driver\n"); |
1004 | 1007 | ||
1005 | return 0; | 1008 | return 0; |
@@ -1021,6 +1024,9 @@ static int __devexit asic3_remove(struct platform_device *pdev) | |||
1021 | int ret; | 1024 | int ret; |
1022 | struct asic3 *asic = platform_get_drvdata(pdev); | 1025 | struct asic3 *asic = platform_get_drvdata(pdev); |
1023 | 1026 | ||
1027 | asic3_set_register(asic, ASIC3_OFFSET(EXTCF, SELECT), | ||
1028 | (ASIC3_EXTCF_CF0_BUF_EN|ASIC3_EXTCF_CF0_PWAIT_EN), 0); | ||
1029 | |||
1024 | asic3_mfd_remove(pdev); | 1030 | asic3_mfd_remove(pdev); |
1025 | 1031 | ||
1026 | ret = asic3_gpio_remove(pdev); | 1032 | ret = asic3_gpio_remove(pdev); |