diff options
| author | Baruch Siach <baruch@tkos.co.il> | 2010-05-26 08:12:10 -0400 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-07-26 08:17:55 -0400 |
| commit | 49535a952bb7ca41dc1c59d89e36f5ff2ef1bc08 (patch) | |
| tree | 18752840bcd97a8746472bdced135428878bf779 /arch/arm/mach-mx25 | |
| parent | cce02464dd4733e8173d01a9a7a3ff5491c8546b (diff) | |
mx25: add platform code for imx-keypad
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx25')
| -rw-r--r-- | arch/arm/mach-mx25/clock.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx25/devices.c | 20 | ||||
| -rw-r--r-- | arch/arm/mach-mx25/devices.h | 1 |
3 files changed, 22 insertions, 1 deletions
diff --git a/arch/arm/mach-mx25/clock.c b/arch/arm/mach-mx25/clock.c index 155014993b13..f44d65765b9a 100644 --- a/arch/arm/mach-mx25/clock.c +++ b/arch/arm/mach-mx25/clock.c | |||
| @@ -217,7 +217,7 @@ static struct clk_lookup lookups[] = { | |||
| 217 | _REGISTER_CLOCK("mxc_pwm.1", NULL, pwm2_clk) | 217 | _REGISTER_CLOCK("mxc_pwm.1", NULL, pwm2_clk) |
| 218 | _REGISTER_CLOCK("mxc_pwm.2", NULL, pwm3_clk) | 218 | _REGISTER_CLOCK("mxc_pwm.2", NULL, pwm3_clk) |
| 219 | _REGISTER_CLOCK("mxc_pwm.3", NULL, pwm4_clk) | 219 | _REGISTER_CLOCK("mxc_pwm.3", NULL, pwm4_clk) |
| 220 | _REGISTER_CLOCK("mxc-keypad", NULL, kpp_clk) | 220 | _REGISTER_CLOCK("imx-keypad", NULL, kpp_clk) |
| 221 | _REGISTER_CLOCK("mx25-adc", NULL, tsc_clk) | 221 | _REGISTER_CLOCK("mx25-adc", NULL, tsc_clk) |
| 222 | _REGISTER_CLOCK("imx-i2c.0", NULL, i2c_clk) | 222 | _REGISTER_CLOCK("imx-i2c.0", NULL, i2c_clk) |
| 223 | _REGISTER_CLOCK("imx-i2c.1", NULL, i2c_clk) | 223 | _REGISTER_CLOCK("imx-i2c.1", NULL, i2c_clk) |
diff --git a/arch/arm/mach-mx25/devices.c b/arch/arm/mach-mx25/devices.c index 3a405fa400eb..fd331d04ea0d 100644 --- a/arch/arm/mach-mx25/devices.c +++ b/arch/arm/mach-mx25/devices.c | |||
| @@ -515,3 +515,23 @@ struct platform_device mxc_wdt = { | |||
| 515 | .num_resources = ARRAY_SIZE(mxc_wdt_resources), | 515 | .num_resources = ARRAY_SIZE(mxc_wdt_resources), |
| 516 | .resource = mxc_wdt_resources, | 516 | .resource = mxc_wdt_resources, |
| 517 | }; | 517 | }; |
| 518 | |||
| 519 | static struct resource mx25_kpp_resources[] = { | ||
| 520 | { | ||
| 521 | .start = MX25_KPP_BASE_ADDR, | ||
| 522 | .end = MX25_KPP_BASE_ADDR + 0xf, | ||
| 523 | .flags = IORESOURCE_MEM, | ||
| 524 | }, | ||
| 525 | { | ||
| 526 | .start = MX25_INT_KPP, | ||
| 527 | .end = MX25_INT_KPP, | ||
| 528 | .flags = IORESOURCE_IRQ, | ||
| 529 | }, | ||
| 530 | }; | ||
| 531 | |||
| 532 | struct platform_device mx25_kpp_device = { | ||
| 533 | .name = "imx-keypad", | ||
| 534 | .id = -1, | ||
| 535 | .num_resources = ARRAY_SIZE(mx25_kpp_resources), | ||
| 536 | .resource = mx25_kpp_resources, | ||
| 537 | }; | ||
diff --git a/arch/arm/mach-mx25/devices.h b/arch/arm/mach-mx25/devices.h index cee12c0a0be6..8247fd451118 100644 --- a/arch/arm/mach-mx25/devices.h +++ b/arch/arm/mach-mx25/devices.h | |||
| @@ -22,3 +22,4 @@ extern struct platform_device mxc_nand_device; | |||
| 22 | extern struct platform_device mx25_rtc_device; | 22 | extern struct platform_device mx25_rtc_device; |
| 23 | extern struct platform_device mx25_fb_device; | 23 | extern struct platform_device mx25_fb_device; |
| 24 | extern struct platform_device mxc_wdt; | 24 | extern struct platform_device mxc_wdt; |
| 25 | extern struct platform_device mx25_kpp_device; | ||