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

Commit 8c27e6f3 authored by David Brown's avatar David Brown
Browse files

msm: Generalize timer register mappings 



Allow the timer register to be determined dynamically instead of at
compile time.  Use common virtual addresses for the registers across
all MSM chips, and select the register mappings based on the detected
CPU.

Signed-off-by: default avatarDavid Brown <davidb@codeaurora.org>
parent 87fa28e9

arch/arm/mach-msm/include/mach/msm_iomap-7x00.h

+3 −7
Original line number Diff line number Diff line 
/* arch/arm/mach-msm/include/mach/msm_iomap.h

 *

 * Copyright (C) 2007 Google, Inc.

 * Copyright (c) 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
@@ -47,13 +48,8 @@ 
#define MSM_VIC_PHYS          0xC0000000

#define MSM_VIC_SIZE          SZ_4K



#define MSM_CSR_BASE          IOMEM(0xE0001000)

#define MSM_CSR_PHYS          0xC0100000

#define MSM_CSR_SIZE          SZ_4K



#define MSM_GPT_PHYS          MSM_CSR_PHYS

#define MSM_GPT_BASE          MSM_CSR_BASE

#define MSM_GPT_SIZE          SZ_4K

#define MSM7X00_CSR_PHYS      0xC0100000

#define MSM7X00_CSR_SIZE      SZ_4K



#define MSM_DMOV_BASE         IOMEM(0xE0002000)

#define MSM_DMOV_PHYS         0xA9700000

arch/arm/mach-msm/include/mach/msm_iomap-7x30.h

+3 −11
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2007 Google, Inc.

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

 * 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
@@ -39,16 +39,8 @@ 
#define MSM_VIC_PHYS          0xC0080000

#define MSM_VIC_SIZE          SZ_4K



#define MSM_CSR_BASE          IOMEM(0xE0001000)

#define MSM_CSR_PHYS          0xC0100000

#define MSM_CSR_SIZE          SZ_4K



#define MSM_TMR_PHYS          MSM_CSR_PHYS

#define MSM_TMR_BASE          MSM_CSR_BASE

#define MSM_TMR_SIZE          SZ_4K



#define MSM_GPT_BASE 	      (MSM_TMR_BASE + 0x4)

#define MSM_DGT_BASE 	      (MSM_TMR_BASE + 0x24)

#define MSM7X30_CSR_PHYS      0xC0100000

#define MSM7X30_CSR_SIZE      SZ_4K



#define MSM_DMOV_BASE         IOMEM(0xE0002000)

#define MSM_DMOV_PHYS         0xAC400000

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

+3 −11
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2007 Google, Inc.

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

 * 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
@@ -39,16 +39,8 @@ 
#define MSM_VIC_PHYS          0xAC000000

#define MSM_VIC_SIZE          SZ_4K



#define MSM_CSR_BASE          IOMEM(0xE0001000)

#define MSM_CSR_PHYS          0xAC100000

#define MSM_CSR_SIZE          SZ_4K



#define MSM_TMR_PHYS          MSM_CSR_PHYS

#define MSM_TMR_BASE          MSM_CSR_BASE

#define MSM_TMR_SIZE          SZ_4K



#define MSM_GPT_BASE          MSM_TMR_BASE

#define MSM_DGT_BASE          (MSM_TMR_BASE + 0x10)

#define QSD8X50_CSR_PHYS      0xAC100000

#define QSD8X50_CSR_SIZE      SZ_4K



#define MSM_DMOV_BASE         IOMEM(0xE0002000)

#define MSM_DMOV_PHYS         0xA9700000

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

+5 −10
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2007 Google, Inc.

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

 * 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
@@ -58,16 +58,11 @@ 
#define MSM_SHARED_RAM_BASE	IOMEM(0xF0100000)

#define MSM_SHARED_RAM_SIZE	SZ_1M



#define MSM_TMR_BASE		IOMEM(0xF0200000)

#define MSM_TMR_PHYS		0x02000000

#define MSM_TMR_SIZE		SZ_4K

#define MSM8X60_TMR_PHYS	0x02000000

#define MSM8X60_TMR_SIZE	SZ_4K



#define MSM_TMR0_BASE		IOMEM(0xF0201000)

#define MSM_TMR0_PHYS		0x02040000

#define MSM_TMR0_SIZE		SZ_4K



#define MSM_GPT_BASE		(MSM_TMR_BASE + 0x4)

#define MSM_DGT_BASE		(MSM_TMR_BASE + 0x24)

#define MSM8X60_TMR0_PHYS	0x02040000

#define MSM8X60_TMR0_SIZE	SZ_4K



#define MSM_IOMMU_JPEGD_PHYS	0x07300000

#define MSM_IOMMU_JPEGD_SIZE	SZ_1M

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

+5 −2
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2007 Google, Inc.

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

 * 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
@@ -53,6 +53,9 @@ 
#include "msm_iomap-7x00.h"

#endif





/* Virtual addressses shared across all MSM targets. */

#define MSM_CSR_BASE		IOMEM(0xE0001000)

#define MSM_TMR_BASE		IOMEM(0xF0200000)

#define MSM_TMR0_BASE		IOMEM(0xF0201000)



#endif