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

Commit 34606f38 authored by Stephen Boyd's avatar Stephen Boyd Committed by David Brown
Browse files

ARM: msm: Remove TMR and TMR0 static mappings 



Nobody is using these mappings so just drop them. of_iomap() in
the timer driver will take care of it for us. Doing this allows
us to remove the 8x60 and 8960 iomap files completely.

Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarDavid Brown <davidb@codeaurora.org>
parent 6d07917e

arch/arm/mach-msm/board-dt-8660.c

+1 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/of_platform.h>



#include <asm/mach/arch.h>

#include <asm/mach/map.h>



#include <mach/board.h>

#include "common.h"
@@ -42,7 +43,6 @@ static const char *msm8x60_fluid_match[] __initdata = { 


DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)")

	.smp = smp_ops(msm_smp_ops),

	.map_io = msm_map_msm8x60_io,

	.init_machine = msm8x60_dt_init,

	.init_late = msm8x60_init_late,

	.init_time	= msm_dt_timer_init,

arch/arm/mach-msm/board-dt-8960.c

+1 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/of_platform.h>



#include <asm/mach/arch.h>

#include <asm/mach/map.h>



#include "common.h"
@@ -29,7 +30,6 @@ static const char * const msm8960_dt_match[] __initconst = { 


DT_MACHINE_START(MSM8960_DT, "Qualcomm MSM (Flattened Device Tree)")

	.smp = smp_ops(msm_smp_ops),

	.map_io = msm_map_msm8960_io,

	.init_time	= msm_dt_timer_init,

	.init_machine = msm_dt_init,

	.dt_compat = msm8960_dt_match,

arch/arm/mach-msm/common.h

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ extern void qsd8x50_timer_init(void); 


extern void msm_map_common_io(void);

extern void msm_map_msm7x30_io(void);

extern void msm_map_msm8x60_io(void);

extern void msm_map_msm8960_io(void);

extern void msm_map_qsd8x50_io(void);



extern void __iomem *__msm_ioremap_caller(phys_addr_t phys_addr, size_t size,

arch/arm/mach-msm/include/mach/msm_iomap-8960.h

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

 * Copyright (C) 2007 Google, Inc.

 * Copyright (c) 2008-2011, Code Aurora Forum. All rights reserved.

 * Author: Brian Swetland <swetland@google.com>

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and

 * may be copied, distributed, and modified under those terms.

 *

 * 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.

 *

 *

 * The MSM peripherals are spread all over across 768MB of physical

 * space, which makes just having a simple IO_ADDRESS macro to slide

 * them into the right virtual location rough.  Instead, we will

 * provide a master phys->virt mapping for peripherals here.

 *

 */



#ifndef __ASM_ARCH_MSM_IOMAP_8960_H

#define __ASM_ARCH_MSM_IOMAP_8960_H



/* Physical base address and size of peripherals.

 * Ordered by the virtual base addresses they will be mapped at.

 *

 * If you add or remove entries here, you'll want to edit the

 * msm_io_desc array in arch/arm/mach-msm/io.c to reflect your

 * changes.

 *

 */



#define MSM8960_TMR_PHYS	0x0200A000

#define MSM8960_TMR_SIZE	SZ_4K



#define MSM8960_TMR0_PHYS	0x0208A000

#define MSM8960_TMR0_SIZE	SZ_4K



#endif

arch/arm/mach-msm/include/mach/msm_iomap-8x60.h

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

 * Copyright (C) 2007 Google, Inc.

 * Copyright (c) 2008-2011, Code Aurora Forum. All rights reserved.

 * Author: Brian Swetland <swetland@google.com>

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and

 * may be copied, distributed, and modified under those terms.

 *

 * 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.

 *

 *

 * The MSM peripherals are spread all over across 768MB of physical

 * space, which makes just having a simple IO_ADDRESS macro to slide

 * them into the right virtual location rough.  Instead, we will

 * provide a master phys->virt mapping for peripherals here.

 *

 */



#ifndef __ASM_ARCH_MSM_IOMAP_8X60_H

#define __ASM_ARCH_MSM_IOMAP_8X60_H



/* Physical base address and size of peripherals.

 * Ordered by the virtual base addresses they will be mapped at.

 *

 * MSM_VIC_BASE must be an value that can be loaded via a "mov"

 * instruction, otherwise entry-macro.S will not compile.

 *

 * If you add or remove entries here, you'll want to edit the

 * msm_io_desc array in arch/arm/mach-msm/io.c to reflect your

 * changes.

 *

 */



#define MSM8X60_TMR_PHYS	0x02000000

#define MSM8X60_TMR_SIZE	SZ_4K



#define MSM8X60_TMR0_PHYS	0x02040000

#define MSM8X60_TMR0_SIZE	SZ_4K



#endif