diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2012-05-12 13:32:09 +0800 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2012-05-12 13:32:09 +0800 |
commit | 844d0b5a0b42d6c73114a1dc229db751120d226f (patch) | |
tree | faf9f83e78ae24f6730d64999a89c35144da3b8a /arch/arm/mach-mxs/mach-mx23evk.c | |
parent | 50260924afd4b745bfb6e5f1caee381a1875fc31 (diff) | |
parent | a0f5e3631b07cabf624e7d818df76d47d9d21017 (diff) | |
download | talos-op-linux-844d0b5a0b42d6c73114a1dc229db751120d226f.tar.gz talos-op-linux-844d0b5a0b42d6c73114a1dc229db751120d226f.zip |
Merge branches 'clk/mxs' and 'imx/pinctrl/for-3.5' into mxs/dt/for-3.5
Diffstat (limited to 'arch/arm/mach-mxs/mach-mx23evk.c')
-rw-r--r-- | arch/arm/mach-mxs/mach-mx23evk.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mxs/mach-mx23evk.c b/arch/arm/mach-mxs/mach-mx23evk.c index 5ea1c57d2606..e7272a41939d 100644 --- a/arch/arm/mach-mxs/mach-mx23evk.c +++ b/arch/arm/mach-mxs/mach-mx23evk.c @@ -141,6 +141,8 @@ static void __init mx23evk_init(void) { int ret; + mx23_soc_init(); + mxs_iomux_setup_multiple_pads(mx23evk_pads, ARRAY_SIZE(mx23evk_pads)); mx23_add_duart(); |