diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-06-06 12:10:07 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-06-06 12:10:07 -0400 |
| commit | 8c31b1635b91e48f867e010cd7bcd06393e5858a (patch) | |
| tree | 4981add7e38e24724d255dedeb03f93be34d33ec /arch/arm/mach-imx/mach-pcm043.c | |
| parent | 121a2dd860f8348fb014b660f133a0cb9a16273e (diff) | |
| parent | 2ce420da39078a6135d1c004a0e4436fdc1458b4 (diff) | |
Merge branch 'gpio/next-mx' into gpio/next
Diffstat (limited to 'arch/arm/mach-imx/mach-pcm043.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-pcm043.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mach-pcm043.c b/arch/arm/mach-imx/mach-pcm043.c index 026441628dfa..163cc318cafb 100644 --- a/arch/arm/mach-imx/mach-pcm043.c +++ b/arch/arm/mach-imx/mach-pcm043.c | |||
| @@ -356,6 +356,8 @@ static struct esdhc_platform_data sd1_pdata = { | |||
| 356 | */ | 356 | */ |
| 357 | static void __init pcm043_init(void) | 357 | static void __init pcm043_init(void) |
| 358 | { | 358 | { |
| 359 | imx35_soc_init(); | ||
| 360 | |||
| 359 | mxc_iomux_v3_setup_multiple_pads(pcm043_pads, ARRAY_SIZE(pcm043_pads)); | 361 | mxc_iomux_v3_setup_multiple_pads(pcm043_pads, ARRAY_SIZE(pcm043_pads)); |
| 360 | 362 | ||
| 361 | mxc_audmux_v2_configure_port(3, | 363 | mxc_audmux_v2_configure_port(3, |