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

Commit 6c38e25b authored by Rob Herring's avatar Rob Herring
Browse files

ARM: tegra: clean-up mach/io.h 



Move tegra specific mach/io.h parts into iomap.h.

Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Tested-by: default avatarStephen Warren <swarren@nvidia.com>
Acked-by: default avatarStephen Warren <swarren@nvidia.com>
Cc: Colin Cross <ccross@android.com>
Cc: Olof Johansson <olof@lixom.net>
parent 8a52dd4f

arch/arm/mach-tegra/include/mach/debug-macro.S

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
 *

 */



#include <mach/io.h>

#include <mach/iomap.h>



	.macro  addruart, rp, rv, tmp

arch/arm/mach-tegra/include/mach/io.h

+0 −48
Original line number Diff line number Diff line
@@ -23,56 +23,8 @@ 


#define IO_SPACE_LIMIT 0xffff



/* On TEGRA, many peripherals are very closely packed in

 * two 256MB io windows (that actually only use about 64KB

 * at the start of each).

 *

 * We will just map the first 1MB of each window (to minimize

 * pt entries needed) and provide a macro to transform physical

 * io addresses to an appropriate void __iomem *.

 *

 */



#ifdef __ASSEMBLY__

#define IOMEM(x)	(x)

#else

#define IOMEM(x)	((void __force __iomem *)(x))

#endif



#define IO_IRAM_PHYS	0x40000000

#define IO_IRAM_VIRT	IOMEM(0xFE400000)

#define IO_IRAM_SIZE	SZ_256K



#define IO_CPU_PHYS     0x50040000

#define IO_CPU_VIRT     IOMEM(0xFE000000)

#define IO_CPU_SIZE	SZ_16K



#define IO_PPSB_PHYS	0x60000000

#define IO_PPSB_VIRT	IOMEM(0xFE200000)

#define IO_PPSB_SIZE	SZ_1M



#define IO_APB_PHYS	0x70000000

#define IO_APB_VIRT	IOMEM(0xFE300000)

#define IO_APB_SIZE	SZ_1M



#define IO_TO_VIRT_BETWEEN(p, st, sz)	((p) >= (st) && (p) < ((st) + (sz)))

#define IO_TO_VIRT_XLATE(p, pst, vst)	(((p) - (pst) + (vst)))



#define IO_TO_VIRT(n) ( \

	IO_TO_VIRT_BETWEEN((n), IO_PPSB_PHYS, IO_PPSB_SIZE) ?		\

		IO_TO_VIRT_XLATE((n), IO_PPSB_PHYS, IO_PPSB_VIRT) :	\

	IO_TO_VIRT_BETWEEN((n), IO_APB_PHYS, IO_APB_SIZE) ?		\

		IO_TO_VIRT_XLATE((n), IO_APB_PHYS, IO_APB_VIRT) :	\

	IO_TO_VIRT_BETWEEN((n), IO_CPU_PHYS, IO_CPU_SIZE) ?		\

		IO_TO_VIRT_XLATE((n), IO_CPU_PHYS, IO_CPU_VIRT) :	\

	IO_TO_VIRT_BETWEEN((n), IO_IRAM_PHYS, IO_IRAM_SIZE) ?		\

		IO_TO_VIRT_XLATE((n), IO_IRAM_PHYS, IO_IRAM_VIRT) :	\

	NULL)



#ifndef __ASSEMBLER__



#define IO_ADDRESS(n) (IO_TO_VIRT(n))



#ifdef CONFIG_TEGRA_PCI

extern void __iomem *tegra_pcie_io_base;

arch/arm/mach-tegra/include/mach/iomap.h

+48 −0
Original line number Diff line number Diff line
@@ -271,4 +271,52 @@ 
# define TEGRA_DEBUG_UART_BASE TEGRA_UARTE_BASE

#endif



/* On TEGRA, many peripherals are very closely packed in

 * two 256MB io windows (that actually only use about 64KB

 * at the start of each).

 *

 * We will just map the first 1MB of each window (to minimize

 * pt entries needed) and provide a macro to transform physical

 * io addresses to an appropriate void __iomem *.

 *

 */



#ifdef __ASSEMBLY__

#define IOMEM(x)	(x)

#else

#define IOMEM(x)	((void __force __iomem *)(x))

#endif



#define IO_IRAM_PHYS	0x40000000

#define IO_IRAM_VIRT	IOMEM(0xFE400000)

#define IO_IRAM_SIZE	SZ_256K



#define IO_CPU_PHYS     0x50040000

#define IO_CPU_VIRT     IOMEM(0xFE000000)

#define IO_CPU_SIZE	SZ_16K



#define IO_PPSB_PHYS	0x60000000

#define IO_PPSB_VIRT	IOMEM(0xFE200000)

#define IO_PPSB_SIZE	SZ_1M



#define IO_APB_PHYS	0x70000000

#define IO_APB_VIRT	IOMEM(0xFE300000)

#define IO_APB_SIZE	SZ_1M



#define IO_TO_VIRT_BETWEEN(p, st, sz)	((p) >= (st) && (p) < ((st) + (sz)))

#define IO_TO_VIRT_XLATE(p, pst, vst)	(((p) - (pst) + (vst)))



#define IO_TO_VIRT(n) ( \

	IO_TO_VIRT_BETWEEN((n), IO_PPSB_PHYS, IO_PPSB_SIZE) ?		\

		IO_TO_VIRT_XLATE((n), IO_PPSB_PHYS, IO_PPSB_VIRT) :	\

	IO_TO_VIRT_BETWEEN((n), IO_APB_PHYS, IO_APB_SIZE) ?		\

		IO_TO_VIRT_XLATE((n), IO_APB_PHYS, IO_APB_VIRT) :	\

	IO_TO_VIRT_BETWEEN((n), IO_CPU_PHYS, IO_CPU_SIZE) ?		\

		IO_TO_VIRT_XLATE((n), IO_CPU_PHYS, IO_CPU_VIRT) :	\

	IO_TO_VIRT_BETWEEN((n), IO_IRAM_PHYS, IO_IRAM_SIZE) ?		\

		IO_TO_VIRT_XLATE((n), IO_IRAM_PHYS, IO_IRAM_VIRT) :	\

	NULL)



#define IO_ADDRESS(n) (IO_TO_VIRT(n))



#endif

arch/arm/mach-tegra/io.c

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 


#include <asm/page.h>

#include <asm/mach/map.h>

#include <mach/iomap.h>



#include "board.h"