05 Jan, 2012
1 commit
-
Hook these platforms restart code into the new restart hook rather
than using arch_reset().Acked-by: Linus Walleij
Signed-off-by: Russell King
29 Oct, 2011
1 commit
-
…git-cur/linux-2.6-arm
* 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (178 commits)
ARM: 7139/1: fix compilation with CONFIG_ARM_ATAG_DTB_COMPAT and large TEXT_OFFSET
ARM: gic, local timers: use the request_percpu_irq() interface
ARM: gic: consolidate PPI handling
ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H
ARM: mach-s5p64x0: remove mach/memory.h
ARM: mach-s3c64xx: remove mach/memory.h
ARM: plat-mxc: remove mach/memory.h
ARM: mach-prima2: remove mach/memory.h
ARM: mach-zynq: remove mach/memory.h
ARM: mach-bcmring: remove mach/memory.h
ARM: mach-davinci: remove mach/memory.h
ARM: mach-pxa: remove mach/memory.h
ARM: mach-ixp4xx: remove mach/memory.h
ARM: mach-h720x: remove mach/memory.h
ARM: mach-vt8500: remove mach/memory.h
ARM: mach-s5pc100: remove mach/memory.h
ARM: mach-tegra: remove mach/memory.h
ARM: plat-tcc: remove mach/memory.h
ARM: mach-mmp: remove mach/memory.h
ARM: mach-cns3xxx: remove mach/memory.h
...Fix up mostly pretty trivial conflicts in:
- arch/arm/Kconfig
- arch/arm/include/asm/localtimer.h
- arch/arm/kernel/Makefile
- arch/arm/mach-shmobile/board-ap4evb.c
- arch/arm/mach-u300/core.c
- arch/arm/mm/dma-mapping.c
- arch/arm/mm/proc-v7.S
- arch/arm/plat-omap/Kconfig
largely due to some CONFIG option renaming (ie CONFIG_PM_SLEEP ->
CONFIG_ARM_CPU_SUSPEND for the arm-specific suspend code etc) and
addition of NEED_MACH_MEMORY_H next to HAVE_IDE.
25 Oct, 2011
1 commit
-
Conflicts:
arch/arm/mach-integrator/integrator_ap.c
17 Oct, 2011
4 commits
-
We already have a clock definition for the 24MHz clock in
the Integrator, use that instead of some unclear defines
from the platform.h header. Also delete the senseless
comment that the file shouldn't be edited, I just edited it
and the world didn't come to an end, so it's obviously
false. If anyone still has the mentioned ".s file" and the
s2h awk script generating that header, raise your hand
(and give me your files).Acked-by: Thomas Gleixner
Signed-off-by: Linus Walleij
Signed-off-by: Russell King -
Drop mult, shift and delta calculations and let the
clockevent core scale this as appropriate.Set the minimum interval to 1 rather than 15 (0xf), there
is nothing in the data sheets I have indicating that 15
should be some minimum value.Acked-by: Thomas Gleixner
Signed-off-by: Linus Walleij
Signed-off-by: Russell King -
The Integrator AP timer has no problem supporting oneshot
ticks with proper code, so let's do it so we can have
NOHZ configured in for this platform too.Cc: Thomas Gleixner
Signed-off-by: Linus Walleij
Signed-off-by: Russell King -
These macros are not used by anything since the switch to
generic time in commit b9cedda230793cbf58eb012ddadedd490cc8e129
so let's retire them.Acked-by: Thomas Gleixner
Signed-off-by: Linus Walleij
Signed-off-by: Russell King
21 Sep, 2011
2 commits
-
The changes introduced in commit
cc22b4c18540e5e8bf55c7d124044f9317527d3c
"ARM: set vga memory base at run-time"Makes the Integrator/AP freeze completely. I appears that
this is due to the VGA base address being assigned at PCI
init time, while this base is needed earlier than that.
Moving the initialization of the base address to the
.map_io function solves this problem.Cc: Rob Herring
Cc: Nicolas Pitre
Cc: Arnd Bergmann
Signed-off-by: Linus Walleij
Acked-by: Rob Herring
Signed-off-by: Arnd Bergmann
07 Sep, 2011
1 commit
-
I was intrigued by the fact that the clock stood still on
the Integrator, but it wasn't strange at all, because the
timer was set up all wrong and probably has been for a
while. With this patch the clock starts ticking again:
make the timer periodic (reload), |= on the divisor bit
and load the timer before starting it.Cc: stable@kernel.org
Signed-off-by: Linus Walleij
Signed-off-by: Russell King
22 Aug, 2011
1 commit
-
Signed-off-by: Nicolas Pitre
Acked-by: Arnd Bergmann
24 May, 2011
2 commits
-
… 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate
-
Convert the Integrator/AP 16-bit down-counting clocksource to the
generic clocksource infrastructure.Signed-off-by: Russell King
21 May, 2011
2 commits
-
The set_vpp() method provided by physmap passes a map_info back to
the platform code, which has little relevance as far as the platform
is concerned (this parameter is completely unused).Instead, pass the platform_device, which can be used in the pismo
driver to retrieve some important information in a nicer way, instead
of the hack that was in place.The empty set_vpp function in board-at572d940hf_ek.c is left untouched,
as the board/SoC is scheduled for removal.Cc: Andrew Victor
Cc: Nicolas Ferre
Acked-by: Jean-Christophe PLAGNIOL-VILLARD
Cc: Philipp Zabel
Cc: Eric Miao
Cc: Ben Dooks
Acked-by: Artem Bityutskiy
Acked-by: David Woodhouse
Signed-off-by: Marc Zyngier
Signed-off-by: Russell King -
Signed-off-by: Marc Zyngier
Acked-by: Catalin Marinas
Acked-by: David Woodhouse
Signed-off-by: Russell King
25 Apr, 2011
1 commit
-
Replace the sysdev class and struct sys_device used for power
management by the Integrator interrupt-handling code with a
struct syscore_ops object which is simpler.Signed-off-by: Rafael J. Wysocki
Acked-by: Greg Kroah-Hartman
19 Feb, 2011
2 commits
-
Consolidate the FPGA IRQ handling code. Integrator/AP and Versatile
have one FPGA-based IRQ handler each. Integrator/CP has three.Acked-by: Catalin Marinas
Signed-off-by: Russell King -
Initialize the clock tree early.
Acked-by: Catalin Marinas
Signed-off-by: Russell King
14 Jan, 2011
1 commit
-
Signed-off-by: Lennert Buytenhek
Acked-by: Russell King
23 Dec, 2010
1 commit
-
In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
interfaces were added which simplify (and optimize) the selection of the
divisor shift/mult constants. Switch over to using this new interface.Signed-off-by: Russell King
20 Oct, 2010
1 commit
-
Since we're now using addruart to establish the debug mapping, we can
remove the io_pg_offst and phys_io members of struct machine_desc.The various declarations were removed using the following script:
grep -rl MACHINE_START arch/arm | xargs \
sed -i '/MACHINE_START/,/MACHINE_END/ { /\.\(phys_io\|io_pg_offst\)/d }'[ Initial patch was from Jeremy Kerr, example script from Russell King ]
Signed-off-by: Nicolas Pitre
Acked-by: Eric Miao
16 Jul, 2010
1 commit
-
Move the platform specific bootmem memory reservations out of
arch/arm/mm/mmu.c into their respective platform files.Signed-off-by: Russell King
02 May, 2010
3 commits
-
Only Integrator/AP has 16-bit timers, so move the support into the
Integrator/AP specific support files.Signed-off-by: Russell King
-
Rather than using converted base address plus offset, use the register
address itself now that IO_ADDRESS() can cope with these.Signed-off-by: Russell King
-
Signed-off-by: Russell King
30 Apr, 2010
3 commits
-
This is now what the clocksource/clockevent initialization functions
want, so give them the timer tick rate directly.Signed-off-by: Russell King
-
Signed-off-by: Russell King
-
Realview doesn't include mach/platform.h in mach/hardware.h, so
make versatile behave in the same way. Also, move the definition
of __io_address() into mach/hardware.h, just like Realview.Signed-off-by: Russell King
06 Sep, 2008
1 commit
-
Signed-off-by: Russell King
07 Aug, 2008
2 commits
-
This just leaves include/asm-arm/plat-* to deal with.
Signed-off-by: Russell King
-
Remove includes of asm/hardware.h in addition to asm/arch/hardware.h.
Then, since asm/hardware.h only exists to include asm/arch/hardware.h,
update everything to directly include asm/arch/hardware.h and remove
asm/hardware.h.Signed-off-by: Russell King
25 Jan, 2008
1 commit
-
All kobjects require a dynamically allocated name now. We no longer
need to keep track if the name is statically assigned, we can just
unconditionally free() all kobject names on cleanup.Signed-off-by: Kay Sievers
Signed-off-by: Greg Kroah-Hartman
30 Nov, 2006
1 commit
-
set_irq_chipdata -> set_irq_chip_data
get_irq_chipdata -> get_irq_chip_data
do_level_IRQ -> handle_level_irq
do_edge_IRQ -> handle_edge_irq
do_simple_IRQ -> handle_simple_irq
irqdesc -> irq_desc
irqchip -> irq_chipSigned-off-by: Russell King
02 Aug, 2006
1 commit
-
Patch from David Brownell
ARM genirq cleanups/updates:
- Start switching platforms to newer APIs
* use "irq_chip" name, not "irqchip"
* providing irq_chip.name- Show irq_chip.name in /proc/interrupts, like on x86.
This update a bit more than half of the ARM code. The irq_chip.name
values were chosen to match docs (if I have them) or be otherwise
obvious ("FPGA", "CPLD", or matching the code).Signed-off-by: David Brownell
Signed-off-by: Russell King
22 Mar, 2006
1 commit
-
Convert all uses of kmalloc followed by memset to use kzalloc instead.
Signed-off-by: Russell King
14 Jan, 2006
1 commit
-
Patch from Nicolas Pitre
This field is redundent since it must be equal to PHYS_OFFSET anyway.
Now that no code uses it anymore, mark it deprecated and remove all
initializations from the tree.Signed-off-by: Nicolas Pitre
Signed-off-by: Russell King
07 Jan, 2006
1 commit
-
Since the ARM AMBA bus is used on MIPS as well as ARM, we need
to make the bus available for other architectures to use. Move
the AMBA include files from include/asm-arm/hardware/ to
include/linux/amba/Signed-off-by: Russell King
31 Oct, 2005
2 commits
-
Manual #include fixups for clashes - there may be some unnecessary
-
I recently picked up my older work to remove unnecessary #includes of
sched.h, starting from a patch by Dave Jones to not include sched.h
from module.h. This reduces the number of indirect includes of sched.h
by ~300. Another ~400 pointless direct includes can be removed after
this disentangling (patch to follow later).
However, quite a few indirect includes need to be fixed up for this.In order to feed the patches through -mm with as little disturbance as
possible, I've split out the fixes I accumulated up to now (complete for
i386 and x86_64, more archs to follow later) and post them before the real
patch. This way this large part of the patch is kept simple with only
adding #includes, and all hunks are independent of each other. So if any
hunk rejects or gets in the way of other patches, just drop it. My scripts
will pick it up again in the next round.Signed-off-by: Tim Schmielau
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
30 Oct, 2005
1 commit
-
Convert everyone who uses platform_bus_type to include
linux/platform_device.h.Signed-off-by: Russell King
Acked-by: Greg Kroah-Hartman