diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2011-07-07 00:37:41 +0800 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-07-08 12:38:12 -0600 |
| commit | e7fc6ae7446710a487510d212137a43289bbe90e (patch) | |
| tree | 6f040b47a383ed19afe48521f449dc0081fa47de /arch/arm/plat-mxc | |
| parent | fb1492186276ba52d99b58121b8a9a87f20cc9f3 (diff) | |
| download | kernel-common-e7fc6ae7446710a487510d212137a43289bbe90e.tar.gz kernel-common-e7fc6ae7446710a487510d212137a43289bbe90e.tar.bz2 kernel-common-e7fc6ae7446710a487510d212137a43289bbe90e.zip | |
gpio/mxc: get rid of the uses of cpu_is_mx()
The patch removes all the uses of cpu_is_mx(). Instead, it utilizes
platform_device_id to distinguish the different gpio types, IMX1_GPIO
on i.mx1, IMX21_GPIO on i.mx21 and i.mx27, IMX31_GPIO on all other
i.mx SoCs.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'arch/arm/plat-mxc')
| -rw-r--r-- | arch/arm/plat-mxc/devices/platform-gpio-mxc.c | 4 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/common.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-mxc/devices/platform-gpio-mxc.c b/arch/arm/plat-mxc/devices/platform-gpio-mxc.c index cf1b7fdfa20d..a7919a241032 100644 --- a/arch/arm/plat-mxc/devices/platform-gpio-mxc.c +++ b/arch/arm/plat-mxc/devices/platform-gpio-mxc.c @@ -8,7 +8,7 @@ */ #include <mach/devices-common.h> -struct platform_device *__init mxc_register_gpio(int id, +struct platform_device *__init mxc_register_gpio(char *name, int id, resource_size_t iobase, resource_size_t iosize, int irq, int irq_high) { struct resource res[] = { @@ -28,5 +28,5 @@ struct platform_device *__init mxc_register_gpio(int id, }; return platform_device_register_resndata(&mxc_aips_bus, - "gpio-mxc", id, res, ARRAY_SIZE(res), NULL, 0); + name, id, res, ARRAY_SIZE(res), NULL, 0); } diff --git a/arch/arm/plat-mxc/include/mach/common.h b/arch/arm/plat-mxc/include/mach/common.h index 91fa2632aa5e..4e3d97890d69 100644 --- a/arch/arm/plat-mxc/include/mach/common.h +++ b/arch/arm/plat-mxc/include/mach/common.h @@ -64,7 +64,7 @@ extern int mx51_clocks_init(unsigned long ckil, unsigned long osc, unsigned long ckih1, unsigned long ckih2); extern int mx53_clocks_init(unsigned long ckil, unsigned long osc, unsigned long ckih1, unsigned long ckih2); -extern struct platform_device *mxc_register_gpio(int id, +extern struct platform_device *mxc_register_gpio(char *name, int id, resource_size_t iobase, resource_size_t iosize, int irq, int irq_high); extern int mxc_register_device(struct platform_device *pdev, void *data); extern void mxc_set_cpu_type(unsigned int type); |