aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500/include
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2012-09-14 16:16:08 +0100
committerLee Jones <lee.jones@linaro.org>2012-09-20 09:10:56 +0200
commit5ca032ee21cdabd08fb368ce3f02fa8906b0ef5f (patch)
treee77e91004f3e7608c0d6d0e2932fbb5e7881d808 /arch/arm/mach-ux500/include
parentLinux 3.6-rc6 (diff)
downloadlinux-dev-5ca032ee21cdabd08fb368ce3f02fa8906b0ef5f.tar.xz
linux-dev-5ca032ee21cdabd08fb368ce3f02fa8906b0ef5f.zip
ASoC: Ux500: Move MSP pinctrl setup into the MSP driver
In the initial submission of the MSP driver msp1 and msp3's associated pinctrl mechanism was passed back to platform code using a plat_init() call-back routine, but it has no place in platform code. The MSP driver should set this up for the appropriate ports. Instead we use a use_pinctrl identifier which is passed from platform_data/Device Tree which indicates which ports should use pinctrl. Acked-by: Ola Lilja <ola.o.lilja@stericsson.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500/include')
-rw-r--r--arch/arm/mach-ux500/include/mach/msp.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/include/mach/msp.h b/arch/arm/mach-ux500/include/mach/msp.h
index 798be19129ef..3cc7142eee02 100644
--- a/arch/arm/mach-ux500/include/mach/msp.h
+++ b/arch/arm/mach-ux500/include/mach/msp.h
@@ -22,8 +22,6 @@ struct msp_i2s_platform_data {
enum msp_i2s_id id;
struct stedma40_chan_cfg *msp_i2s_dma_rx;
struct stedma40_chan_cfg *msp_i2s_dma_tx;
- int (*msp_i2s_init) (void);
- int (*msp_i2s_exit) (void);
};
#endif