diff options
| author | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2008-09-24 23:36:23 +0200 |
|---|---|---|
| committer | Samuel Ortiz <samuel@sortiz.org> | 2008-10-19 22:54:09 +0200 |
| commit | 1c1b6ffce5737d764cc474b9bd6677bb9a344094 (patch) | |
| tree | b637110fe6282769104b72d08b3864ed1538bf96 /drivers/mfd | |
| parent | 80e74a805f0a6662b9b8de519439afd06ac35427 (diff) | |
| download | kernel_samsung_smdk4412-1c1b6ffce5737d764cc474b9bd6677bb9a344094.zip kernel_samsung_smdk4412-1c1b6ffce5737d764cc474b9bd6677bb9a344094.tar.gz kernel_samsung_smdk4412-1c1b6ffce5737d764cc474b9bd6677bb9a344094.tar.bz2 | |
mfd: provide and use setup hook for tc6393xb
Instead of using bitfields for initial gpio setup,
provide generic setup/teardown hooks that can be used
to set the gpio states, register child devices, etc.
Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@openedhand.com>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/tc6393xb.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c index e4c1c78..83dc703 100644 --- a/drivers/mfd/tc6393xb.c +++ b/drivers/mfd/tc6393xb.c @@ -460,13 +460,6 @@ static int __devinit tc6393xb_probe(struct platform_device *dev) tc6393xb->suspend_state.fer = 0; - for (i = 0; i < 3; i++) { - tc6393xb->suspend_state.gpo_dsr[i] = - (tcpd->scr_gpo_dsr >> (8 * i)) & 0xff; - tc6393xb->suspend_state.gpo_doecr[i] = - (tcpd->scr_gpo_doecr >> (8 * i)) & 0xff; - } - tc6393xb->suspend_state.ccr = SCR_CCR_UNK1 | SCR_CCR_HCLK_48; @@ -488,6 +481,12 @@ static int __devinit tc6393xb_probe(struct platform_device *dev) tc6393xb_attach_irq(dev); + if (tcpd->setup) { + ret = tcpd->setup(dev); + if (ret) + goto err_setup; + } + tc6393xb_cells[TC6393XB_CELL_NAND].driver_data = tcpd->nand_data; tc6393xb_cells[TC6393XB_CELL_NAND].platform_data = &tc6393xb_cells[TC6393XB_CELL_NAND]; @@ -506,6 +505,10 @@ static int __devinit tc6393xb_probe(struct platform_device *dev) if (!ret) return 0; + if (tcpd->teardown) + tcpd->teardown(dev); + +err_setup: tc6393xb_detach_irq(dev); err_gpio_add: @@ -535,6 +538,10 @@ static int __devexit tc6393xb_remove(struct platform_device *dev) int ret; mfd_remove_devices(&dev->dev); + + if (tcpd->teardown) + tcpd->teardown(dev); + tc6393xb_detach_irq(dev); if (tc6393xb->gpio.base != -1) { |