diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-25 15:06:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-25 15:06:33 -0400 |
commit | ec96e2fe954c23a54bfdf2673437a39e193a1822 (patch) | |
tree | e4041c68ef20a3337c56aefc8db785156307edd1 /arch/arm/mach-mx3/devices.c | |
parent | 8e9815a0f8882aaa68645b001bb7538db8886802 (diff) | |
parent | f949c0edd84101bfd30b3e7389c1a12b067e561d (diff) |
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (103 commits)
ARM: 6141/1: Add audio support part in arch/arm/mach-w90x900
ARM: 5939/1: ARM: Add option CMDLINE_FORCE to force usage of the in-kernel cmdline
ARM: 6140/1: silence a bogus sparse warning in unwind.c
ARM: mach-at91: duplicated include
ARM: arch/arm/nwfpe/fpsr.h: Checkpatch cleanup
ARM: arch/arm/mach-shark/pci.c: Checkpatch cleanup
ARM: arch/arm/nwfpe/ChangeLog: Checkpatch cleanup
ARM: arch/arm/mach-sa1100/leds.c: Checkpatch cleanup
ARM: arch/arm/mach-h720x/common.h: Checkpatch cleanup
ARM: arch/arm/mach-footbridge/ebsa285-pci.c: Checkpatch cleanup
ARM: arch/arm/mach-clps711x/Makefile.boot: Checkpatch cleanup
ARM: arch/arm/boot/bootp/bootp.lds: Checkpatch cleanup
ARM: SPEAR6xx: remove duplicated #include
ARM: s3c6400_defconfig: Add NAND driver
ARM: s3c6400_defconfig: enable sound as modules
ARM: s3c6400_defconfig: enable power management
ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34
ARM: s5pc110_defconfig: Update s5pc110_defconfig to v2.6.34
ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34
ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34
...
Diffstat (limited to 'arch/arm/mach-mx3/devices.c')
-rw-r--r-- | arch/arm/mach-mx3/devices.c | 40 |
1 files changed, 39 insertions, 1 deletions
diff --git a/arch/arm/mach-mx3/devices.c b/arch/arm/mach-mx3/devices.c index f8911154a9f..db7acd6e910 100644 --- a/arch/arm/mach-mx3/devices.c +++ b/arch/arm/mach-mx3/devices.c | |||
@@ -582,12 +582,50 @@ static struct resource imx_wdt_resources[] = { | |||
582 | }; | 582 | }; |
583 | 583 | ||
584 | struct platform_device imx_wdt_device0 = { | 584 | struct platform_device imx_wdt_device0 = { |
585 | .name = "imx-wdt", | 585 | .name = "imx2-wdt", |
586 | .id = 0, | 586 | .id = 0, |
587 | .num_resources = ARRAY_SIZE(imx_wdt_resources), | 587 | .num_resources = ARRAY_SIZE(imx_wdt_resources), |
588 | .resource = imx_wdt_resources, | 588 | .resource = imx_wdt_resources, |
589 | }; | 589 | }; |
590 | 590 | ||
591 | static struct resource imx_rtc_resources[] = { | ||
592 | { | ||
593 | .start = MX31_RTC_BASE_ADDR, | ||
594 | .end = MX31_RTC_BASE_ADDR + 0x3fff, | ||
595 | .flags = IORESOURCE_MEM, | ||
596 | }, | ||
597 | { | ||
598 | .start = MX31_INT_RTC, | ||
599 | .flags = IORESOURCE_IRQ, | ||
600 | }, | ||
601 | }; | ||
602 | |||
603 | struct platform_device imx_rtc_device0 = { | ||
604 | .name = "mxc_rtc", | ||
605 | .id = -1, | ||
606 | .num_resources = ARRAY_SIZE(imx_rtc_resources), | ||
607 | .resource = imx_rtc_resources, | ||
608 | }; | ||
609 | |||
610 | static struct resource imx_kpp_resources[] = { | ||
611 | { | ||
612 | .start = MX3x_KPP_BASE_ADDR, | ||
613 | .end = MX3x_KPP_BASE_ADDR + 0xf, | ||
614 | .flags = IORESOURCE_MEM | ||
615 | }, { | ||
616 | .start = MX3x_INT_KPP, | ||
617 | .end = MX3x_INT_KPP, | ||
618 | .flags = IORESOURCE_IRQ, | ||
619 | }, | ||
620 | }; | ||
621 | |||
622 | struct platform_device imx_kpp_device = { | ||
623 | .name = "imx-keypad", | ||
624 | .id = -1, | ||
625 | .num_resources = ARRAY_SIZE(imx_kpp_resources), | ||
626 | .resource = imx_kpp_resources, | ||
627 | }; | ||
628 | |||
591 | static int __init mx3_devices_init(void) | 629 | static int __init mx3_devices_init(void) |
592 | { | 630 | { |
593 | if (cpu_is_mx31()) { | 631 | if (cpu_is_mx31()) { |