diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 21:46:13 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 21:46:13 -0400 |
commit | 8f446a7a069e0af0639385f67c78ee2279bca04c (patch) | |
tree | 580cf495616b36ca0af0826afa87c430cdc1e7cb /arch/arm/mach-realview/core.c | |
parent | 84be4ae2c038e2b03d650cbf2a7cfd9e8d6e9e51 (diff) | |
parent | 04ef037c926ddb31088c976538e29eada4fd1490 (diff) |
Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM soc driver specific changes from Olof Johansson:
- A long-coming conversion of various platforms to a common LED
infrastructure
- AT91 is moved over to use the newer MCI driver for MMC
- Pincontrol conversions for samsung platforms
- DT bindings for gscaler on samsung
- i2c driver fixes for tegra, acked by i2c maintainer
Fix up conflicts as per Olof.
* tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (48 commits)
drivers: bus: omap_l3: use resources instead of hardcoded irqs
pinctrl: exynos: Fix wakeup IRQ domain registration check
pinctrl: samsung: Uninline samsung_pinctrl_get_soc_data
pinctrl: exynos: Correct the detection of wakeup-eint node
pinctrl: exynos: Mark exynos_irq_demux_eint as inline
pinctrl: exynos: Handle only unmasked wakeup interrupts
pinctrl: exynos: Fix typos in gpio/wkup _irq_mask
pinctrl: exynos: Set pin function to EINT in irq_set_type of GPIO EINTa
drivers: bus: Move the OMAP interconnect driver to drivers/bus/
i2c: tegra: dynamically control fast clk
i2c: tegra: I2_M_NOSTART functionality not supported in Tegra20
ARM: tegra: clock: remove unused clock entry for i2c
ARM: tegra: clock: add connection name in i2c clock entry
i2c: tegra: pass proper name for getting clock
ARM: tegra: clock: add i2c fast clock entry in clock table
ARM: EXYNOS: Adds G-Scaler device from Device Tree
ARM: EXYNOS: Add clock support for G-Scaler
ARM: EXYNOS: Enable pinctrl driver support for EXYNOS4 device tree enabled platform
ARM: dts: Add pinctrl node entries for SAMSUNG EXYNOS4210 SoC
ARM: EXYNOS: skip wakeup interrupt setup if pinctrl driver is used
...
Diffstat (limited to 'arch/arm/mach-realview/core.c')
-rw-r--r-- | arch/arm/mach-realview/core.c | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c index ff007d15e0ec..682467480588 100644 --- a/arch/arm/mach-realview/core.c +++ b/arch/arm/mach-realview/core.c | |||
@@ -34,7 +34,6 @@ | |||
34 | 34 | ||
35 | #include <mach/hardware.h> | 35 | #include <mach/hardware.h> |
36 | #include <asm/irq.h> | 36 | #include <asm/irq.h> |
37 | #include <asm/leds.h> | ||
38 | #include <asm/mach-types.h> | 37 | #include <asm/mach-types.h> |
39 | #include <asm/hardware/arm_timer.h> | 38 | #include <asm/hardware/arm_timer.h> |
40 | #include <asm/hardware/icst.h> | 39 | #include <asm/hardware/icst.h> |
@@ -330,44 +329,6 @@ struct clcd_board clcd_plat_data = { | |||
330 | .remove = versatile_clcd_remove_dma, | 329 | .remove = versatile_clcd_remove_dma, |
331 | }; | 330 | }; |
332 | 331 | ||
333 | #ifdef CONFIG_LEDS | ||
334 | #define VA_LEDS_BASE (__io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_LED_OFFSET) | ||
335 | |||
336 | void realview_leds_event(led_event_t ledevt) | ||
337 | { | ||
338 | unsigned long flags; | ||
339 | u32 val; | ||
340 | u32 led = 1 << smp_processor_id(); | ||
341 | |||
342 | local_irq_save(flags); | ||
343 | val = readl(VA_LEDS_BASE); | ||
344 | |||
345 | switch (ledevt) { | ||
346 | case led_idle_start: | ||
347 | val = val & ~led; | ||
348 | break; | ||
349 | |||
350 | case led_idle_end: | ||
351 | val = val | led; | ||
352 | break; | ||
353 | |||
354 | case led_timer: | ||
355 | val = val ^ REALVIEW_SYS_LED7; | ||
356 | break; | ||
357 | |||
358 | case led_halted: | ||
359 | val = 0; | ||
360 | break; | ||
361 | |||
362 | default: | ||
363 | break; | ||
364 | } | ||
365 | |||
366 | writel(val, VA_LEDS_BASE); | ||
367 | local_irq_restore(flags); | ||
368 | } | ||
369 | #endif /* CONFIG_LEDS */ | ||
370 | |||
371 | /* | 332 | /* |
372 | * Where is the timer (VA)? | 333 | * Where is the timer (VA)? |
373 | */ | 334 | */ |