Commit 5d0afd74 authored by Stepan Moskovchenko's avatar Stepan Moskovchenko Committed by David Brown
Browse files

msm: io: I/O register definitions for MSM8960 



Add the register address definitions for the basic hardware
blocks on the Qualcomm MSM8960 chip.

Signed-off-by: default avatarStepan Moskovchenko <stepanm@codeaurora.org>
Signed-off-by: default avatarDavid Brown <davidb@codeaurora.org>
parent 8bb06444

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

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ void __iomem *__msm_ioremap(unsigned long phys_addr, size_t size, unsigned int m 
void msm_map_qsd8x50_io(void);

void msm_map_msm7x30_io(void);

void msm_map_msm8x60_io(void);

void msm_map_msm8960_io(void);



extern unsigned int msm_shared_ram_phys;

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

0 → 100644
+48 −0
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_QGIC_DIST_PHYS	0x02000000

#define MSM8960_QGIC_DIST_SIZE	SZ_4K



#define MSM8960_QGIC_CPU_PHYS	0x02002000

#define MSM8960_QGIC_CPU_SIZE	SZ_4K



#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.h

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ 
#include "msm_iomap-7x00.h"

#endif



#include "msm_iomap-8960.h"



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

#define MSM_CSR_BASE		IOMEM(0xE0001000)

#define MSM_QGIC_DIST_BASE	IOMEM(0xF0000000)

arch/arm/mach-msm/io.c

+14 −0
Original line number Diff line number Diff line
@@ -117,6 +117,20 @@ void __init msm_map_msm8x60_io(void) 
}

#endif /* CONFIG_ARCH_MSM8X60 */



#ifdef CONFIG_ARCH_MSM8960

static struct map_desc msm8960_io_desc[] __initdata = {

	MSM_CHIP_DEVICE(QGIC_DIST, MSM8960),

	MSM_CHIP_DEVICE(QGIC_CPU, MSM8960),

	MSM_CHIP_DEVICE(TMR, MSM8960),

	MSM_CHIP_DEVICE(TMR0, MSM8960),

};



void __init msm_map_msm8960_io(void)

{

	iotable_init(msm8960_io_desc, ARRAY_SIZE(msm8960_io_desc));

}

#endif /* CONFIG_ARCH_MSM8960 */



#ifdef CONFIG_ARCH_MSM7X30

static struct map_desc msm7x30_io_desc[] __initdata = {

	MSM_DEVICE(VIC),