diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2012-05-12 09:32:09 +0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2012-05-12 09:32:09 +0400 |
commit | 844d0b5a0b42d6c73114a1dc229db751120d226f (patch) | |
tree | faf9f83e78ae24f6730d64999a89c35144da3b8a /arch/arm/mach-mxs/mach-stmp378x_devb.c | |
parent | 50260924afd4b745bfb6e5f1caee381a1875fc31 (diff) | |
parent | a0f5e3631b07cabf624e7d818df76d47d9d21017 (diff) | |
download | linux-844d0b5a0b42d6c73114a1dc229db751120d226f.tar.xz |
Merge branches 'clk/mxs' and 'imx/pinctrl/for-3.5' into mxs/dt/for-3.5
Diffstat (limited to 'arch/arm/mach-mxs/mach-stmp378x_devb.c')
-rw-r--r-- | arch/arm/mach-mxs/mach-stmp378x_devb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mxs/mach-stmp378x_devb.c b/arch/arm/mach-mxs/mach-stmp378x_devb.c index a626c07b8713..6548965e4a76 100644 --- a/arch/arm/mach-mxs/mach-stmp378x_devb.c +++ b/arch/arm/mach-mxs/mach-stmp378x_devb.c @@ -85,6 +85,8 @@ static void __init stmp378x_dvb_init(void) { int ret; + mx23_soc_init(); + mxs_iomux_setup_multiple_pads(stmp378x_dvb_pads, ARRAY_SIZE(stmp378x_dvb_pads)); |