Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 192181
b: refs/heads/master
c: d2e753b
h: refs/heads/master
i:
  192179: 8128de0
v: v3
  • Loading branch information
Gregory Bean authored and Daniel Walker committed May 13, 2010
1 parent 11b7af3 commit ba6caf4
Show file tree
Hide file tree
Showing 3 changed files with 143 additions and 95 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8f90c7b60d487866841bfa2fd51792873e54a3a5
refs/heads/master: d2e753bf935bb67fcddfd64017d2b302d6e2330d
139 changes: 139 additions & 0 deletions trunk/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
/* arch/arm/mach-msm/include/mach/msm_iomap.h
*
* Copyright (C) 2007 Google, Inc.
* 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_7X00_H
#define __ASM_ARCH_MSM_IOMAP_7X00_H

#include <asm/sizes.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.
*
*/

#ifdef __ASSEMBLY__
#define IOMEM(x) x
#else
#define IOMEM(x) ((void __force __iomem *)(x))
#endif

#define MSM_VIC_BASE IOMEM(0xE0000000)
#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 MSM_DMOV_BASE IOMEM(0xE0002000)
#define MSM_DMOV_PHYS 0xA9700000
#define MSM_DMOV_SIZE SZ_4K

#define MSM_GPIO1_BASE IOMEM(0xE0003000)
#define MSM_GPIO1_PHYS 0xA9200000
#define MSM_GPIO1_SIZE SZ_4K

#define MSM_GPIO2_BASE IOMEM(0xE0004000)
#define MSM_GPIO2_PHYS 0xA9300000
#define MSM_GPIO2_SIZE SZ_4K

#define MSM_CLK_CTL_BASE IOMEM(0xE0005000)
#define MSM_CLK_CTL_PHYS 0xA8600000
#define MSM_CLK_CTL_SIZE SZ_4K

#define MSM_SHARED_RAM_BASE IOMEM(0xE0100000)
#define MSM_SHARED_RAM_PHYS 0x01F00000
#define MSM_SHARED_RAM_SIZE SZ_1M

#define MSM_UART1_PHYS 0xA9A00000
#define MSM_UART1_SIZE SZ_4K

#define MSM_UART2_PHYS 0xA9B00000
#define MSM_UART2_SIZE SZ_4K

#define MSM_UART3_PHYS 0xA9C00000
#define MSM_UART3_SIZE SZ_4K

#ifdef CONFIG_MSM_DEBUG_UART
#define MSM_DEBUG_UART_BASE 0xE1000000
#if CONFIG_MSM_DEBUG_UART == 1
#define MSM_DEBUG_UART_PHYS MSM_UART1_PHYS
#elif CONFIG_MSM_DEBUG_UART == 2
#define MSM_DEBUG_UART_PHYS MSM_UART2_PHYS
#elif CONFIG_MSM_DEBUG_UART == 3
#define MSM_DEBUG_UART_PHYS MSM_UART3_PHYS
#endif
#define MSM_DEBUG_UART_SIZE SZ_4K
#endif

#define MSM_SDC1_PHYS 0xA0400000
#define MSM_SDC1_SIZE SZ_4K

#define MSM_SDC2_PHYS 0xA0500000
#define MSM_SDC2_SIZE SZ_4K

#define MSM_SDC3_PHYS 0xA0600000
#define MSM_SDC3_SIZE SZ_4K

#define MSM_SDC4_PHYS 0xA0700000
#define MSM_SDC4_SIZE SZ_4K

#define MSM_I2C_PHYS 0xA9900000
#define MSM_I2C_SIZE SZ_4K

#define MSM_HSUSB_PHYS 0xA0800000
#define MSM_HSUSB_SIZE SZ_4K

#define MSM_PMDH_PHYS 0xAA600000
#define MSM_PMDH_SIZE SZ_4K

#define MSM_EMDH_PHYS 0xAA700000
#define MSM_EMDH_SIZE SZ_4K

#define MSM_MDP_PHYS 0xAA200000
#define MSM_MDP_SIZE 0x000F0000

#define MSM_MDC_PHYS 0xAA500000
#define MSM_MDC_SIZE SZ_1M

#define MSM_AD5_PHYS 0xAC000000
#define MSM_AD5_SIZE (SZ_1M*13)


#if defined(CONFIG_ARCH_MSM7X30)
#define MSM_GCC_BASE IOMEM(0xF8009000)
#define MSM_GCC_PHYS 0xC0182000
#define MSM_GCC_SIZE SZ_4K
#endif

#endif
97 changes: 3 additions & 94 deletions trunk/arch/arm/mach-msm/include/mach/msm_iomap.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* arch/arm/mach-msm/include/mach/msm_iomap.h
*
/*
* Copyright (C) 2007 Google, Inc.
* Copyright (c) 2008-2010, Code Aurora Forum. All rights reserved.
* Author: Brian Swetland <swetland@google.com>
*
* This software is licensed under the terms of the GNU General Public
Expand Down Expand Up @@ -43,97 +43,6 @@
#define IOMEM(x) ((void __force __iomem *)(x))
#endif

#define MSM_VIC_BASE IOMEM(0xE0000000)
#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 MSM_DMOV_BASE IOMEM(0xE0002000)
#define MSM_DMOV_PHYS 0xA9700000
#define MSM_DMOV_SIZE SZ_4K

#define MSM_GPIO1_BASE IOMEM(0xE0003000)
#define MSM_GPIO1_PHYS 0xA9200000
#define MSM_GPIO1_SIZE SZ_4K

#define MSM_GPIO2_BASE IOMEM(0xE0004000)
#define MSM_GPIO2_PHYS 0xA9300000
#define MSM_GPIO2_SIZE SZ_4K

#define MSM_CLK_CTL_BASE IOMEM(0xE0005000)
#define MSM_CLK_CTL_PHYS 0xA8600000
#define MSM_CLK_CTL_SIZE SZ_4K

#define MSM_SHARED_RAM_BASE IOMEM(0xE0100000)
#define MSM_SHARED_RAM_PHYS 0x01F00000
#define MSM_SHARED_RAM_SIZE SZ_1M

#define MSM_UART1_PHYS 0xA9A00000
#define MSM_UART1_SIZE SZ_4K

#define MSM_UART2_PHYS 0xA9B00000
#define MSM_UART2_SIZE SZ_4K

#define MSM_UART3_PHYS 0xA9C00000
#define MSM_UART3_SIZE SZ_4K

#ifdef CONFIG_MSM_DEBUG_UART
#define MSM_DEBUG_UART_BASE 0xE1000000
#if CONFIG_MSM_DEBUG_UART == 1
#define MSM_DEBUG_UART_PHYS MSM_UART1_PHYS
#elif CONFIG_MSM_DEBUG_UART == 2
#define MSM_DEBUG_UART_PHYS MSM_UART2_PHYS
#elif CONFIG_MSM_DEBUG_UART == 3
#define MSM_DEBUG_UART_PHYS MSM_UART3_PHYS
#endif
#define MSM_DEBUG_UART_SIZE SZ_4K
#endif

#define MSM_SDC1_PHYS 0xA0400000
#define MSM_SDC1_SIZE SZ_4K

#define MSM_SDC2_PHYS 0xA0500000
#define MSM_SDC2_SIZE SZ_4K

#define MSM_SDC3_PHYS 0xA0600000
#define MSM_SDC3_SIZE SZ_4K

#define MSM_SDC4_PHYS 0xA0700000
#define MSM_SDC4_SIZE SZ_4K

#define MSM_I2C_PHYS 0xA9900000
#define MSM_I2C_SIZE SZ_4K

#define MSM_HSUSB_PHYS 0xA0800000
#define MSM_HSUSB_SIZE SZ_4K

#define MSM_PMDH_PHYS 0xAA600000
#define MSM_PMDH_SIZE SZ_4K

#define MSM_EMDH_PHYS 0xAA700000
#define MSM_EMDH_SIZE SZ_4K

#define MSM_MDP_PHYS 0xAA200000
#define MSM_MDP_SIZE 0x000F0000

#define MSM_MDC_PHYS 0xAA500000
#define MSM_MDC_SIZE SZ_1M

#define MSM_AD5_PHYS 0xAC000000
#define MSM_AD5_SIZE (SZ_1M*13)


#if defined(CONFIG_ARCH_MSM7X30)
#define MSM_GCC_BASE IOMEM(0xF8009000)
#define MSM_GCC_PHYS 0xC0182000
#define MSM_GCC_SIZE SZ_4K
#endif
#include "msm_iomap-7x00.h"

#endif

0 comments on commit ba6caf4

Please sign in to comment.