diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-03 17:31:24 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-03 17:31:24 -0400 |
commit | be82ae0238b0453afcf4a76f0512b7dde34ba500 (patch) | |
tree | aaa3f5f11fd51fd73365ee1a2164aad9a03de060 /arch/arm/mach-realview/realview_pbx.c | |
parent | 4b4fd27c0b5ec638a1f06ced9226fd95229dbbf0 (diff) | |
parent | 7b70c4275f28702b76b273c8534c38f8313812e9 (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: (291 commits)
ARM: AMBA: Add pclk support to AMBA bus infrastructure
ARM: 6278/2: fix regression in RealView after the introduction of pclk
ARM: 6277/1: mach-shmobile: Allow users to select HZ, default to 128
ARM: 6276/1: mach-shmobile: remove duplicate NR_IRQS_LEGACY
ARM: 6246/1: mmci: support larger MMCIDATALENGTH register
ARM: 6245/1: mmci: enable hardware flow control on Ux500 variants
ARM: 6244/1: mmci: add variant data and default MCICLOCK support
ARM: 6243/1: mmci: pass power_mode to the translate_vdd callback
ARM: 6274/1: add global control registers definition header file for nuc900
mx2_camera: fix type of dma buffer virtual address pointer
mx2_camera: Add soc_camera support for i.MX25/i.MX27
arm/imx/gpio: add spinlock protection
ARM: Add support for the LPC32XX arch
ARM: LPC32XX: Arch config menu supoport and makefiles
ARM: LPC32XX: Phytec 3250 platform support
ARM: LPC32XX: Misc support functions
ARM: LPC32XX: Serial support code
ARM: LPC32XX: System suspend support
ARM: LPC32XX: GPIO, timer, and IRQ drivers
ARM: LPC32XX: Clock driver
...
Diffstat (limited to 'arch/arm/mach-realview/realview_pbx.c')
-rw-r--r-- | arch/arm/mach-realview/realview_pbx.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-realview/realview_pbx.c b/arch/arm/mach-realview/realview_pbx.c index 08fd683adc4..9428eff0b11 100644 --- a/arch/arm/mach-realview/realview_pbx.c +++ b/arch/arm/mach-realview/realview_pbx.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/amba/bus.h> | 24 | #include <linux/amba/bus.h> |
25 | #include <linux/amba/pl061.h> | 25 | #include <linux/amba/pl061.h> |
26 | #include <linux/amba/mmci.h> | 26 | #include <linux/amba/mmci.h> |
27 | #include <linux/amba/pl022.h> | ||
27 | #include <linux/io.h> | 28 | #include <linux/io.h> |
28 | 29 | ||
29 | #include <asm/irq.h> | 30 | #include <asm/irq.h> |
@@ -136,6 +137,12 @@ static struct pl061_platform_data gpio2_plat_data = { | |||
136 | .irq_base = -1, | 137 | .irq_base = -1, |
137 | }; | 138 | }; |
138 | 139 | ||
140 | static struct pl022_ssp_controller ssp0_plat_data = { | ||
141 | .bus_id = 0, | ||
142 | .enable_dma = 0, | ||
143 | .num_chipselect = 1, | ||
144 | }; | ||
145 | |||
139 | /* | 146 | /* |
140 | * RealView PBXCore AMBA devices | 147 | * RealView PBXCore AMBA devices |
141 | */ | 148 | */ |
@@ -202,7 +209,7 @@ AMBA_DEVICE(sci0, "dev:sci0", SCI, NULL); | |||
202 | AMBA_DEVICE(uart0, "dev:uart0", PBX_UART0, NULL); | 209 | AMBA_DEVICE(uart0, "dev:uart0", PBX_UART0, NULL); |
203 | AMBA_DEVICE(uart1, "dev:uart1", PBX_UART1, NULL); | 210 | AMBA_DEVICE(uart1, "dev:uart1", PBX_UART1, NULL); |
204 | AMBA_DEVICE(uart2, "dev:uart2", PBX_UART2, NULL); | 211 | AMBA_DEVICE(uart2, "dev:uart2", PBX_UART2, NULL); |
205 | AMBA_DEVICE(ssp0, "dev:ssp0", PBX_SSP, NULL); | 212 | AMBA_DEVICE(ssp0, "dev:ssp0", PBX_SSP, &ssp0_plat_data); |
206 | 213 | ||
207 | /* Primecells on the NEC ISSP chip */ | 214 | /* Primecells on the NEC ISSP chip */ |
208 | AMBA_DEVICE(clcd, "issp:clcd", PBX_CLCD, &clcd_plat_data); | 215 | AMBA_DEVICE(clcd, "issp:clcd", PBX_CLCD, &clcd_plat_data); |