aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-11-05 10:01:16 -0400
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-11-17 04:01:28 -0500
commitbf182bcc6e726cce2f02b699bd0fba787734554f (patch)
treed5de2ac0de946eeafa21c262d6a8a12f85ce45a9 /arch/arm/mach-imx
parentc06246576a6e71b72ecc6b4b39a5c8eaf45dc2ed (diff)
ARM: imx: dynamically allocate mxc_pwm devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r--arch/arm/mach-imx/devices.c19
-rw-r--r--arch/arm/mach-imx/devices.h1
2 files changed, 0 insertions, 20 deletions
diff --git a/arch/arm/mach-imx/devices.c b/arch/arm/mach-imx/devices.c
index d78456411f3f..9ee0e0924f55 100644
--- a/arch/arm/mach-imx/devices.c
+++ b/arch/arm/mach-imx/devices.c
@@ -77,25 +77,6 @@ int __init imx1_register_gpios(void)
77#endif 77#endif
78 78
79#if defined(CONFIG_MACH_MX21) || defined(CONFIG_MACH_MX27) 79#if defined(CONFIG_MACH_MX21) || defined(CONFIG_MACH_MX27)
80static struct resource mxc_pwm_resources[] = {
81 {
82 .start = MX2x_PWM_BASE_ADDR,
83 .end = MX2x_PWM_BASE_ADDR + SZ_4K - 1,
84 .flags = IORESOURCE_MEM,
85 }, {
86 .start = MX2x_INT_PWM,
87 .end = MX2x_INT_PWM,
88 .flags = IORESOURCE_IRQ,
89 }
90};
91
92struct platform_device mxc_pwm_device = {
93 .name = "mxc_pwm",
94 .id = 0,
95 .num_resources = ARRAY_SIZE(mxc_pwm_resources),
96 .resource = mxc_pwm_resources,
97};
98
99#define DEFINE_MXC_MMC_DEVICE(n, baseaddr, irq, dmareq) \ 80#define DEFINE_MXC_MMC_DEVICE(n, baseaddr, irq, dmareq) \
100 static struct resource mxc_sdhc_resources ## n[] = { \ 81 static struct resource mxc_sdhc_resources ## n[] = { \
101 { \ 82 { \
diff --git a/arch/arm/mach-imx/devices.h b/arch/arm/mach-imx/devices.h
index 407e90aa0bc4..1ba5042067ec 100644
--- a/arch/arm/mach-imx/devices.h
+++ b/arch/arm/mach-imx/devices.h
@@ -1,5 +1,4 @@
1#if defined(CONFIG_MACH_MX21) || defined(CONFIG_MACH_MX27) 1#if defined(CONFIG_MACH_MX21) || defined(CONFIG_MACH_MX27)
2extern struct platform_device mxc_pwm_device;
3extern struct platform_device mxc_sdhc_device0; 2extern struct platform_device mxc_sdhc_device0;
4extern struct platform_device mxc_sdhc_device1; 3extern struct platform_device mxc_sdhc_device1;
5extern struct platform_device mxc_otg_udc_device; 4extern struct platform_device mxc_otg_udc_device;