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

Commit 2be39c07 authored by Stephen Warren's avatar Stephen Warren
Browse files

ARM: tegra: move iomap.h to mach-tegra 



Nothing outside mach-tegra uses this file, so there's no need for it to
be in <mach/>.

Since uncompress.h and debug-macro.S remain in include/mach, they need
to include "../../iomap.h" becaue of this change. uncompress.h will soon
be deleted in later multi-platform/single-zImage patches. debug-macro.S
will need to continue to include this header using an explicit relative
path, to avoid duplicating the physical->virtual address mapping that
iomap.h dictates.

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
parent 8a5d51fd

arch/arm/mach-tegra/apbio.c

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


#include <linux/kernel.h>

#include <linux/io.h>

#include <mach/iomap.h>

#include <linux/of.h>

#include <linux/dmaengine.h>

#include <linux/dma-mapping.h>
@@ -25,6 +24,7 @@ 
#include <linux/mutex.h>



#include "apbio.h"

#include "iomap.h"



#if defined(CONFIG_TEGRA20_APB_DMA)

static DEFINE_MUTEX(tegra_apb_dma_lock);

arch/arm/mach-tegra/board-dt-tegra20.c

+1 −2
Original line number Diff line number Diff line
@@ -40,11 +40,10 @@ 
#include <asm/mach/time.h>

#include <asm/setup.h>



#include <mach/iomap.h>



#include "board.h"

#include "clock.h"

#include "common.h"

#include "iomap.h"



struct tegra_ehci_platform_data tegra_ehci1_pdata = {

	.operating_mode = TEGRA_USB_OTG,

arch/arm/mach-tegra/board-dt-tegra30.c

+1 −2
Original line number Diff line number Diff line
@@ -33,11 +33,10 @@ 
#include <asm/mach/arch.h>

#include <asm/hardware/gic.h>



#include <mach/iomap.h>



#include "board.h"

#include "clock.h"

#include "common.h"

#include "iomap.h"



struct of_dev_auxdata tegra30_auxdata_lookup[] __initdata = {

	OF_DEV_AUXDATA("nvidia,tegra20-sdhci", 0x78000000, "sdhci-tegra.0", NULL),

arch/arm/mach-tegra/common.c

+1 −1
Original line number Diff line number Diff line
@@ -26,13 +26,13 @@ 
#include <asm/hardware/cache-l2x0.h>

#include <asm/hardware/gic.h>



#include <mach/iomap.h>

#include <mach/powergate.h>



#include "board.h"

#include "clock.h"

#include "common.h"

#include "fuse.h"

#include "iomap.h"

#include "pmc.h"

#include "apbio.h"

#include "sleep.h"

arch/arm/mach-tegra/flowctrl.c

+1 −2
Original line number Diff line number Diff line
@@ -22,9 +22,8 @@ 
#include <linux/kernel.h>

#include <linux/io.h>



#include <mach/iomap.h>



#include "flowctrl.h"

#include "iomap.h"



u8 flowctrl_offset_halt_cpu[] = {

	FLOW_CTRL_HALT_CPU0_EVENTS,