diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 20:30:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 20:30:49 -0400 |
commit | 56c10bf82c10588b743e75a13a7949e11b9fc942 (patch) | |
tree | a2eda0459abb314107ac64af770bf7fb360aefc6 /arch/arm/mach-versatile/core.c | |
parent | bab2d8c6020e1d7521cb6c4939f72b061ce947bc (diff) | |
parent | 61b80086a525c8a6081257ae40da5dee2bcaee16 (diff) |
Merge branch 'for-armsoc' of git://git.linaro.org/people/rmk/linux-arm
Pull #1 ARM updates from Russell King:
"This one covers stuff which Arnd is waiting for me to push, as this is
shared between both our trees and probably other trees elsewhere.
Essentially, this contains:
- AMBA primecell device initializer updates - mostly shrinking the
size of the device declarations in platform code to something more
reasonable.
- Getting rid of the NO_IRQ crap from AMBA primecell stuff.
- Nicolas' idle cleanups. This in combination with the restart
cleanups from the last merge window results in a great many
mach/system.h files being deleted."
Yay: ~80 files, ~2000 lines deleted.
* 'for-armsoc' of git://git.linaro.org/people/rmk/linux-arm: (60 commits)
ARM: remove disable_fiq and arch_ret_to_user macros
ARM: make entry-macro.S depend on !MULTI_IRQ_HANDLER
ARM: rpc: make default fiq handler run-time installed
ARM: make arch_ret_to_user macro optional
ARM: amba: samsung: use common amba device initializers
ARM: amba: spear: use common amba device initializers
ARM: amba: nomadik: use common amba device initializers
ARM: amba: u300: use common amba device initializers
ARM: amba: lpc32xx: use common amba device initializers
ARM: amba: netx: use common amba device initializers
ARM: amba: bcmring: use common amba device initializers
ARM: amba: ep93xx: use common amba device initializers
ARM: amba: omap2: use common amba device initializers
ARM: amba: integrator: use common amba device initializers
ARM: amba: realview: get rid of private platform amba_device initializer
ARM: amba: versatile: get rid of private platform amba_device initializer
ARM: amba: vexpress: get rid of private platform amba_device initializer
ARM: amba: provide common initializers for static amba devices
ARM: amba: make use of -1 IRQs warn
ARM: amba: u300: get rid of NO_IRQ initializers
...
Diffstat (limited to 'arch/arm/mach-versatile/core.c')
-rw-r--r-- | arch/arm/mach-versatile/core.c | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c index 008ce22b9a0..0968772aedb 100644 --- a/arch/arm/mach-versatile/core.c +++ b/arch/arm/mach-versatile/core.c | |||
@@ -585,58 +585,58 @@ static struct pl022_ssp_controller ssp0_plat_data = { | |||
585 | .num_chipselect = 1, | 585 | .num_chipselect = 1, |
586 | }; | 586 | }; |
587 | 587 | ||
588 | #define AACI_IRQ { IRQ_AACI, NO_IRQ } | 588 | #define AACI_IRQ { IRQ_AACI } |
589 | #define MMCI0_IRQ { IRQ_MMCI0A,IRQ_SIC_MMCI0B } | 589 | #define MMCI0_IRQ { IRQ_MMCI0A,IRQ_SIC_MMCI0B } |
590 | #define KMI0_IRQ { IRQ_SIC_KMI0, NO_IRQ } | 590 | #define KMI0_IRQ { IRQ_SIC_KMI0 } |
591 | #define KMI1_IRQ { IRQ_SIC_KMI1, NO_IRQ } | 591 | #define KMI1_IRQ { IRQ_SIC_KMI1 } |
592 | 592 | ||
593 | /* | 593 | /* |
594 | * These devices are connected directly to the multi-layer AHB switch | 594 | * These devices are connected directly to the multi-layer AHB switch |
595 | */ | 595 | */ |
596 | #define SMC_IRQ { NO_IRQ, NO_IRQ } | 596 | #define SMC_IRQ { } |
597 | #define MPMC_IRQ { NO_IRQ, NO_IRQ } | 597 | #define MPMC_IRQ { } |
598 | #define CLCD_IRQ { IRQ_CLCDINT, NO_IRQ } | 598 | #define CLCD_IRQ { IRQ_CLCDINT } |
599 | #define DMAC_IRQ { IRQ_DMAINT, NO_IRQ } | 599 | #define DMAC_IRQ { IRQ_DMAINT } |
600 | 600 | ||
601 | /* | 601 | /* |
602 | * These devices are connected via the core APB bridge | 602 | * These devices are connected via the core APB bridge |
603 | */ | 603 | */ |
604 | #define SCTL_IRQ { NO_IRQ, NO_IRQ } | 604 | #define SCTL_IRQ { } |
605 | #define WATCHDOG_IRQ { IRQ_WDOGINT, NO_IRQ } | 605 | #define WATCHDOG_IRQ { IRQ_WDOGINT } |
606 | #define GPIO0_IRQ { IRQ_GPIOINT0, NO_IRQ } | 606 | #define GPIO0_IRQ { IRQ_GPIOINT0 } |
607 | #define GPIO1_IRQ { IRQ_GPIOINT1, NO_IRQ } | 607 | #define GPIO1_IRQ { IRQ_GPIOINT1 } |
608 | #define RTC_IRQ { IRQ_RTCINT, NO_IRQ } | 608 | #define RTC_IRQ { IRQ_RTCINT } |
609 | 609 | ||
610 | /* | 610 | /* |
611 | * These devices are connected via the DMA APB bridge | 611 | * These devices are connected via the DMA APB bridge |
612 | */ | 612 | */ |
613 | #define SCI_IRQ { IRQ_SCIINT, NO_IRQ } | 613 | #define SCI_IRQ { IRQ_SCIINT } |
614 | #define UART0_IRQ { IRQ_UARTINT0, NO_IRQ } | 614 | #define UART0_IRQ { IRQ_UARTINT0 } |
615 | #define UART1_IRQ { IRQ_UARTINT1, NO_IRQ } | 615 | #define UART1_IRQ { IRQ_UARTINT1 } |
616 | #define UART2_IRQ { IRQ_UARTINT2, NO_IRQ } | 616 | #define UART2_IRQ { IRQ_UARTINT2 } |
617 | #define SSP_IRQ { IRQ_SSPINT, NO_IRQ } | 617 | #define SSP_IRQ { IRQ_SSPINT } |
618 | 618 | ||
619 | /* FPGA Primecells */ | 619 | /* FPGA Primecells */ |
620 | AMBA_DEVICE(aaci, "fpga:04", AACI, NULL); | 620 | APB_DEVICE(aaci, "fpga:04", AACI, NULL); |
621 | AMBA_DEVICE(mmc0, "fpga:05", MMCI0, &mmc0_plat_data); | 621 | APB_DEVICE(mmc0, "fpga:05", MMCI0, &mmc0_plat_data); |
622 | AMBA_DEVICE(kmi0, "fpga:06", KMI0, NULL); | 622 | APB_DEVICE(kmi0, "fpga:06", KMI0, NULL); |
623 | AMBA_DEVICE(kmi1, "fpga:07", KMI1, NULL); | 623 | APB_DEVICE(kmi1, "fpga:07", KMI1, NULL); |
624 | 624 | ||
625 | /* DevChip Primecells */ | 625 | /* DevChip Primecells */ |
626 | AMBA_DEVICE(smc, "dev:00", SMC, NULL); | 626 | AHB_DEVICE(smc, "dev:00", SMC, NULL); |
627 | AMBA_DEVICE(mpmc, "dev:10", MPMC, NULL); | 627 | AHB_DEVICE(mpmc, "dev:10", MPMC, NULL); |
628 | AMBA_DEVICE(clcd, "dev:20", CLCD, &clcd_plat_data); | 628 | AHB_DEVICE(clcd, "dev:20", CLCD, &clcd_plat_data); |
629 | AMBA_DEVICE(dmac, "dev:30", DMAC, NULL); | 629 | AHB_DEVICE(dmac, "dev:30", DMAC, NULL); |
630 | AMBA_DEVICE(sctl, "dev:e0", SCTL, NULL); | 630 | APB_DEVICE(sctl, "dev:e0", SCTL, NULL); |
631 | AMBA_DEVICE(wdog, "dev:e1", WATCHDOG, NULL); | 631 | APB_DEVICE(wdog, "dev:e1", WATCHDOG, NULL); |
632 | AMBA_DEVICE(gpio0, "dev:e4", GPIO0, &gpio0_plat_data); | 632 | APB_DEVICE(gpio0, "dev:e4", GPIO0, &gpio0_plat_data); |
633 | AMBA_DEVICE(gpio1, "dev:e5", GPIO1, &gpio1_plat_data); | 633 | APB_DEVICE(gpio1, "dev:e5", GPIO1, &gpio1_plat_data); |
634 | AMBA_DEVICE(rtc, "dev:e8", RTC, NULL); | 634 | APB_DEVICE(rtc, "dev:e8", RTC, NULL); |
635 | AMBA_DEVICE(sci0, "dev:f0", SCI, NULL); | 635 | APB_DEVICE(sci0, "dev:f0", SCI, NULL); |
636 | AMBA_DEVICE(uart0, "dev:f1", UART0, NULL); | 636 | APB_DEVICE(uart0, "dev:f1", UART0, NULL); |
637 | AMBA_DEVICE(uart1, "dev:f2", UART1, NULL); | 637 | APB_DEVICE(uart1, "dev:f2", UART1, NULL); |
638 | AMBA_DEVICE(uart2, "dev:f3", UART2, NULL); | 638 | APB_DEVICE(uart2, "dev:f3", UART2, NULL); |
639 | AMBA_DEVICE(ssp0, "dev:f4", SSP, &ssp0_plat_data); | 639 | APB_DEVICE(ssp0, "dev:f4", SSP, &ssp0_plat_data); |
640 | 640 | ||
641 | static struct amba_device *amba_devs[] __initdata = { | 641 | static struct amba_device *amba_devs[] __initdata = { |
642 | &dmac_device, | 642 | &dmac_device, |