diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-30 03:09:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-30 03:09:17 -0400 |
commit | f52b69f86e27903d6896ed5fa7cd280fec8de532 (patch) | |
tree | 0b213c61386153800afb459ca33e091bdec94570 /arch/sh/kernel/cpu | |
parent | 2f7fa1be66dce77608330c5eb918d6360b5525f2 (diff) | |
parent | b7e68d6876dfbab087bc3859211a9efc74cbe30c (diff) |
Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh
Pull SuperH updates from Paul Mundt.
* tag 'sh-for-linus' of git://github.com/pmundt/linux-sh: (25 commits)
sh: Support I/O space swapping where needed.
sh: use set_current_blocked() and block_sigmask()
sh: no need to reset handler if SA_ONESHOT
sh: intc: Fix up section mismatch for intc_ack_data
sh: select ARCH_DISCARD_MEMBLOCK.
sh: Consolidate duplicate _32/_64 unistd definitions.
sh: ecovec: switch SDHI controllers to card polling
sh: Avoid exporting unimplemented syscalls.
sh: add platform_device for RSPI in setup-sh7757
SH: pci-sh7780: enable big-endian operation.
serial: sh-sci: fix a race of DMA submit_tx on transfer
sh: dma: Collect up CHCR of SH7763, SH7764, SH7780 and SH7785
sh: dma: Collect up CHCR of SH7723 and SH7730
sh/next: Fix build fail by asm/system.h in asm/bitops.h
arch/sh/drivers/dma/{dma-g2,dmabrg}.c: ensure arguments to request_irq and free_irq are compatible
sh: cpufreq: Wire up scaling_available_freqs support.
sh: cpufreq: notify about rate rounding fallback.
sh: cpufreq: Support CPU clock frequency table.
sh: cpufreq: struct device lookup from CPU topology.
sh: cpufreq: percpu struct clk accounting.
...
Diffstat (limited to 'arch/sh/kernel/cpu')
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c index 2875e8be4f72..c8836cffa216 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c | |||
@@ -680,6 +680,25 @@ static struct platform_device spi1_device = { | |||
680 | .resource = spi1_resources, | 680 | .resource = spi1_resources, |
681 | }; | 681 | }; |
682 | 682 | ||
683 | static struct resource rspi_resources[] = { | ||
684 | { | ||
685 | .start = 0xfe480000, | ||
686 | .end = 0xfe4800ff, | ||
687 | .flags = IORESOURCE_MEM, | ||
688 | }, | ||
689 | { | ||
690 | .start = 220, | ||
691 | .flags = IORESOURCE_IRQ, | ||
692 | }, | ||
693 | }; | ||
694 | |||
695 | static struct platform_device rspi_device = { | ||
696 | .name = "rspi", | ||
697 | .id = 2, | ||
698 | .num_resources = ARRAY_SIZE(rspi_resources), | ||
699 | .resource = rspi_resources, | ||
700 | }; | ||
701 | |||
683 | static struct resource usb_ehci_resources[] = { | 702 | static struct resource usb_ehci_resources[] = { |
684 | [0] = { | 703 | [0] = { |
685 | .start = 0xfe4f1000, | 704 | .start = 0xfe4f1000, |
@@ -740,6 +759,7 @@ static struct platform_device *sh7757_devices[] __initdata = { | |||
740 | &dma3_device, | 759 | &dma3_device, |
741 | &spi0_device, | 760 | &spi0_device, |
742 | &spi1_device, | 761 | &spi1_device, |
762 | &rspi_device, | ||
743 | &usb_ehci_device, | 763 | &usb_ehci_device, |
744 | &usb_ohci_device, | 764 | &usb_ohci_device, |
745 | }; | 765 | }; |