diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-01 23:58:25 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-01 23:58:25 -0400 |
commit | 81a3c10ce8a7fd5bf9a06bfc38bd417512911831 (patch) | |
tree | 12ceac10fae8c4b2dc17b362672a5db305a8d960 /arch/arm/mach-omap1/board-palmtt.c | |
parent | 6585dea1f99cc2265582ff2e4cc1727062136e92 (diff) | |
parent | df80442d1ee2902c2e39f90f18160f2e08d14c06 (diff) |
Merge branch 'next/cleanup2' of git://git.linaro.org/people/arnd/arm-soc
* 'next/cleanup2' of git://git.linaro.org/people/arnd/arm-soc: (31 commits)
ARM: OMAP: Warn if omap_ioremap is called before SoC detection
ARM: OMAP: Move set_globals initialization to happen in init_early
ARM: OMAP: Map SRAM later on with ioremap_exec()
ARM: OMAP: Remove calls to SRAM allocations for framebuffer
ARM: OMAP: Avoid cpu_is_omapxxxx usage until map_io is done
ARM: OMAP1: Use generic map_io, init_early and init_irq
arm/dts: OMAP3+: Add mpu, dsp and iva nodes
arm/dts: OMAP4: Add a main ocp entry bound to l3-noc driver
ARM: OMAP2+: l3-noc: Add support for device-tree
ARM: OMAP2+: board-generic: Add i2c static init
ARM: OMAP2+: board-generic: Add DT support to generic board
arm/dts: Add support for OMAP3 Beagle board
arm/dts: Add initial device tree support for OMAP3 SoC
arm/dts: Add support for OMAP4 SDP board
arm/dts: Add support for OMAP4 PandaBoard
arm/dts: Add initial device tree support for OMAP4 SoC
ARM: OMAP: omap_device: Add a method to build an omap_device from a DT node
ARM: OMAP: omap_device: Add omap_device_[alloc|delete] for DT integration
of: Add helpers to get one string in multiple strings property
ARM: OMAP2+: devices: Remove all omap_device_pm_latency structures
...
Fix up trivial header file conflicts in arch/arm/mach-omap2/board-generic.c
Diffstat (limited to 'arch/arm/mach-omap1/board-palmtt.c')
-rw-r--r-- | arch/arm/mach-omap1/board-palmtt.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/arch/arm/mach-omap1/board-palmtt.c b/arch/arm/mach-omap1/board-palmtt.c index 273771cb1b61..11a98539f7bb 100644 --- a/arch/arm/mach-omap1/board-palmtt.c +++ b/arch/arm/mach-omap1/board-palmtt.c | |||
@@ -263,12 +263,6 @@ static struct spi_board_info __initdata palmtt_boardinfo[] = { | |||
263 | } | 263 | } |
264 | }; | 264 | }; |
265 | 265 | ||
266 | static void __init omap_palmtt_init_irq(void) | ||
267 | { | ||
268 | omap1_init_common_hw(); | ||
269 | omap1_init_irq(); | ||
270 | } | ||
271 | |||
272 | static struct omap_usb_config palmtt_usb_config __initdata = { | 266 | static struct omap_usb_config palmtt_usb_config __initdata = { |
273 | .register_dev = 1, | 267 | .register_dev = 1, |
274 | .hmc_mode = 0, | 268 | .hmc_mode = 0, |
@@ -315,16 +309,12 @@ static void __init omap_palmtt_init(void) | |||
315 | omap_register_i2c_bus(1, 100, NULL, 0); | 309 | omap_register_i2c_bus(1, 100, NULL, 0); |
316 | } | 310 | } |
317 | 311 | ||
318 | static void __init omap_palmtt_map_io(void) | ||
319 | { | ||
320 | omap1_map_common_io(); | ||
321 | } | ||
322 | |||
323 | MACHINE_START(OMAP_PALMTT, "OMAP1510 based Palm Tungsten|T") | 312 | MACHINE_START(OMAP_PALMTT, "OMAP1510 based Palm Tungsten|T") |
324 | .atag_offset = 0x100, | 313 | .atag_offset = 0x100, |
325 | .map_io = omap_palmtt_map_io, | 314 | .map_io = omap15xx_map_io, |
315 | .init_early = omap1_init_early, | ||
326 | .reserve = omap_reserve, | 316 | .reserve = omap_reserve, |
327 | .init_irq = omap_palmtt_init_irq, | 317 | .init_irq = omap1_init_irq, |
328 | .init_machine = omap_palmtt_init, | 318 | .init_machine = omap_palmtt_init, |
329 | .timer = &omap1_timer, | 319 | .timer = &omap1_timer, |
330 | MACHINE_END | 320 | MACHINE_END |