Skip to content

Commit

Permalink
ARM: integrator: get rid of <mach/memory.h>
Browse files Browse the repository at this point in the history
The Integrator has a custom <mach/memory.h> header defining the
BUS_OFFSET for *_to_bus and bus_to_* operations as offset from
0x80000000.

This switches the Integrator over to using the mechanism
introduced for the Keystone to provide the same offset using
the device tree, deletes <mach/memory.h> and augments the
Integrator device tree to provide the bus offset.

Cc: Grygorii Strashko <grygorii.strashko@ti.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Jonathan Austin <jonathan.austin@arm.com>
Cc: Russell King <linux@arm.linux.org.uk>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  • Loading branch information
Linus Walleij committed Jun 27, 2014
1 parent a497c3b commit e6dc195
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 35 deletions.
1 change: 0 additions & 1 deletion arch/arm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,6 @@ config ARCH_INTEGRATOR
select HAVE_TCM
select ICST
select MULTI_IRQ_HANDLER
select NEED_MACH_MEMORY_H
select PLAT_VERSATILE
select SPARSE_IRQ
select USE_OF
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/integratorap.dts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
/ {
model = "ARM Integrator/AP";
compatible = "arm,integrator-ap";
dma-ranges = <0x80000000 0x0 0x80000000>;

aliases {
arm,timer-primary = &timer2;
Expand Down
34 changes: 0 additions & 34 deletions arch/arm/mach-integrator/include/mach/memory.h

This file was deleted.

0 comments on commit e6dc195

Please sign in to comment.