diff options
| author | Russell King | 2012-03-26 00:56:30 +0200 |
|---|---|---|
| committer | Russell King | 2012-03-26 00:57:10 +0200 |
| commit | 7256ecc2b7b91b4212ccc5511cb12254bdf806d0 (patch) | |
| tree | 1a39b3de03cfc92c5b5dedfb01174d17b49df18a /arch/arm/mach-sa1100/simpad.c | |
| parent | Merge branch 'sa11x0-lcd' into sa11x0 (diff) | |
| parent | MFD: mcp-sa11x0/assabet: move assabet reset handling out of mcp-sa11x0.c (diff) | |
| download | kernel-qcow2-linux-7256ecc2b7b91b4212ccc5511cb12254bdf806d0.tar.gz kernel-qcow2-linux-7256ecc2b7b91b4212ccc5511cb12254bdf806d0.tar.xz kernel-qcow2-linux-7256ecc2b7b91b4212ccc5511cb12254bdf806d0.zip | |
Merge branch 'sa11x0-mcp' into sa11x0
Conflicts:
arch/arm/mach-sa1100/assabet.c
arch/arm/mach-sa1100/collie.c
arch/arm/mach-sa1100/generic.c
arch/arm/mach-sa1100/lart.c
arch/arm/mach-sa1100/shannon.c
Diffstat (limited to 'arch/arm/mach-sa1100/simpad.c')
| -rw-r--r-- | arch/arm/mach-sa1100/simpad.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c index cdb9d197c092..3da4c1f11cf5 100644 --- a/arch/arm/mach-sa1100/simpad.c +++ b/arch/arm/mach-sa1100/simpad.c @@ -10,6 +10,7 @@ #include <linux/string.h> #include <linux/pm.h> #include <linux/platform_device.h> +#include <linux/mfd/ucb1x00.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> #include <linux/io.h> @@ -180,10 +181,14 @@ static struct resource simpad_flash_resources [] = { DEFINE_RES_MEM(SA1100_CS1_PHYS, SZ_16M), }; +static struct ucb1x00_plat_data simpad_ucb1x00_data = { + .gpio_base = SIMPAD_UCB1X00_GPIO_BASE, +}; + static struct mcp_plat_data simpad_mcp_data = { .mccr0 = MCCR0_ADM, .sclk_rate = 11981000, - .gpio_base = SIMPAD_UCB1X00_GPIO_BASE, + .codec_pdata = &simpad_ucb1x00_data, }; @@ -369,6 +374,7 @@ static int __init simpad_init(void) pm_power_off = simpad_power_off; + sa11x0_ppc_configure_mcp(); sa11x0_register_mtd(&simpad_flash_data, simpad_flash_resources, ARRAY_SIZE(simpad_flash_resources)); sa11x0_register_mcp(&simpad_mcp_data); |