Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6dc195c authored by Linus Walleij's avatar Linus Walleij
Browse files

ARM: integrator: get rid of <mach/memory.h> 



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: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent a497c3ba

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/boot/dts/integratorap.dts

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
/ {

	model = "ARM Integrator/AP";

	compatible = "arm,integrator-ap";

	dma-ranges = <0x80000000 0x0 0x80000000>;



	aliases {

		arm,timer-primary = &timer2;

arch/arm/mach-integrator/include/mach/memory.h

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
/*

 *  arch/arm/mach-integrator/include/mach/memory.h

 *

 *  Copyright (C) 1999 ARM Limited

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */

#ifndef __ASM_ARCH_MEMORY_H

#define __ASM_ARCH_MEMORY_H



/*

 * Physical DRAM offset.

 */

#define PLAT_PHYS_OFFSET	UL(0x00000000)



#define BUS_OFFSET	UL(0x80000000)

#define __virt_to_bus(x)	((x) - PAGE_OFFSET + BUS_OFFSET)

#define __bus_to_virt(x)	((x) - BUS_OFFSET + PAGE_OFFSET)

#define __pfn_to_bus(x)		(__pfn_to_phys(x) + (BUS_OFFSET - PHYS_OFFSET))

#define __bus_to_pfn(x)		__phys_to_pfn((x) - (BUS_OFFSET - PHYS_OFFSET))



#endif