diff options
Diffstat (limited to 'arch/arm')
92 files changed, 384 insertions, 429 deletions
diff --git a/arch/arm/mach-omap1/include/mach/hardware.h b/arch/arm/mach-omap1/include/mach/hardware.h index 01e35fa106b8..bd3b95e1cb02 100644 --- a/arch/arm/mach-omap1/include/mach/hardware.h +++ b/arch/arm/mach-omap1/include/mach/hardware.h | |||
| @@ -1,11 +1,46 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * arch/arm/mach-omap1/include/mach/hardware.h | 2 | * arch/arm/mach-omap1/include/mach/hardware.h |
| 3 | * | ||
| 4 | * Hardware definitions for TI OMAP processors and boards | ||
| 5 | * | ||
| 6 | * NOTE: Please put device driver specific defines into a separate header | ||
| 7 | * file for each driver. | ||
| 8 | * | ||
| 9 | * Copyright (C) 2001 RidgeRun, Inc. | ||
| 10 | * Author: RidgeRun, Inc. Greg Lonnon <glonnon@ridgerun.com> | ||
| 11 | * | ||
| 12 | * Reorganized for Linux-2.6 by Tony Lindgren <tony@atomide.com> | ||
| 13 | * and Dirk Behme <dirk.behme@de.bosch.com> | ||
| 14 | * | ||
| 15 | * This program is free software; you can redistribute it and/or modify it | ||
| 16 | * under the terms of the GNU General Public License as published by the | ||
| 17 | * Free Software Foundation; either version 2 of the License, or (at your | ||
| 18 | * option) any later version. | ||
| 19 | * | ||
| 20 | * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED | ||
| 21 | * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
| 22 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN | ||
| 23 | * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
| 24 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 25 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | ||
| 26 | * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
| 27 | * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| 28 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
| 29 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 30 | * | ||
| 31 | * You should have received a copy of the GNU General Public License along | ||
| 32 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
| 33 | * 675 Mass Ave, Cambridge, MA 02139, USA. | ||
| 3 | */ | 34 | */ |
| 4 | 35 | ||
| 5 | #ifndef __MACH_HARDWARE_H | 36 | #ifndef __ASM_ARCH_OMAP_HARDWARE_H |
| 6 | #define __MACH_HARDWARE_H | 37 | #define __ASM_ARCH_OMAP_HARDWARE_H |
| 7 | 38 | ||
| 39 | #include <asm/sizes.h> | ||
| 8 | #ifndef __ASSEMBLER__ | 40 | #ifndef __ASSEMBLER__ |
| 41 | #include <asm/types.h> | ||
| 42 | #include <plat/cpu.h> | ||
| 43 | |||
| 9 | /* | 44 | /* |
| 10 | * NOTE: Please use ioremap + __raw_read/write where possible instead of these | 45 | * NOTE: Please use ioremap + __raw_read/write where possible instead of these |
| 11 | */ | 46 | */ |
| @@ -35,7 +70,249 @@ static inline u32 omap_cs3_phys(void) | |||
| 35 | ? 0 : OMAP_CS3_PHYS; | 70 | ? 0 : OMAP_CS3_PHYS; |
| 36 | } | 71 | } |
| 37 | 72 | ||
| 73 | #endif /* ifndef __ASSEMBLER__ */ | ||
| 74 | |||
| 75 | #include <plat/serial.h> | ||
| 76 | |||
| 77 | /* | ||
| 78 | * --------------------------------------------------------------------------- | ||
| 79 | * Common definitions for all OMAP processors | ||
| 80 | * NOTE: Put all processor or board specific parts to the special header | ||
| 81 | * files. | ||
| 82 | * --------------------------------------------------------------------------- | ||
| 83 | */ | ||
| 84 | |||
| 85 | /* | ||
| 86 | * ---------------------------------------------------------------------------- | ||
| 87 | * Timers | ||
| 88 | * ---------------------------------------------------------------------------- | ||
| 89 | */ | ||
| 90 | #define OMAP_MPU_TIMER1_BASE (0xfffec500) | ||
| 91 | #define OMAP_MPU_TIMER2_BASE (0xfffec600) | ||
| 92 | #define OMAP_MPU_TIMER3_BASE (0xfffec700) | ||
| 93 | #define MPU_TIMER_FREE (1 << 6) | ||
| 94 | #define MPU_TIMER_CLOCK_ENABLE (1 << 5) | ||
| 95 | #define MPU_TIMER_AR (1 << 1) | ||
| 96 | #define MPU_TIMER_ST (1 << 0) | ||
| 97 | |||
| 98 | /* | ||
| 99 | * ---------------------------------------------------------------------------- | ||
| 100 | * Clocks | ||
| 101 | * ---------------------------------------------------------------------------- | ||
| 102 | */ | ||
| 103 | #define CLKGEN_REG_BASE (0xfffece00) | ||
| 104 | #define ARM_CKCTL (CLKGEN_REG_BASE + 0x0) | ||
| 105 | #define ARM_IDLECT1 (CLKGEN_REG_BASE + 0x4) | ||
| 106 | #define ARM_IDLECT2 (CLKGEN_REG_BASE + 0x8) | ||
| 107 | #define ARM_EWUPCT (CLKGEN_REG_BASE + 0xC) | ||
| 108 | #define ARM_RSTCT1 (CLKGEN_REG_BASE + 0x10) | ||
| 109 | #define ARM_RSTCT2 (CLKGEN_REG_BASE + 0x14) | ||
| 110 | #define ARM_SYSST (CLKGEN_REG_BASE + 0x18) | ||
| 111 | #define ARM_IDLECT3 (CLKGEN_REG_BASE + 0x24) | ||
| 112 | |||
| 113 | #define CK_RATEF 1 | ||
| 114 | #define CK_IDLEF 2 | ||
| 115 | #define CK_ENABLEF 4 | ||
| 116 | #define CK_SELECTF 8 | ||
| 117 | #define SETARM_IDLE_SHIFT | ||
| 118 | |||
| 119 | /* DPLL control registers */ | ||
| 120 | #define DPLL_CTL (0xfffecf00) | ||
| 121 | |||
| 122 | /* DSP clock control. Must use __raw_readw() and __raw_writew() with these */ | ||
| 123 | #define DSP_CONFIG_REG_BASE IOMEM(0xe1008000) | ||
| 124 | #define DSP_CKCTL (DSP_CONFIG_REG_BASE + 0x0) | ||
| 125 | #define DSP_IDLECT1 (DSP_CONFIG_REG_BASE + 0x4) | ||
| 126 | #define DSP_IDLECT2 (DSP_CONFIG_REG_BASE + 0x8) | ||
| 127 | #define DSP_RSTCT2 (DSP_CONFIG_REG_BASE + 0x14) | ||
| 128 | |||
| 129 | /* | ||
| 130 | * --------------------------------------------------------------------------- | ||
| 131 | * UPLD | ||
| 132 | * --------------------------------------------------------------------------- | ||
| 133 | */ | ||
| 134 | #define ULPD_REG_BASE (0xfffe0800) | ||
| 135 | #define ULPD_IT_STATUS (ULPD_REG_BASE + 0x14) | ||
| 136 | #define ULPD_SETUP_ANALOG_CELL_3 (ULPD_REG_BASE + 0x24) | ||
| 137 | #define ULPD_CLOCK_CTRL (ULPD_REG_BASE + 0x30) | ||
| 138 | # define DIS_USB_PVCI_CLK (1 << 5) /* no USB/FAC synch */ | ||
| 139 | # define USB_MCLK_EN (1 << 4) /* enable W4_USB_CLKO */ | ||
| 140 | #define ULPD_SOFT_REQ (ULPD_REG_BASE + 0x34) | ||
| 141 | # define SOFT_UDC_REQ (1 << 4) | ||
| 142 | # define SOFT_USB_CLK_REQ (1 << 3) | ||
| 143 | # define SOFT_DPLL_REQ (1 << 0) | ||
| 144 | #define ULPD_DPLL_CTRL (ULPD_REG_BASE + 0x3c) | ||
| 145 | #define ULPD_STATUS_REQ (ULPD_REG_BASE + 0x40) | ||
| 146 | #define ULPD_APLL_CTRL (ULPD_REG_BASE + 0x4c) | ||
| 147 | #define ULPD_POWER_CTRL (ULPD_REG_BASE + 0x50) | ||
| 148 | #define ULPD_SOFT_DISABLE_REQ_REG (ULPD_REG_BASE + 0x68) | ||
| 149 | # define DIS_MMC2_DPLL_REQ (1 << 11) | ||
| 150 | # define DIS_MMC1_DPLL_REQ (1 << 10) | ||
| 151 | # define DIS_UART3_DPLL_REQ (1 << 9) | ||
| 152 | # define DIS_UART2_DPLL_REQ (1 << 8) | ||
| 153 | # define DIS_UART1_DPLL_REQ (1 << 7) | ||
| 154 | # define DIS_USB_HOST_DPLL_REQ (1 << 6) | ||
| 155 | #define ULPD_SDW_CLK_DIV_CTRL_SEL (ULPD_REG_BASE + 0x74) | ||
| 156 | #define ULPD_CAM_CLK_CTRL (ULPD_REG_BASE + 0x7c) | ||
| 157 | |||
| 158 | /* | ||
| 159 | * --------------------------------------------------------------------------- | ||
| 160 | * Watchdog timer | ||
| 161 | * --------------------------------------------------------------------------- | ||
| 162 | */ | ||
| 163 | |||
| 164 | /* Watchdog timer within the OMAP3.2 gigacell */ | ||
| 165 | #define OMAP_MPU_WATCHDOG_BASE (0xfffec800) | ||
| 166 | #define OMAP_WDT_TIMER (OMAP_MPU_WATCHDOG_BASE + 0x0) | ||
| 167 | #define OMAP_WDT_LOAD_TIM (OMAP_MPU_WATCHDOG_BASE + 0x4) | ||
| 168 | #define OMAP_WDT_READ_TIM (OMAP_MPU_WATCHDOG_BASE + 0x4) | ||
| 169 | #define OMAP_WDT_TIMER_MODE (OMAP_MPU_WATCHDOG_BASE + 0x8) | ||
| 170 | |||
| 171 | /* | ||
| 172 | * --------------------------------------------------------------------------- | ||
| 173 | * Interrupts | ||
| 174 | * --------------------------------------------------------------------------- | ||
| 175 | */ | ||
| 176 | #ifdef CONFIG_ARCH_OMAP1 | ||
| 177 | |||
| 178 | /* | ||
| 179 | * XXX: These probably want to be moved to arch/arm/mach-omap/omap1/irq.c | ||
| 180 | * or something similar.. -- PFM. | ||
| 181 | */ | ||
| 182 | |||
| 183 | #define OMAP_IH1_BASE 0xfffecb00 | ||
| 184 | #define OMAP_IH2_BASE 0xfffe0000 | ||
| 185 | |||
| 186 | #define OMAP_IH1_ITR (OMAP_IH1_BASE + 0x00) | ||
| 187 | #define OMAP_IH1_MIR (OMAP_IH1_BASE + 0x04) | ||
| 188 | #define OMAP_IH1_SIR_IRQ (OMAP_IH1_BASE + 0x10) | ||
| 189 | #define OMAP_IH1_SIR_FIQ (OMAP_IH1_BASE + 0x14) | ||
| 190 | #define OMAP_IH1_CONTROL (OMAP_IH1_BASE + 0x18) | ||
| 191 | #define OMAP_IH1_ILR0 (OMAP_IH1_BASE + 0x1c) | ||
| 192 | #define OMAP_IH1_ISR (OMAP_IH1_BASE + 0x9c) | ||
| 193 | |||
| 194 | #define OMAP_IH2_ITR (OMAP_IH2_BASE + 0x00) | ||
| 195 | #define OMAP_IH2_MIR (OMAP_IH2_BASE + 0x04) | ||
| 196 | #define OMAP_IH2_SIR_IRQ (OMAP_IH2_BASE + 0x10) | ||
| 197 | #define OMAP_IH2_SIR_FIQ (OMAP_IH2_BASE + 0x14) | ||
| 198 | #define OMAP_IH2_CONTROL (OMAP_IH2_BASE + 0x18) | ||
| 199 | #define OMAP_IH2_ILR0 (OMAP_IH2_BASE + 0x1c) | ||
| 200 | #define OMAP_IH2_ISR (OMAP_IH2_BASE + 0x9c) | ||
| 201 | |||
| 202 | #define IRQ_ITR_REG_OFFSET 0x00 | ||
| 203 | #define IRQ_MIR_REG_OFFSET 0x04 | ||
| 204 | #define IRQ_SIR_IRQ_REG_OFFSET 0x10 | ||
| 205 | #define IRQ_SIR_FIQ_REG_OFFSET 0x14 | ||
| 206 | #define IRQ_CONTROL_REG_OFFSET 0x18 | ||
| 207 | #define IRQ_ISR_REG_OFFSET 0x9c | ||
| 208 | #define IRQ_ILR0_REG_OFFSET 0x1c | ||
| 209 | #define IRQ_GMR_REG_OFFSET 0xa0 | ||
| 210 | |||
| 38 | #endif | 211 | #endif |
| 39 | #endif | ||
| 40 | 212 | ||
| 41 | #include <plat/hardware.h> | 213 | /* |
| 214 | * ---------------------------------------------------------------------------- | ||
| 215 | * System control registers | ||
| 216 | * ---------------------------------------------------------------------------- | ||
| 217 | */ | ||
| 218 | #define MOD_CONF_CTRL_0 0xfffe1080 | ||
| 219 | #define MOD_CONF_CTRL_1 0xfffe1110 | ||
| 220 | |||
| 221 | /* | ||
| 222 | * ---------------------------------------------------------------------------- | ||
| 223 | * Pin multiplexing registers | ||
| 224 | * ---------------------------------------------------------------------------- | ||
| 225 | */ | ||
| 226 | #define FUNC_MUX_CTRL_0 0xfffe1000 | ||
| 227 | #define FUNC_MUX_CTRL_1 0xfffe1004 | ||
| 228 | #define FUNC_MUX_CTRL_2 0xfffe1008 | ||
| 229 | #define COMP_MODE_CTRL_0 0xfffe100c | ||
| 230 | #define FUNC_MUX_CTRL_3 0xfffe1010 | ||
| 231 | #define FUNC_MUX_CTRL_4 0xfffe1014 | ||
| 232 | #define FUNC_MUX_CTRL_5 0xfffe1018 | ||
| 233 | #define FUNC_MUX_CTRL_6 0xfffe101C | ||
| 234 | #define FUNC_MUX_CTRL_7 0xfffe1020 | ||
| 235 | #define FUNC_MUX_CTRL_8 0xfffe1024 | ||
| 236 | #define FUNC_MUX_CTRL_9 0xfffe1028 | ||
| 237 | #define FUNC_MUX_CTRL_A 0xfffe102C | ||
| 238 | #define FUNC_MUX_CTRL_B 0xfffe1030 | ||
| 239 | #define FUNC_MUX_CTRL_C 0xfffe1034 | ||
| 240 | #define FUNC_MUX_CTRL_D 0xfffe1038 | ||
| 241 | #define PULL_DWN_CTRL_0 0xfffe1040 | ||
| 242 | #define PULL_DWN_CTRL_1 0xfffe1044 | ||
| 243 | #define PULL_DWN_CTRL_2 0xfffe1048 | ||
| 244 | #define PULL_DWN_CTRL_3 0xfffe104c | ||
| 245 | #define PULL_DWN_CTRL_4 0xfffe10ac | ||
| 246 | |||
| 247 | /* OMAP-1610 specific multiplexing registers */ | ||
| 248 | #define FUNC_MUX_CTRL_E 0xfffe1090 | ||
| 249 | #define FUNC_MUX_CTRL_F 0xfffe1094 | ||
| 250 | #define FUNC_MUX_CTRL_10 0xfffe1098 | ||
| 251 | #define FUNC_MUX_CTRL_11 0xfffe109c | ||
| 252 | #define FUNC_MUX_CTRL_12 0xfffe10a0 | ||
| 253 | #define PU_PD_SEL_0 0xfffe10b4 | ||
| 254 | #define PU_PD_SEL_1 0xfffe10b8 | ||
| 255 | #define PU_PD_SEL_2 0xfffe10bc | ||
| 256 | #define PU_PD_SEL_3 0xfffe10c0 | ||
| 257 | #define PU_PD_SEL_4 0xfffe10c4 | ||
| 258 | |||
| 259 | /* Timer32K for 1610 and 1710*/ | ||
| 260 | #define OMAP_TIMER32K_BASE 0xFFFBC400 | ||
| 261 | |||
| 262 | /* | ||
| 263 | * --------------------------------------------------------------------------- | ||
| 264 | * TIPB bus interface | ||
| 265 | * --------------------------------------------------------------------------- | ||
| 266 | */ | ||
| 267 | #define TIPB_PUBLIC_CNTL_BASE 0xfffed300 | ||
| 268 | #define MPU_PUBLIC_TIPB_CNTL (TIPB_PUBLIC_CNTL_BASE + 0x8) | ||
| 269 | #define TIPB_PRIVATE_CNTL_BASE 0xfffeca00 | ||
| 270 | #define MPU_PRIVATE_TIPB_CNTL (TIPB_PRIVATE_CNTL_BASE + 0x8) | ||
| 271 | |||
| 272 | /* | ||
| 273 | * ---------------------------------------------------------------------------- | ||
| 274 | * MPUI interface | ||
| 275 | * ---------------------------------------------------------------------------- | ||
| 276 | */ | ||
| 277 | #define MPUI_BASE (0xfffec900) | ||
| 278 | #define MPUI_CTRL (MPUI_BASE + 0x0) | ||
| 279 | #define MPUI_DEBUG_ADDR (MPUI_BASE + 0x4) | ||
| 280 | #define MPUI_DEBUG_DATA (MPUI_BASE + 0x8) | ||
| 281 | #define MPUI_DEBUG_FLAG (MPUI_BASE + 0xc) | ||
| 282 | #define MPUI_STATUS_REG (MPUI_BASE + 0x10) | ||
| 283 | #define MPUI_DSP_STATUS (MPUI_BASE + 0x14) | ||
| 284 | #define MPUI_DSP_BOOT_CONFIG (MPUI_BASE + 0x18) | ||
| 285 | #define MPUI_DSP_API_CONFIG (MPUI_BASE + 0x1c) | ||
| 286 | |||
| 287 | /* | ||
| 288 | * ---------------------------------------------------------------------------- | ||
| 289 | * LED Pulse Generator | ||
| 290 | * ---------------------------------------------------------------------------- | ||
| 291 | */ | ||
| 292 | #define OMAP_LPG1_BASE 0xfffbd000 | ||
| 293 | #define OMAP_LPG2_BASE 0xfffbd800 | ||
| 294 | #define OMAP_LPG1_LCR (OMAP_LPG1_BASE + 0x00) | ||
| 295 | #define OMAP_LPG1_PMR (OMAP_LPG1_BASE + 0x04) | ||
| 296 | #define OMAP_LPG2_LCR (OMAP_LPG2_BASE + 0x00) | ||
| 297 | #define OMAP_LPG2_PMR (OMAP_LPG2_BASE + 0x04) | ||
| 298 | |||
| 299 | /* | ||
| 300 | * ---------------------------------------------------------------------------- | ||
| 301 | * Pulse-Width Light | ||
| 302 | * ---------------------------------------------------------------------------- | ||
| 303 | */ | ||
| 304 | #define OMAP_PWL_BASE 0xfffb5800 | ||
| 305 | #define OMAP_PWL_ENABLE (OMAP_PWL_BASE + 0x00) | ||
| 306 | #define OMAP_PWL_CLK_ENABLE (OMAP_PWL_BASE + 0x04) | ||
| 307 | |||
| 308 | /* | ||
| 309 | * --------------------------------------------------------------------------- | ||
| 310 | * Processor specific defines | ||
| 311 | * --------------------------------------------------------------------------- | ||
| 312 | */ | ||
| 313 | |||
| 314 | #include <plat/omap7xx.h> | ||
| 315 | #include <plat/omap1510.h> | ||
| 316 | #include <plat/omap16xx.h> | ||
| 317 | |||
| 318 | #endif /* __ASM_ARCH_OMAP_HARDWARE_H */ | ||
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c index c843d01aedda..5453173ff57b 100644 --- a/arch/arm/mach-omap2/board-3430sdp.c +++ b/arch/arm/mach-omap2/board-3430sdp.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #include <linux/gpio.h> | 25 | #include <linux/gpio.h> |
| 26 | #include <linux/mmc/host.h> | 26 | #include <linux/mmc/host.h> |
| 27 | 27 | ||
| 28 | #include <mach/hardware.h> | ||
| 29 | #include <asm/mach-types.h> | 28 | #include <asm/mach-types.h> |
| 30 | #include <asm/mach/arch.h> | 29 | #include <asm/mach/arch.h> |
| 31 | #include <asm/mach/map.h> | 30 | #include <asm/mach/map.h> |
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index 31456eae7808..db43e22526c0 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | #include <linux/leds_pwm.h> | 28 | #include <linux/leds_pwm.h> |
| 29 | #include <linux/platform_data/omap4-keypad.h> | 29 | #include <linux/platform_data/omap4-keypad.h> |
| 30 | 30 | ||
| 31 | #include <mach/hardware.h> | ||
| 32 | #include <asm/hardware/gic.h> | 31 | #include <asm/hardware/gic.h> |
| 33 | #include <asm/mach-types.h> | 32 | #include <asm/mach-types.h> |
| 34 | #include <asm/mach/arch.h> | 33 | #include <asm/mach/arch.h> |
| @@ -44,6 +43,7 @@ | |||
| 44 | #include <linux/wl12xx.h> | 43 | #include <linux/wl12xx.h> |
| 45 | #include <linux/platform_data/omap-abe-twl6040.h> | 44 | #include <linux/platform_data/omap-abe-twl6040.h> |
| 46 | 45 | ||
| 46 | #include "soc.h" | ||
| 47 | #include "mux.h" | 47 | #include "mux.h" |
| 48 | #include "hsmmc.h" | 48 | #include "hsmmc.h" |
| 49 | #include "control.h" | 49 | #include "control.h" |
diff --git a/arch/arm/mach-omap2/board-am3517crane.c b/arch/arm/mach-omap2/board-am3517crane.c index de92b0860698..318feadb1d6e 100644 --- a/arch/arm/mach-omap2/board-am3517crane.c +++ b/arch/arm/mach-omap2/board-am3517crane.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 22 | #include <linux/gpio.h> | 22 | #include <linux/gpio.h> |
| 23 | 23 | ||
| 24 | #include <mach/hardware.h> | ||
| 25 | #include <asm/mach-types.h> | 24 | #include <asm/mach-types.h> |
| 26 | #include <asm/mach/arch.h> | 25 | #include <asm/mach/arch.h> |
| 27 | #include <asm/mach/map.h> | 26 | #include <asm/mach/map.h> |
diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c index f8bc86029bdc..403d048a00ee 100644 --- a/arch/arm/mach-omap2/board-am3517evm.c +++ b/arch/arm/mach-omap2/board-am3517evm.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <linux/mmc/host.h> | 27 | #include <linux/mmc/host.h> |
| 28 | #include <linux/platform_data/gpio-omap.h> | 28 | #include <linux/platform_data/gpio-omap.h> |
| 29 | 29 | ||
| 30 | #include <mach/hardware.h> | ||
| 31 | #include <mach/am35xx.h> | 30 | #include <mach/am35xx.h> |
| 32 | #include <asm/mach-types.h> | 31 | #include <asm/mach-types.h> |
| 33 | #include <asm/mach/arch.h> | 32 | #include <asm/mach/arch.h> |
diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c index a6a1b481cac1..3e2d76f05af4 100644 --- a/arch/arm/mach-omap2/board-apollon.c +++ b/arch/arm/mach-omap2/board-apollon.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | #include <linux/smc91x.h> | 29 | #include <linux/smc91x.h> |
| 30 | #include <linux/gpio.h> | 30 | #include <linux/gpio.h> |
| 31 | 31 | ||
| 32 | #include <mach/hardware.h> | ||
| 33 | #include <asm/mach-types.h> | 32 | #include <asm/mach-types.h> |
| 34 | #include <asm/mach/arch.h> | 33 | #include <asm/mach/arch.h> |
| 35 | #include <asm/mach/flash.h> | 34 | #include <asm/mach/flash.h> |
diff --git a/arch/arm/mach-omap2/board-cm-t3517.c b/arch/arm/mach-omap2/board-cm-t3517.c index 20fe233924ed..27a5450751ed 100644 --- a/arch/arm/mach-omap2/board-cm-t3517.c +++ b/arch/arm/mach-omap2/board-cm-t3517.c | |||
| @@ -42,7 +42,6 @@ | |||
| 42 | #include <plat/usb.h> | 42 | #include <plat/usb.h> |
| 43 | #include <plat/nand.h> | 43 | #include <plat/nand.h> |
| 44 | #include <plat/gpmc.h> | 44 | #include <plat/gpmc.h> |
| 45 | #include <plat/serial.h> | ||
| 46 | 45 | ||
| 47 | #include <mach/am35xx.h> | 46 | #include <mach/am35xx.h> |
| 48 | 47 | ||
diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c index 9032807702b5..18b63ad56274 100644 --- a/arch/arm/mach-omap2/board-devkit8000.c +++ b/arch/arm/mach-omap2/board-devkit8000.c | |||
| @@ -32,8 +32,6 @@ | |||
| 32 | 32 | ||
| 33 | #include <linux/regulator/machine.h> | 33 | #include <linux/regulator/machine.h> |
| 34 | #include <linux/i2c/twl.h> | 34 | #include <linux/i2c/twl.h> |
| 35 | |||
| 36 | #include <mach/hardware.h> | ||
| 37 | #include <mach/id.h> | 35 | #include <mach/id.h> |
| 38 | #include <asm/mach-types.h> | 36 | #include <asm/mach-types.h> |
| 39 | #include <asm/mach/arch.h> | 37 | #include <asm/mach/arch.h> |
| @@ -55,7 +53,6 @@ | |||
| 55 | #include <linux/interrupt.h> | 53 | #include <linux/interrupt.h> |
| 56 | 54 | ||
| 57 | #include "sdram-micron-mt46h32m32lf-6.h" | 55 | #include "sdram-micron-mt46h32m32lf-6.h" |
| 58 | |||
| 59 | #include "mux.h" | 56 | #include "mux.h" |
| 60 | #include "hsmmc.h" | 57 | #include "hsmmc.h" |
| 61 | #include "common-board-devices.h" | 58 | #include "common-board-devices.h" |
diff --git a/arch/arm/mach-omap2/board-flash.c b/arch/arm/mach-omap2/board-flash.c index 901fa1f12409..9017813f9abc 100644 --- a/arch/arm/mach-omap2/board-flash.c +++ b/arch/arm/mach-omap2/board-flash.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <plat/onenand.h> | 23 | #include <plat/onenand.h> |
| 24 | #include <plat/tc.h> | 24 | #include <plat/tc.h> |
| 25 | 25 | ||
| 26 | #include "common.h" | ||
| 26 | #include "board-flash.h" | 27 | #include "board-flash.h" |
| 27 | 28 | ||
| 28 | #define REG_FPGA_REV 0x10 | 29 | #define REG_FPGA_REV 0x10 |
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 38024a57f6bf..2ea7c577b295 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #include <linux/of_platform.h> | 16 | #include <linux/of_platform.h> |
| 17 | #include <linux/irqdomain.h> | 17 | #include <linux/irqdomain.h> |
| 18 | 18 | ||
| 19 | #include <mach/hardware.h> | ||
| 20 | #include <asm/hardware/gic.h> | 19 | #include <asm/hardware/gic.h> |
| 21 | #include <asm/mach/arch.h> | 20 | #include <asm/mach/arch.h> |
| 22 | 21 | ||
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c index 5be30e6dd4cb..12569cb0eddd 100644 --- a/arch/arm/mach-omap2/board-h4.c +++ b/arch/arm/mach-omap2/board-h4.c | |||
| @@ -27,12 +27,10 @@ | |||
| 27 | #include <linux/io.h> | 27 | #include <linux/io.h> |
| 28 | #include <linux/input/matrix_keypad.h> | 28 | #include <linux/input/matrix_keypad.h> |
| 29 | 29 | ||
| 30 | #include <mach/hardware.h> | ||
| 31 | #include <asm/mach-types.h> | 30 | #include <asm/mach-types.h> |
| 32 | #include <asm/mach/arch.h> | 31 | #include <asm/mach/arch.h> |
| 33 | #include <asm/mach/map.h> | 32 | #include <asm/mach/map.h> |
| 34 | 33 | ||
| 35 | #include "common.h" | ||
| 36 | #include <plat/menelaus.h> | 34 | #include <plat/menelaus.h> |
| 37 | #include <plat/dma.h> | 35 | #include <plat/dma.h> |
| 38 | #include <plat/gpmc.h> | 36 | #include <plat/gpmc.h> |
| @@ -41,6 +39,7 @@ | |||
| 41 | #include <video/omapdss.h> | 39 | #include <video/omapdss.h> |
| 42 | #include <video/omap-panel-generic-dpi.h> | 40 | #include <video/omap-panel-generic-dpi.h> |
| 43 | 41 | ||
| 42 | #include "common.h" | ||
| 44 | #include "mux.h" | 43 | #include "mux.h" |
| 45 | #include "control.h" | 44 | #include "control.h" |
| 46 | 45 | ||
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c index bacb917191d1..8408bb2748a6 100644 --- a/arch/arm/mach-omap2/board-igep0020.c +++ b/arch/arm/mach-omap2/board-igep0020.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | #include "common.h" | 32 | #include "common.h" |
| 33 | #include <plat/gpmc.h> | 33 | #include <plat/gpmc.h> |
| 34 | #include <plat/usb.h> | 34 | #include <plat/usb.h> |
| 35 | #include <plat/serial.h> | ||
| 36 | 35 | ||
| 37 | #include <video/omapdss.h> | 36 | #include <video/omapdss.h> |
| 38 | #include <video/omap-panel-tfp410.h> | 37 | #include <video/omap-panel-tfp410.h> |
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index bea2e3a4c00f..3f3a552b1036 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | #include <linux/smsc911x.h> | 29 | #include <linux/smsc911x.h> |
| 30 | #include <linux/mmc/host.h> | 30 | #include <linux/mmc/host.h> |
| 31 | 31 | ||
| 32 | #include <mach/hardware.h> | ||
| 33 | #include <asm/mach-types.h> | 32 | #include <asm/mach-types.h> |
| 34 | #include <asm/mach/arch.h> | 33 | #include <asm/mach/arch.h> |
| 35 | #include <asm/mach/map.h> | 34 | #include <asm/mach/map.h> |
| @@ -38,8 +37,6 @@ | |||
| 38 | #include "common.h" | 37 | #include "common.h" |
| 39 | #include <plat/gpmc.h> | 38 | #include <plat/gpmc.h> |
| 40 | #include <mach/board-zoom.h> | 39 | #include <mach/board-zoom.h> |
| 41 | |||
| 42 | #include <asm/delay.h> | ||
| 43 | #include <plat/usb.h> | 40 | #include <plat/usb.h> |
| 44 | #include <plat/gpmc-smsc911x.h> | 41 | #include <plat/gpmc-smsc911x.h> |
| 45 | 42 | ||
diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c index 6e6b1755c956..d8deaea37dca 100644 --- a/arch/arm/mach-omap2/board-n8x0.c +++ b/arch/arm/mach-omap2/board-n8x0.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | #include <plat/mcspi.h> | 30 | #include <plat/mcspi.h> |
| 31 | #include <plat/onenand.h> | 31 | #include <plat/onenand.h> |
| 32 | #include <plat/mmc.h> | 32 | #include <plat/mmc.h> |
| 33 | #include <plat/serial.h> | ||
| 34 | 33 | ||
| 35 | #include "mux.h" | 34 | #include "mux.h" |
| 36 | 35 | ||
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 9d9b2abaf7d9..801bcb4c5e22 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | #include <linux/regulator/machine.h> | 33 | #include <linux/regulator/machine.h> |
| 34 | #include <linux/i2c/twl.h> | 34 | #include <linux/i2c/twl.h> |
| 35 | 35 | ||
| 36 | #include <mach/hardware.h> | ||
| 37 | #include <asm/mach-types.h> | 36 | #include <asm/mach-types.h> |
| 38 | #include <asm/mach/arch.h> | 37 | #include <asm/mach/arch.h> |
| 39 | #include <asm/mach/map.h> | 38 | #include <asm/mach/map.h> |
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index 493bd96746b9..b94873d0c6b6 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | #include <linux/mmc/host.h> | 40 | #include <linux/mmc/host.h> |
| 41 | #include <linux/export.h> | 41 | #include <linux/export.h> |
| 42 | 42 | ||
| 43 | #include <mach/hardware.h> | ||
| 44 | #include <asm/mach-types.h> | 43 | #include <asm/mach-types.h> |
| 45 | #include <asm/mach/arch.h> | 44 | #include <asm/mach/arch.h> |
| 46 | #include <asm/mach/map.h> | 45 | #include <asm/mach/map.h> |
diff --git a/arch/arm/mach-omap2/board-omap3logic.c b/arch/arm/mach-omap2/board-omap3logic.c index 8fe7f0cd9b0f..b5e56fa83c19 100644 --- a/arch/arm/mach-omap2/board-omap3logic.c +++ b/arch/arm/mach-omap2/board-omap3logic.c | |||
| @@ -30,23 +30,21 @@ | |||
| 30 | #include <linux/i2c/twl.h> | 30 | #include <linux/i2c/twl.h> |
| 31 | #include <linux/mmc/host.h> | 31 | #include <linux/mmc/host.h> |
| 32 | 32 | ||
| 33 | #include <mach/hardware.h> | ||
| 34 | #include <asm/mach-types.h> | 33 | #include <asm/mach-types.h> |
| 35 | #include <asm/mach/arch.h> | 34 | #include <asm/mach/arch.h> |
| 36 | #include <asm/mach/map.h> | 35 | #include <asm/mach/map.h> |
| 37 | 36 | ||
| 38 | #include "mux.h" | ||
| 39 | #include "hsmmc.h" | ||
| 40 | #include "control.h" | ||
| 41 | #include "common-board-devices.h" | ||
| 42 | |||
| 43 | #include <plat/mux.h> | ||
| 44 | #include "common.h" | ||
| 45 | #include <plat/gpmc-smsc911x.h> | 37 | #include <plat/gpmc-smsc911x.h> |
| 46 | #include <plat/gpmc.h> | 38 | #include <plat/gpmc.h> |
| 47 | #include <plat/sdrc.h> | 39 | #include <plat/sdrc.h> |
| 48 | #include <plat/usb.h> | 40 | #include <plat/usb.h> |
| 49 | 41 | ||
| 42 | #include "common.h" | ||
| 43 | #include "mux.h" | ||
| 44 | #include "hsmmc.h" | ||
| 45 | #include "control.h" | ||
| 46 | #include "common-board-devices.h" | ||
| 47 | |||
| 50 | #define OMAP3LOGIC_SMSC911X_CS 1 | 48 | #define OMAP3LOGIC_SMSC911X_CS 1 |
| 51 | 49 | ||
| 52 | #define OMAP3530_LV_SOM_MMC_GPIO_CD 110 | 50 | #define OMAP3530_LV_SOM_MMC_GPIO_CD 110 |
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c index 38521d43b6dd..e700a98feba6 100644 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c | |||
| @@ -41,7 +41,6 @@ | |||
| 41 | #include <asm/mach/map.h> | 41 | #include <asm/mach/map.h> |
| 42 | 42 | ||
| 43 | #include "common.h" | 43 | #include "common.h" |
| 44 | #include <mach/hardware.h> | ||
| 45 | #include <plat/mcspi.h> | 44 | #include <plat/mcspi.h> |
| 46 | #include <plat/usb.h> | 45 | #include <plat/usb.h> |
| 47 | #include <video/omapdss.h> | 46 | #include <video/omapdss.h> |
diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c index 87aa5b1d4c88..b8756f0d2a08 100644 --- a/arch/arm/mach-omap2/board-omap3stalker.c +++ b/arch/arm/mach-omap2/board-omap3stalker.c | |||
| @@ -28,8 +28,12 @@ | |||
| 28 | #include <linux/regulator/machine.h> | 28 | #include <linux/regulator/machine.h> |
| 29 | #include <linux/i2c/twl.h> | 29 | #include <linux/i2c/twl.h> |
| 30 | #include <linux/mmc/host.h> | 30 | #include <linux/mmc/host.h> |
| 31 | #include <linux/input/matrix_keypad.h> | ||
| 32 | #include <linux/spi/spi.h> | ||
| 33 | #include <linux/interrupt.h> | ||
| 34 | #include <linux/smsc911x.h> | ||
| 35 | #include <linux/i2c/at24.h> | ||
| 31 | 36 | ||
| 32 | #include <mach/hardware.h> | ||
| 33 | #include <asm/mach-types.h> | 37 | #include <asm/mach-types.h> |
| 34 | #include <asm/mach/arch.h> | 38 | #include <asm/mach/arch.h> |
| 35 | #include <asm/mach/map.h> | 39 | #include <asm/mach/map.h> |
diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c index 88dc913b6325..0e2f838e4009 100644 --- a/arch/arm/mach-omap2/board-omap3touchbook.c +++ b/arch/arm/mach-omap2/board-omap3touchbook.c | |||
| @@ -37,7 +37,6 @@ | |||
| 37 | #include <linux/regulator/machine.h> | 37 | #include <linux/regulator/machine.h> |
| 38 | #include <linux/i2c/twl.h> | 38 | #include <linux/i2c/twl.h> |
| 39 | 39 | ||
| 40 | #include <mach/hardware.h> | ||
| 41 | #include <asm/mach-types.h> | 40 | #include <asm/mach-types.h> |
| 42 | #include <asm/mach/arch.h> | 41 | #include <asm/mach/arch.h> |
| 43 | #include <asm/mach/map.h> | 42 | #include <asm/mach/map.h> |
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index cbf6fd56a9ee..45fe2d3f59b1 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | #include <linux/wl12xx.h> | 32 | #include <linux/wl12xx.h> |
| 33 | #include <linux/platform_data/omap-abe-twl6040.h> | 33 | #include <linux/platform_data/omap-abe-twl6040.h> |
| 34 | 34 | ||
| 35 | #include <mach/hardware.h> | ||
| 36 | #include <asm/hardware/gic.h> | 35 | #include <asm/hardware/gic.h> |
| 37 | #include <asm/mach-types.h> | 36 | #include <asm/mach-types.h> |
| 38 | #include <asm/mach/arch.h> | 37 | #include <asm/mach/arch.h> |
| @@ -44,6 +43,7 @@ | |||
| 44 | #include <plat/mmc.h> | 43 | #include <plat/mmc.h> |
| 45 | #include <video/omap-panel-tfp410.h> | 44 | #include <video/omap-panel-tfp410.h> |
| 46 | 45 | ||
| 46 | #include "soc.h" | ||
| 47 | #include "hsmmc.h" | 47 | #include "hsmmc.h" |
| 48 | #include "control.h" | 48 | #include "control.h" |
| 49 | #include "mux.h" | 49 | #include "mux.h" |
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c index 4754f051b91a..7a62d1322b7a 100644 --- a/arch/arm/mach-omap2/board-overo.c +++ b/arch/arm/mach-omap2/board-overo.c | |||
| @@ -47,10 +47,8 @@ | |||
| 47 | #include <video/omap-panel-generic-dpi.h> | 47 | #include <video/omap-panel-generic-dpi.h> |
| 48 | #include <video/omap-panel-tfp410.h> | 48 | #include <video/omap-panel-tfp410.h> |
| 49 | #include <plat/gpmc.h> | 49 | #include <plat/gpmc.h> |
| 50 | #include <mach/hardware.h> | ||
| 51 | #include <plat/nand.h> | 50 | #include <plat/nand.h> |
| 52 | #include <plat/mcspi.h> | 51 | #include <plat/mcspi.h> |
| 53 | #include <plat/mux.h> | ||
| 54 | #include <plat/usb.h> | 52 | #include <plat/usb.h> |
| 55 | 53 | ||
| 56 | #include "mux.h" | 54 | #include "mux.h" |
diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c index 92924ebbdae5..93b466150002 100644 --- a/arch/arm/mach-omap2/board-rx51.c +++ b/arch/arm/mach-omap2/board-rx51.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/gpio.h> | 18 | #include <linux/gpio.h> |
| 19 | #include <linux/leds.h> | 19 | #include <linux/leds.h> |
| 20 | 20 | ||
| 21 | #include <mach/hardware.h> | ||
| 22 | #include <asm/mach-types.h> | 21 | #include <asm/mach-types.h> |
| 23 | #include <asm/mach/arch.h> | 22 | #include <asm/mach/arch.h> |
| 24 | #include <asm/mach/map.h> | 23 | #include <asm/mach/map.h> |
diff --git a/arch/arm/mach-omap2/board-ti8168evm.c b/arch/arm/mach-omap2/board-ti8168evm.c index 4ca16e3752b2..c4f8833b4c3c 100644 --- a/arch/arm/mach-omap2/board-ti8168evm.c +++ b/arch/arm/mach-omap2/board-ti8168evm.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 17 | 17 | ||
| 18 | #include <mach/hardware.h> | ||
| 19 | #include <asm/mach-types.h> | 18 | #include <asm/mach-types.h> |
| 20 | #include <asm/mach/arch.h> | 19 | #include <asm/mach/arch.h> |
| 21 | #include <asm/mach/map.h> | 20 | #include <asm/mach/map.h> |
diff --git a/arch/arm/mach-omap2/board-zoom-debugboard.c b/arch/arm/mach-omap2/board-zoom-debugboard.c index f1100c2bd5cd..5ec069e529e7 100644 --- a/arch/arm/mach-omap2/board-zoom-debugboard.c +++ b/arch/arm/mach-omap2/board-zoom-debugboard.c | |||
| @@ -19,10 +19,12 @@ | |||
| 19 | 19 | ||
| 20 | #include <plat/gpmc.h> | 20 | #include <plat/gpmc.h> |
| 21 | #include <plat/gpmc-smsc911x.h> | 21 | #include <plat/gpmc-smsc911x.h> |
| 22 | #include <plat/serial.h> | ||
| 23 | 22 | ||
| 24 | #include <mach/board-zoom.h> | 23 | #include <mach/board-zoom.h> |
| 25 | 24 | ||
| 25 | #include "soc.h" | ||
| 26 | #include "common.h" | ||
| 27 | |||
| 26 | #define ZOOM_SMSC911X_CS 7 | 28 | #define ZOOM_SMSC911X_CS 7 |
| 27 | #define ZOOM_SMSC911X_GPIO 158 | 29 | #define ZOOM_SMSC911X_GPIO 158 |
| 28 | #define ZOOM_QUADUART_CS 3 | 30 | #define ZOOM_QUADUART_CS 3 |
diff --git a/arch/arm/mach-omap2/board-zoom-display.c b/arch/arm/mach-omap2/board-zoom-display.c index d64f35fd75f5..ea79bc299baf 100644 --- a/arch/arm/mach-omap2/board-zoom-display.c +++ b/arch/arm/mach-omap2/board-zoom-display.c | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | #include <video/omapdss.h> | 18 | #include <video/omapdss.h> |
| 19 | #include <mach/board-zoom.h> | 19 | #include <mach/board-zoom.h> |
| 20 | 20 | ||
| 21 | #include <plat/cpu.h> | 21 | #include "common.h" |
| 22 | 22 | ||
| 23 | #define LCD_PANEL_RESET_GPIO_PROD 96 | 23 | #define LCD_PANEL_RESET_GPIO_PROD 96 |
| 24 | #define LCD_PANEL_RESET_GPIO_PILOT 55 | 24 | #define LCD_PANEL_RESET_GPIO_PILOT 55 |
diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c index 089024c1dfbb..6bcc107b9fc3 100644 --- a/arch/arm/mach-omap2/board-zoom-peripherals.c +++ b/arch/arm/mach-omap2/board-zoom-peripherals.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | 27 | ||
| 28 | #include "common.h" | 28 | #include "common.h" |
| 29 | #include <plat/usb.h> | 29 | #include <plat/usb.h> |
| 30 | #include <plat/serial.h> | ||
| 31 | 30 | ||
| 32 | #include <mach/board-zoom.h> | 31 | #include <mach/board-zoom.h> |
| 33 | 32 | ||
diff --git a/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c b/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c index 3d9d746b221a..cabcfdba5246 100644 --- a/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c +++ b/arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | |||
| @@ -33,11 +33,11 @@ | |||
| 33 | #include <linux/cpufreq.h> | 33 | #include <linux/cpufreq.h> |
| 34 | #include <linux/slab.h> | 34 | #include <linux/slab.h> |
| 35 | 35 | ||
| 36 | #include <plat/cpu.h> | ||
| 37 | #include <plat/clock.h> | 36 | #include <plat/clock.h> |
| 38 | #include <plat/sram.h> | 37 | #include <plat/sram.h> |
| 39 | #include <plat/sdrc.h> | 38 | #include <plat/sdrc.h> |
| 40 | 39 | ||
| 40 | #include "soc.h" | ||
| 41 | #include "clock.h" | 41 | #include "clock.h" |
| 42 | #include "clock2xxx.h" | 42 | #include "clock2xxx.h" |
| 43 | #include "opp2xxx.h" | 43 | #include "opp2xxx.h" |
diff --git a/arch/arm/mach-omap2/clkt_dpll.c b/arch/arm/mach-omap2/clkt_dpll.c index cd7fd0f91149..ae624c3b832a 100644 --- a/arch/arm/mach-omap2/clkt_dpll.c +++ b/arch/arm/mach-omap2/clkt_dpll.c | |||
| @@ -22,8 +22,8 @@ | |||
| 22 | #include <asm/div64.h> | 22 | #include <asm/div64.h> |
| 23 | 23 | ||
| 24 | #include <plat/clock.h> | 24 | #include <plat/clock.h> |
| 25 | #include <plat/cpu.h> | ||
| 26 | 25 | ||
| 26 | #include "soc.h" | ||
| 27 | #include "clock.h" | 27 | #include "clock.h" |
| 28 | #include "cm-regbits-24xx.h" | 28 | #include "cm-regbits-24xx.h" |
| 29 | #include "cm-regbits-34xx.h" | 29 | #include "cm-regbits-34xx.h" |
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c index ea3f565ba1a4..1a1f97f3ca69 100644 --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock.c | |||
| @@ -22,14 +22,16 @@ | |||
| 22 | #include <linux/clk.h> | 22 | #include <linux/clk.h> |
| 23 | #include <linux/io.h> | 23 | #include <linux/io.h> |
| 24 | #include <linux/bitops.h> | 24 | #include <linux/bitops.h> |
| 25 | #include <trace/events/power.h> | ||
| 26 | 25 | ||
| 27 | #include <asm/cpu.h> | 26 | #include <asm/cpu.h> |
| 27 | |||
| 28 | #include <plat/clock.h> | 28 | #include <plat/clock.h> |
| 29 | #include "clockdomain.h" | ||
| 30 | #include <plat/cpu.h> | ||
| 31 | #include <plat/prcm.h> | 29 | #include <plat/prcm.h> |
| 32 | 30 | ||
| 31 | #include <trace/events/power.h> | ||
| 32 | |||
| 33 | #include "soc.h" | ||
| 34 | #include "clockdomain.h" | ||
| 33 | #include "clock.h" | 35 | #include "clock.h" |
| 34 | #include "cm2xxx_3xxx.h" | 36 | #include "cm2xxx_3xxx.h" |
| 35 | #include "cm-regbits-24xx.h" | 37 | #include "cm-regbits-24xx.h" |
diff --git a/arch/arm/mach-omap2/clock2420_data.c b/arch/arm/mach-omap2/clock2420_data.c index 002745181ad6..12c178dbc9f5 100644 --- a/arch/arm/mach-omap2/clock2420_data.c +++ b/arch/arm/mach-omap2/clock2420_data.c | |||
| @@ -18,9 +18,9 @@ | |||
| 18 | #include <linux/clk.h> | 18 | #include <linux/clk.h> |
| 19 | #include <linux/list.h> | 19 | #include <linux/list.h> |
| 20 | 20 | ||
| 21 | #include <plat/hardware.h> | ||
| 22 | #include <plat/clkdev_omap.h> | 21 | #include <plat/clkdev_omap.h> |
| 23 | 22 | ||
| 23 | #include "soc.h" | ||
| 24 | #include "iomap.h" | 24 | #include "iomap.h" |
| 25 | #include "clock.h" | 25 | #include "clock.h" |
| 26 | #include "clock2xxx.h" | 26 | #include "clock2xxx.h" |
diff --git a/arch/arm/mach-omap2/clock2430.c b/arch/arm/mach-omap2/clock2430.c index dfda9a3f2cb2..a8e326177466 100644 --- a/arch/arm/mach-omap2/clock2430.c +++ b/arch/arm/mach-omap2/clock2430.c | |||
| @@ -21,9 +21,9 @@ | |||
| 21 | #include <linux/clk.h> | 21 | #include <linux/clk.h> |
| 22 | #include <linux/io.h> | 22 | #include <linux/io.h> |
| 23 | 23 | ||
| 24 | #include <plat/hardware.h> | ||
| 25 | #include <plat/clock.h> | 24 | #include <plat/clock.h> |
| 26 | 25 | ||
| 26 | #include "soc.h" | ||
| 27 | #include "iomap.h" | 27 | #include "iomap.h" |
| 28 | #include "clock.h" | 28 | #include "clock.h" |
| 29 | #include "clock2xxx.h" | 29 | #include "clock2xxx.h" |
diff --git a/arch/arm/mach-omap2/clock2430_data.c b/arch/arm/mach-omap2/clock2430_data.c index cacabb070e22..02fe1f28affc 100644 --- a/arch/arm/mach-omap2/clock2430_data.c +++ b/arch/arm/mach-omap2/clock2430_data.c | |||
| @@ -17,9 +17,9 @@ | |||
| 17 | #include <linux/clk.h> | 17 | #include <linux/clk.h> |
| 18 | #include <linux/list.h> | 18 | #include <linux/list.h> |
| 19 | 19 | ||
| 20 | #include <plat/hardware.h> | ||
| 21 | #include <plat/clkdev_omap.h> | 20 | #include <plat/clkdev_omap.h> |
| 22 | 21 | ||
| 22 | #include "soc.h" | ||
| 23 | #include "iomap.h" | 23 | #include "iomap.h" |
| 24 | #include "clock.h" | 24 | #include "clock.h" |
| 25 | #include "clock2xxx.h" | 25 | #include "clock2xxx.h" |
diff --git a/arch/arm/mach-omap2/clock2xxx.c b/arch/arm/mach-omap2/clock2xxx.c index 12500097378d..e92be1fc1a00 100644 --- a/arch/arm/mach-omap2/clock2xxx.c +++ b/arch/arm/mach-omap2/clock2xxx.c | |||
| @@ -22,9 +22,9 @@ | |||
| 22 | #include <linux/clk.h> | 22 | #include <linux/clk.h> |
| 23 | #include <linux/io.h> | 23 | #include <linux/io.h> |
| 24 | 24 | ||
| 25 | #include <plat/cpu.h> | ||
| 26 | #include <plat/clock.h> | 25 | #include <plat/clock.h> |
| 27 | 26 | ||
| 27 | #include "soc.h" | ||
| 28 | #include "clock.h" | 28 | #include "clock.h" |
| 29 | #include "clock2xxx.h" | 29 | #include "clock2xxx.h" |
| 30 | #include "cm.h" | 30 | #include "cm.h" |
diff --git a/arch/arm/mach-omap2/clock3xxx.c b/arch/arm/mach-omap2/clock3xxx.c index 794d82702c85..fc2765bcdd40 100644 --- a/arch/arm/mach-omap2/clock3xxx.c +++ b/arch/arm/mach-omap2/clock3xxx.c | |||
| @@ -21,9 +21,9 @@ | |||
| 21 | #include <linux/clk.h> | 21 | #include <linux/clk.h> |
| 22 | #include <linux/io.h> | 22 | #include <linux/io.h> |
| 23 | 23 | ||
| 24 | #include <plat/hardware.h> | ||
| 25 | #include <plat/clock.h> | 24 | #include <plat/clock.h> |
| 26 | 25 | ||
| 26 | #include "soc.h" | ||
| 27 | #include "clock.h" | 27 | #include "clock.h" |
| 28 | #include "clock3xxx.h" | 28 | #include "clock3xxx.h" |
| 29 | #include "prm2xxx_3xxx.h" | 29 | #include "prm2xxx_3xxx.h" |
diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c index 83bed9ad3017..10a2398e1736 100644 --- a/arch/arm/mach-omap2/clock3xxx_data.c +++ b/arch/arm/mach-omap2/clock3xxx_data.c | |||
| @@ -21,9 +21,9 @@ | |||
| 21 | #include <linux/list.h> | 21 | #include <linux/list.h> |
| 22 | #include <linux/io.h> | 22 | #include <linux/io.h> |
| 23 | 23 | ||
| 24 | #include <plat/hardware.h> | ||
| 25 | #include <plat/clkdev_omap.h> | 24 | #include <plat/clkdev_omap.h> |
| 26 | 25 | ||
| 26 | #include "soc.h" | ||
| 27 | #include "iomap.h" | 27 | #include "iomap.h" |
| 28 | #include "clock.h" | 28 | #include "clock.h" |
| 29 | #include "clock3xxx.h" | 29 | #include "clock3xxx.h" |
diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c index d7f55e43b761..500682c051c1 100644 --- a/arch/arm/mach-omap2/clock44xx_data.c +++ b/arch/arm/mach-omap2/clock44xx_data.c | |||
| @@ -28,9 +28,9 @@ | |||
| 28 | #include <linux/clk.h> | 28 | #include <linux/clk.h> |
| 29 | #include <linux/io.h> | 29 | #include <linux/io.h> |
| 30 | 30 | ||
| 31 | #include <plat/hardware.h> | ||
| 32 | #include <plat/clkdev_omap.h> | 31 | #include <plat/clkdev_omap.h> |
| 33 | 32 | ||
| 33 | #include "soc.h" | ||
| 34 | #include "iomap.h" | 34 | #include "iomap.h" |
| 35 | #include "clock.h" | 35 | #include "clock.h" |
| 36 | #include "clock44xx.h" | 36 | #include "clock44xx.h" |
diff --git a/arch/arm/mach-omap2/cm2xxx_3xxx.c b/arch/arm/mach-omap2/cm2xxx_3xxx.c index 389f9f8b570c..a911e76b4ecf 100644 --- a/arch/arm/mach-omap2/cm2xxx_3xxx.c +++ b/arch/arm/mach-omap2/cm2xxx_3xxx.c | |||
| @@ -18,8 +18,7 @@ | |||
| 18 | #include <linux/err.h> | 18 | #include <linux/err.h> |
| 19 | #include <linux/io.h> | 19 | #include <linux/io.h> |
| 20 | 20 | ||
| 21 | #include <plat/hardware.h> | 21 | #include "soc.h" |
| 22 | |||
| 23 | #include "iomap.h" | 22 | #include "iomap.h" |
| 24 | #include "common.h" | 23 | #include "common.h" |
| 25 | #include "cm.h" | 24 | #include "cm.h" |
diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c index 6c2ff4f23800..8e43c4d885d5 100644 --- a/arch/arm/mach-omap2/common.c +++ b/arch/arm/mach-omap2/common.c | |||
| @@ -17,10 +17,10 @@ | |||
| 17 | #include <linux/clk.h> | 17 | #include <linux/clk.h> |
| 18 | #include <linux/io.h> | 18 | #include <linux/io.h> |
| 19 | 19 | ||
| 20 | #include <plat/hardware.h> | ||
| 21 | #include <plat/mux.h> | 20 | #include <plat/mux.h> |
| 22 | #include <plat/clock.h> | 21 | #include <plat/clock.h> |
| 23 | 22 | ||
| 23 | #include "soc.h" | ||
| 24 | #include "iomap.h" | 24 | #include "iomap.h" |
| 25 | #include "common.h" | 25 | #include "common.h" |
| 26 | #include "sdrc.h" | 26 | #include "sdrc.h" |
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index 4cdb08c8ab52..da0f5c187353 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h | |||
| @@ -29,9 +29,13 @@ | |||
| 29 | #include <linux/irq.h> | 29 | #include <linux/irq.h> |
| 30 | #include <linux/delay.h> | 30 | #include <linux/delay.h> |
| 31 | #include <linux/i2c/twl.h> | 31 | #include <linux/i2c/twl.h> |
| 32 | #include <plat/common.h> | 32 | |
| 33 | #include <asm/proc-fns.h> | 33 | #include <asm/proc-fns.h> |
| 34 | 34 | ||
| 35 | #include <plat/cpu.h> | ||
| 36 | #include <plat/serial.h> | ||
| 37 | #include <plat/common.h> | ||
| 38 | |||
| 35 | #define OMAP_INTC_START NR_IRQS | 39 | #define OMAP_INTC_START NR_IRQS |
| 36 | 40 | ||
| 37 | #ifdef CONFIG_SOC_OMAP2420 | 41 | #ifdef CONFIG_SOC_OMAP2420 |
diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c index 3223b81e7532..d1ff8399a222 100644 --- a/arch/arm/mach-omap2/control.c +++ b/arch/arm/mach-omap2/control.c | |||
| @@ -15,9 +15,9 @@ | |||
| 15 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 16 | #include <linux/io.h> | 16 | #include <linux/io.h> |
| 17 | 17 | ||
| 18 | #include <plat/hardware.h> | ||
| 19 | #include <plat/sdrc.h> | 18 | #include <plat/sdrc.h> |
| 20 | 19 | ||
| 20 | #include "soc.h" | ||
| 21 | #include "iomap.h" | 21 | #include "iomap.h" |
| 22 | #include "common.h" | 22 | #include "common.h" |
| 23 | #include "cm-regbits-34xx.h" | 23 | #include "cm-regbits-34xx.h" |
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 626e98e538c5..1efa984b1a47 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/of.h> | 19 | #include <linux/of.h> |
| 20 | #include <linux/platform_data/omap4-keypad.h> | 20 | #include <linux/platform_data/omap4-keypad.h> |
| 21 | 21 | ||
| 22 | #include <mach/hardware.h> | ||
| 23 | #include <asm/mach-types.h> | 22 | #include <asm/mach-types.h> |
| 24 | #include <asm/mach/map.h> | 23 | #include <asm/mach/map.h> |
| 25 | #include <asm/pmu.h> | 24 | #include <asm/pmu.h> |
diff --git a/arch/arm/mach-omap2/dpll3xxx.c b/arch/arm/mach-omap2/dpll3xxx.c index b9c8d2f6a81f..d8318dc5ee91 100644 --- a/arch/arm/mach-omap2/dpll3xxx.c +++ b/arch/arm/mach-omap2/dpll3xxx.c | |||
| @@ -28,9 +28,9 @@ | |||
| 28 | #include <linux/bitops.h> | 28 | #include <linux/bitops.h> |
| 29 | #include <linux/clkdev.h> | 29 | #include <linux/clkdev.h> |
| 30 | 30 | ||
| 31 | #include <plat/cpu.h> | ||
| 32 | #include <plat/clock.h> | 31 | #include <plat/clock.h> |
| 33 | 32 | ||
| 33 | #include "soc.h" | ||
| 34 | #include "clock.h" | 34 | #include "clock.h" |
| 35 | #include "cm2xxx_3xxx.h" | 35 | #include "cm2xxx_3xxx.h" |
| 36 | #include "cm-regbits-34xx.h" | 36 | #include "cm-regbits-34xx.h" |
diff --git a/arch/arm/mach-omap2/dpll44xx.c b/arch/arm/mach-omap2/dpll44xx.c index 9c6a296b3dc3..09d0ccccb861 100644 --- a/arch/arm/mach-omap2/dpll44xx.c +++ b/arch/arm/mach-omap2/dpll44xx.c | |||
| @@ -15,9 +15,9 @@ | |||
| 15 | #include <linux/io.h> | 15 | #include <linux/io.h> |
| 16 | #include <linux/bitops.h> | 16 | #include <linux/bitops.h> |
| 17 | 17 | ||
| 18 | #include <plat/cpu.h> | ||
| 19 | #include <plat/clock.h> | 18 | #include <plat/clock.h> |
| 20 | 19 | ||
| 20 | #include "soc.h" | ||
| 21 | #include "clock.h" | 21 | #include "clock.h" |
| 22 | #include "clock44xx.h" | 22 | #include "clock44xx.h" |
| 23 | #include "cm-regbits-44xx.h" | 23 | #include "cm-regbits-44xx.h" |
diff --git a/arch/arm/mach-omap2/emu.c b/arch/arm/mach-omap2/emu.c index e28e761b7ab9..b3566f68a559 100644 --- a/arch/arm/mach-omap2/emu.c +++ b/arch/arm/mach-omap2/emu.c | |||
| @@ -21,8 +21,7 @@ | |||
| 21 | #include <linux/clk.h> | 21 | #include <linux/clk.h> |
| 22 | #include <linux/err.h> | 22 | #include <linux/err.h> |
| 23 | 23 | ||
| 24 | #include <mach/hardware.h> | 24 | #include "soc.h" |
| 25 | |||
| 26 | #include "iomap.h" | 25 | #include "iomap.h" |
| 27 | 26 | ||
| 28 | MODULE_LICENSE("GPL"); | 27 | MODULE_LICENSE("GPL"); |
diff --git a/arch/arm/mach-omap2/gpmc-nand.c b/arch/arm/mach-omap2/gpmc-nand.c index 96fcc641aab7..9e9f47ad6187 100644 --- a/arch/arm/mach-omap2/gpmc-nand.c +++ b/arch/arm/mach-omap2/gpmc-nand.c | |||
| @@ -16,10 +16,11 @@ | |||
| 16 | 16 | ||
| 17 | #include <asm/mach/flash.h> | 17 | #include <asm/mach/flash.h> |
| 18 | 18 | ||
| 19 | #include <plat/cpu.h> | ||
| 20 | #include <plat/nand.h> | 19 | #include <plat/nand.h> |
| 21 | #include <plat/gpmc.h> | 20 | #include <plat/gpmc.h> |
| 22 | 21 | ||
| 22 | #include "soc.h" | ||
| 23 | |||
| 23 | static struct resource gpmc_nand_resource[] = { | 24 | static struct resource gpmc_nand_resource[] = { |
| 24 | { | 25 | { |
| 25 | .flags = IORESOURCE_MEM, | 26 | .flags = IORESOURCE_MEM, |
diff --git a/arch/arm/mach-omap2/gpmc-onenand.c b/arch/arm/mach-omap2/gpmc-onenand.c index b12a39e223fc..b66fb8e5faaa 100644 --- a/arch/arm/mach-omap2/gpmc-onenand.c +++ b/arch/arm/mach-omap2/gpmc-onenand.c | |||
| @@ -18,10 +18,11 @@ | |||
| 18 | 18 | ||
| 19 | #include <asm/mach/flash.h> | 19 | #include <asm/mach/flash.h> |
| 20 | 20 | ||
| 21 | #include <plat/cpu.h> | ||
| 22 | #include <plat/onenand.h> | 21 | #include <plat/onenand.h> |
| 23 | #include <plat/gpmc.h> | 22 | #include <plat/gpmc.h> |
| 24 | 23 | ||
| 24 | #include "soc.h" | ||
| 25 | |||
| 25 | #define ONENAND_IO_SIZE SZ_128K | 26 | #define ONENAND_IO_SIZE SZ_128K |
| 26 | 27 | ||
| 27 | static struct omap_onenand_platform_data *gpmc_onenand_data; | 28 | static struct omap_onenand_platform_data *gpmc_onenand_data; |
diff --git a/arch/arm/mach-omap2/gpmc-smc91x.c b/arch/arm/mach-omap2/gpmc-smc91x.c index e8ff2da1be51..245839dfc722 100644 --- a/arch/arm/mach-omap2/gpmc-smc91x.c +++ b/arch/arm/mach-omap2/gpmc-smc91x.c | |||
| @@ -17,10 +17,11 @@ | |||
| 17 | #include <linux/io.h> | 17 | #include <linux/io.h> |
| 18 | #include <linux/smc91x.h> | 18 | #include <linux/smc91x.h> |
| 19 | 19 | ||
| 20 | #include <plat/cpu.h> | ||
| 21 | #include <plat/gpmc.h> | 20 | #include <plat/gpmc.h> |
| 22 | #include <plat/gpmc-smc91x.h> | 21 | #include <plat/gpmc-smc91x.h> |
| 23 | 22 | ||
| 23 | #include "soc.h" | ||
| 24 | |||
| 24 | static struct omap_smc91x_platform_data *gpmc_cfg; | 25 | static struct omap_smc91x_platform_data *gpmc_cfg; |
| 25 | 26 | ||
| 26 | static struct resource gpmc_smc91x_resources[] = { | 27 | static struct resource gpmc_smc91x_resources[] = { |
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 68eead8d7bcd..055ae8bd943f 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c | |||
| @@ -29,10 +29,10 @@ | |||
| 29 | #include <plat/gpmc.h> | 29 | #include <plat/gpmc.h> |
| 30 | 30 | ||
| 31 | #include <plat/cpu.h> | 31 | #include <plat/cpu.h> |
| 32 | #include <plat/gpmc.h> | ||
| 32 | #include <plat/sdrc.h> | 33 | #include <plat/sdrc.h> |
| 33 | 34 | ||
| 34 | #include <mach/hardware.h> | 35 | #include "soc.h" |
| 35 | |||
| 36 | #include "common.h" | 36 | #include "common.h" |
| 37 | 37 | ||
| 38 | /* GPMC register offsets */ | 38 | /* GPMC register offsets */ |
diff --git a/arch/arm/mach-omap2/i2c.c b/arch/arm/mach-omap2/i2c.c index a12e224eb97d..fc57e67b321f 100644 --- a/arch/arm/mach-omap2/i2c.c +++ b/arch/arm/mach-omap2/i2c.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <plat/cpu.h> | ||
| 23 | #include <plat/i2c.h> | 22 | #include <plat/i2c.h> |
| 24 | #include "common.h" | 23 | #include "common.h" |
| 25 | #include <plat/omap_hwmod.h> | 24 | #include <plat/omap_hwmod.h> |
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 40373db649aa..7219df0e831a 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c | |||
| @@ -22,10 +22,10 @@ | |||
| 22 | #include <asm/cputype.h> | 22 | #include <asm/cputype.h> |
| 23 | 23 | ||
| 24 | #include "common.h" | 24 | #include "common.h" |
| 25 | #include <plat/cpu.h> | ||
| 26 | 25 | ||
| 27 | #include <mach/id.h> | 26 | #include <mach/id.h> |
| 28 | 27 | ||
| 28 | #include "soc.h" | ||
| 29 | #include "control.h" | 29 | #include "control.h" |
| 30 | 30 | ||
| 31 | static unsigned int omap_revision; | 31 | static unsigned int omap_revision; |
diff --git a/arch/arm/mach-omap2/include/mach/hardware.h b/arch/arm/mach-omap2/include/mach/hardware.h index 78edf9d33f71..54492dbf6973 100644 --- a/arch/arm/mach-omap2/include/mach/hardware.h +++ b/arch/arm/mach-omap2/include/mach/hardware.h | |||
| @@ -1,5 +1,3 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * arch/arm/mach-omap2/include/mach/hardware.h | 2 | * arch/arm/mach-omap2/include/mach/hardware.h |
| 3 | */ | 3 | */ |
| 4 | |||
| 5 | #include <plat/hardware.h> | ||
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index ff6fc5b2add5..0d79c23e9f88 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c | |||
| @@ -33,8 +33,7 @@ | |||
| 33 | #include <plat/multi.h> | 33 | #include <plat/multi.h> |
| 34 | #include <plat/dma.h> | 34 | #include <plat/dma.h> |
| 35 | 35 | ||
| 36 | #include <mach/hardware.h> | 36 | #include "soc.h" |
| 37 | |||
| 38 | #include "iomap.h" | 37 | #include "iomap.h" |
| 39 | #include "voltage.h" | 38 | #include "voltage.h" |
| 40 | #include "powerdomain.h" | 39 | #include "powerdomain.h" |
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c index ac59f96a489f..efed4f540adb 100644 --- a/arch/arm/mach-omap2/irq.c +++ b/arch/arm/mach-omap2/irq.c | |||
| @@ -23,8 +23,7 @@ | |||
| 23 | #include <linux/of_address.h> | 23 | #include <linux/of_address.h> |
| 24 | #include <linux/of_irq.h> | 24 | #include <linux/of_irq.h> |
| 25 | 25 | ||
| 26 | #include <mach/hardware.h> | 26 | #include "soc.h" |
| 27 | |||
| 28 | #include "iomap.h" | 27 | #include "iomap.h" |
| 29 | #include "common.h" | 28 | #include "common.h" |
| 30 | 29 | ||
diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c index e032a7315305..0d974565f8ca 100644 --- a/arch/arm/mach-omap2/mailbox.c +++ b/arch/arm/mach-omap2/mailbox.c | |||
| @@ -17,9 +17,10 @@ | |||
| 17 | #include <linux/io.h> | 17 | #include <linux/io.h> |
| 18 | #include <linux/pm_runtime.h> | 18 | #include <linux/pm_runtime.h> |
| 19 | 19 | ||
| 20 | #include <plat/cpu.h> | ||
| 21 | #include <plat/mailbox.h> | 20 | #include <plat/mailbox.h> |
| 22 | 21 | ||
| 22 | #include "soc.h" | ||
| 23 | |||
| 23 | #define MAILBOX_REVISION 0x000 | 24 | #define MAILBOX_REVISION 0x000 |
| 24 | #define MAILBOX_MESSAGE(m) (0x040 + 4 * (m)) | 25 | #define MAILBOX_MESSAGE(m) (0x040 + 4 * (m)) |
| 25 | #define MAILBOX_FIFOSTATUS(m) (0x080 + 4 * (m)) | 26 | #define MAILBOX_FIFOSTATUS(m) (0x080 + 4 * (m)) |
diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c index 219a6e800bad..d493727632e9 100644 --- a/arch/arm/mach-omap2/mcbsp.c +++ b/arch/arm/mach-omap2/mcbsp.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/slab.h> | 19 | #include <linux/slab.h> |
| 20 | 20 | ||
| 21 | #include <plat/dma.h> | 21 | #include <plat/dma.h> |
| 22 | #include <plat/cpu.h> | ||
| 23 | #include <plat/mcbsp.h> | 22 | #include <plat/mcbsp.h> |
| 24 | #include <plat/omap_device.h> | 23 | #include <plat/omap_device.h> |
| 25 | #include <linux/pm_runtime.h> | 24 | #include <linux/pm_runtime.h> |
diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c index 9a35adf91232..19cc5f504f7e 100644 --- a/arch/arm/mach-omap2/omap-smp.c +++ b/arch/arm/mach-omap2/omap-smp.c | |||
| @@ -24,11 +24,11 @@ | |||
| 24 | #include <asm/hardware/gic.h> | 24 | #include <asm/hardware/gic.h> |
| 25 | #include <asm/smp_scu.h> | 25 | #include <asm/smp_scu.h> |
| 26 | 26 | ||
| 27 | #include <mach/hardware.h> | ||
| 28 | #include <mach/omap-secure.h> | 27 | #include <mach/omap-secure.h> |
| 29 | #include <mach/omap-wakeupgen.h> | 28 | #include <mach/omap-wakeupgen.h> |
| 30 | #include <asm/cputype.h> | 29 | #include <asm/cputype.h> |
| 31 | 30 | ||
| 31 | #include "soc.h" | ||
| 32 | #include "iomap.h" | 32 | #include "iomap.h" |
| 33 | #include "common.h" | 33 | #include "common.h" |
| 34 | #include "clockdomain.h" | 34 | #include "clockdomain.h" |
diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c index 95ee7dd64297..b54427dec2a3 100644 --- a/arch/arm/mach-omap2/omap-wakeupgen.c +++ b/arch/arm/mach-omap2/omap-wakeupgen.c | |||
| @@ -27,10 +27,10 @@ | |||
| 27 | 27 | ||
| 28 | #include <asm/hardware/gic.h> | 28 | #include <asm/hardware/gic.h> |
| 29 | 29 | ||
| 30 | #include <mach/hardware.h> | ||
| 31 | #include <mach/omap-wakeupgen.h> | 30 | #include <mach/omap-wakeupgen.h> |
| 32 | #include <mach/omap-secure.h> | 31 | #include <mach/omap-secure.h> |
| 33 | 32 | ||
| 33 | #include "soc.h" | ||
| 34 | #include "omap4-sar-layout.h" | 34 | #include "omap4-sar-layout.h" |
| 35 | #include "common.h" | 35 | #include "common.h" |
| 36 | 36 | ||
diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c index c886325c2f48..73c1440a8253 100644 --- a/arch/arm/mach-omap2/omap4-common.c +++ b/arch/arm/mach-omap2/omap4-common.c | |||
| @@ -29,9 +29,9 @@ | |||
| 29 | #include <plat/omap-secure.h> | 29 | #include <plat/omap-secure.h> |
| 30 | #include <plat/mmc.h> | 30 | #include <plat/mmc.h> |
| 31 | 31 | ||
| 32 | #include <mach/hardware.h> | ||
| 33 | #include <mach/omap-wakeupgen.h> | 32 | #include <mach/omap-wakeupgen.h> |
| 34 | 33 | ||
| 34 | #include "soc.h" | ||
| 35 | #include "common.h" | 35 | #include "common.h" |
| 36 | #include "hsmmc.h" | 36 | #include "hsmmc.h" |
| 37 | #include "omap4-sar-layout.h" | 37 | #include "omap4-sar-layout.h" |
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 6ca8e519968d..9db1684df697 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c | |||
| @@ -139,14 +139,14 @@ | |||
| 139 | #include <linux/slab.h> | 139 | #include <linux/slab.h> |
| 140 | #include <linux/bootmem.h> | 140 | #include <linux/bootmem.h> |
| 141 | 141 | ||
| 142 | #include "common.h" | ||
| 143 | #include <plat/cpu.h> | ||
| 144 | #include "clockdomain.h" | ||
| 145 | #include "powerdomain.h" | ||
| 146 | #include <plat/clock.h> | 142 | #include <plat/clock.h> |
| 147 | #include <plat/omap_hwmod.h> | 143 | #include <plat/omap_hwmod.h> |
| 148 | #include <plat/prcm.h> | 144 | #include <plat/prcm.h> |
| 149 | 145 | ||
| 146 | #include "soc.h" | ||
| 147 | #include "common.h" | ||
| 148 | #include "clockdomain.h" | ||
| 149 | #include "powerdomain.h" | ||
| 150 | #include "cm2xxx_3xxx.h" | 150 | #include "cm2xxx_3xxx.h" |
| 151 | #include "cminst44xx.h" | 151 | #include "cminst44xx.h" |
| 152 | #include "prm2xxx_3xxx.h" | 152 | #include "prm2xxx_3xxx.h" |
diff --git a/arch/arm/mach-omap2/omap_hwmod_2420_data.c b/arch/arm/mach-omap2/omap_hwmod_2420_data.c index 1645d3f73207..4e81637640e9 100644 --- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * XXX these should be marked initdata for multi-OMAP kernels | 13 | * XXX these should be marked initdata for multi-OMAP kernels |
| 14 | */ | 14 | */ |
| 15 | #include <plat/omap_hwmod.h> | 15 | #include <plat/omap_hwmod.h> |
| 16 | #include <plat/cpu.h> | ||
| 17 | #include <plat/dma.h> | 16 | #include <plat/dma.h> |
| 18 | #include <plat/serial.h> | 17 | #include <plat/serial.h> |
| 19 | #include <plat/i2c.h> | 18 | #include <plat/i2c.h> |
diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c index 23582fcb97ff..ceb23c3fa89d 100644 --- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * XXX these should be marked initdata for multi-OMAP kernels | 13 | * XXX these should be marked initdata for multi-OMAP kernels |
| 14 | */ | 14 | */ |
| 15 | #include <plat/omap_hwmod.h> | 15 | #include <plat/omap_hwmod.h> |
| 16 | #include <plat/cpu.h> | ||
| 17 | #include <plat/dma.h> | 16 | #include <plat/dma.h> |
| 18 | #include <plat/serial.h> | 17 | #include <plat/serial.h> |
| 19 | #include <plat/i2c.h> | 18 | #include <plat/i2c.h> |
| @@ -23,10 +22,8 @@ | |||
| 23 | #include <plat/mmc.h> | 22 | #include <plat/mmc.h> |
| 24 | #include <plat/l3_2xxx.h> | 23 | #include <plat/l3_2xxx.h> |
| 25 | 24 | ||
| 26 | #include <plat/hardware.h> | 25 | #include "soc.h" |
| 27 | |||
| 28 | #include "omap_hwmod_common_data.h" | 26 | #include "omap_hwmod_common_data.h" |
| 29 | |||
| 30 | #include "prm-regbits-24xx.h" | 27 | #include "prm-regbits-24xx.h" |
| 31 | #include "cm-regbits-24xx.h" | 28 | #include "cm-regbits-24xx.h" |
| 32 | #include "wd_timer.h" | 29 | #include "wd_timer.h" |
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index 9605e5fd6c9c..75fbbac13921 100644 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/platform_data/gpio-omap.h> | 18 | #include <linux/platform_data/gpio-omap.h> |
| 19 | 19 | ||
| 20 | #include <plat/omap_hwmod.h> | 20 | #include <plat/omap_hwmod.h> |
| 21 | #include <plat/cpu.h> | ||
| 22 | #include <plat/dma.h> | 21 | #include <plat/dma.h> |
| 23 | #include <plat/serial.h> | 22 | #include <plat/serial.h> |
| 24 | #include <plat/l3_3xxx.h> | 23 | #include <plat/l3_3xxx.h> |
| @@ -29,9 +28,9 @@ | |||
| 29 | #include <plat/mcspi.h> | 28 | #include <plat/mcspi.h> |
| 30 | #include <plat/dmtimer.h> | 29 | #include <plat/dmtimer.h> |
| 31 | 30 | ||
| 32 | #include <mach/hardware.h> | ||
| 33 | #include <mach/am35xx.h> | 31 | #include <mach/am35xx.h> |
| 34 | 32 | ||
| 33 | #include "soc.h" | ||
| 35 | #include "omap_hwmod_common_data.h" | 34 | #include "omap_hwmod_common_data.h" |
| 36 | #include "prm-regbits-34xx.h" | 35 | #include "prm-regbits-34xx.h" |
| 37 | #include "cm-regbits-34xx.h" | 36 | #include "cm-regbits-34xx.h" |
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index fe987f80c715..b95244b76a15 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include <linux/power/smartreflex.h> | 23 | #include <linux/power/smartreflex.h> |
| 24 | 24 | ||
| 25 | #include <plat/omap_hwmod.h> | 25 | #include <plat/omap_hwmod.h> |
| 26 | #include <plat/cpu.h> | ||
| 27 | #include <plat/i2c.h> | 26 | #include <plat/i2c.h> |
| 28 | #include <plat/dma.h> | 27 | #include <plat/dma.h> |
| 29 | #include <plat/mcspi.h> | 28 | #include <plat/mcspi.h> |
diff --git a/arch/arm/mach-omap2/omap_l3_noc.c b/arch/arm/mach-omap2/omap_l3_noc.c index f0992fdefe3f..f447e02102bb 100644 --- a/arch/arm/mach-omap2/omap_l3_noc.c +++ b/arch/arm/mach-omap2/omap_l3_noc.c | |||
| @@ -28,8 +28,7 @@ | |||
| 28 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 29 | #include <linux/slab.h> | 29 | #include <linux/slab.h> |
| 30 | 30 | ||
| 31 | #include <plat/hardware.h> | 31 | #include "soc.h" |
| 32 | |||
| 33 | #include "omap_l3_noc.h" | 32 | #include "omap_l3_noc.h" |
| 34 | 33 | ||
| 35 | /* | 34 | /* |
diff --git a/arch/arm/mach-omap2/omap_phy_internal.c b/arch/arm/mach-omap2/omap_phy_internal.c index d0b4dc759fc8..593eaea35cec 100644 --- a/arch/arm/mach-omap2/omap_phy_internal.c +++ b/arch/arm/mach-omap2/omap_phy_internal.c | |||
| @@ -28,9 +28,9 @@ | |||
| 28 | #include <linux/err.h> | 28 | #include <linux/err.h> |
| 29 | #include <linux/usb.h> | 29 | #include <linux/usb.h> |
| 30 | 30 | ||
| 31 | #include <plat/hardware.h> | ||
| 32 | #include <plat/usb.h> | 31 | #include <plat/usb.h> |
| 33 | 32 | ||
| 33 | #include "soc.h" | ||
| 34 | #include "control.h" | 34 | #include "control.h" |
| 35 | 35 | ||
| 36 | /* OMAP control module register for UTMI PHY */ | 36 | /* OMAP control module register for UTMI PHY */ |
diff --git a/arch/arm/mach-omap2/opp2420_data.c b/arch/arm/mach-omap2/opp2420_data.c index 5037e76e4e23..a9e8cf21705d 100644 --- a/arch/arm/mach-omap2/opp2420_data.c +++ b/arch/arm/mach-omap2/opp2420_data.c | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | * http://repository.maemo.org/pool/diablo/free/k/kernel-source-diablo/ | 28 | * http://repository.maemo.org/pool/diablo/free/k/kernel-source-diablo/ |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <plat/hardware.h> | 31 | #include <linux/kernel.h> |
| 32 | 32 | ||
| 33 | #include "opp2xxx.h" | 33 | #include "opp2xxx.h" |
| 34 | #include "sdrc.h" | 34 | #include "sdrc.h" |
diff --git a/arch/arm/mach-omap2/opp2430_data.c b/arch/arm/mach-omap2/opp2430_data.c index 750805c528d8..0e75ec3e114b 100644 --- a/arch/arm/mach-omap2/opp2430_data.c +++ b/arch/arm/mach-omap2/opp2430_data.c | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | * This is technically part of the OMAP2xxx clock code. | 26 | * This is technically part of the OMAP2xxx clock code. |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <plat/hardware.h> | 29 | #include <linux/kernel.h> |
| 30 | 30 | ||
| 31 | #include "opp2xxx.h" | 31 | #include "opp2xxx.h" |
| 32 | #include "sdrc.h" | 32 | #include "sdrc.h" |
diff --git a/arch/arm/mach-omap2/opp3xxx_data.c b/arch/arm/mach-omap2/opp3xxx_data.c index d95f3f945d4a..75cef5f67a8a 100644 --- a/arch/arm/mach-omap2/opp3xxx_data.c +++ b/arch/arm/mach-omap2/opp3xxx_data.c | |||
| @@ -19,8 +19,6 @@ | |||
| 19 | */ | 19 | */ |
| 20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 21 | 21 | ||
| 22 | #include <plat/cpu.h> | ||
| 23 | |||
| 24 | #include "control.h" | 22 | #include "control.h" |
| 25 | #include "omap_opp_data.h" | 23 | #include "omap_opp_data.h" |
| 26 | #include "pm.h" | 24 | #include "pm.h" |
diff --git a/arch/arm/mach-omap2/opp4xxx_data.c b/arch/arm/mach-omap2/opp4xxx_data.c index c95415da23c2..a9fd6d5fe79e 100644 --- a/arch/arm/mach-omap2/opp4xxx_data.c +++ b/arch/arm/mach-omap2/opp4xxx_data.c | |||
| @@ -20,8 +20,7 @@ | |||
| 20 | */ | 20 | */ |
| 21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 22 | 22 | ||
| 23 | #include <plat/cpu.h> | 23 | #include "soc.h" |
| 24 | |||
| 25 | #include "control.h" | 24 | #include "control.h" |
| 26 | #include "omap_opp_data.h" | 25 | #include "omap_opp_data.h" |
| 27 | #include "pm.h" | 26 | #include "pm.h" |
diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c index 69b36e185e9b..ca5be83d5019 100644 --- a/arch/arm/mach-omap2/powerdomain.c +++ b/arch/arm/mach-omap2/powerdomain.c | |||
| @@ -28,11 +28,13 @@ | |||
| 28 | #include "prm44xx.h" | 28 | #include "prm44xx.h" |
| 29 | 29 | ||
| 30 | #include <asm/cpu.h> | 30 | #include <asm/cpu.h> |
| 31 | #include <plat/cpu.h> | 31 | |
| 32 | #include <plat/prcm.h> | ||
| 33 | |||
| 32 | #include "powerdomain.h" | 34 | #include "powerdomain.h" |
| 33 | #include "clockdomain.h" | 35 | #include "clockdomain.h" |
| 34 | #include <plat/prcm.h> | ||
| 35 | 36 | ||
| 37 | #include "soc.h" | ||
| 36 | #include "pm.h" | 38 | #include "pm.h" |
| 37 | 39 | ||
| 38 | #define PWRDM_TRACE_STATES_FLAG (1<<31) | 40 | #define PWRDM_TRACE_STATES_FLAG (1<<31) |
diff --git a/arch/arm/mach-omap2/powerdomains3xxx_data.c b/arch/arm/mach-omap2/powerdomains3xxx_data.c index bb883e463078..8b23d234fb55 100644 --- a/arch/arm/mach-omap2/powerdomains3xxx_data.c +++ b/arch/arm/mach-omap2/powerdomains3xxx_data.c | |||
| @@ -15,11 +15,9 @@ | |||
| 15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 16 | #include <linux/bug.h> | 16 | #include <linux/bug.h> |
| 17 | 17 | ||
| 18 | #include <plat/cpu.h> | 18 | #include "soc.h" |
| 19 | |||
| 20 | #include "powerdomain.h" | 19 | #include "powerdomain.h" |
| 21 | #include "powerdomains2xxx_3xxx_data.h" | 20 | #include "powerdomains2xxx_3xxx_data.h" |
| 22 | |||
| 23 | #include "prcm-common.h" | 21 | #include "prcm-common.h" |
| 24 | #include "prm2xxx_3xxx.h" | 22 | #include "prm2xxx_3xxx.h" |
| 25 | #include "prm-regbits-34xx.h" | 23 | #include "prm-regbits-34xx.h" |
diff --git a/arch/arm/mach-omap2/prm2xxx_3xxx.c b/arch/arm/mach-omap2/prm2xxx_3xxx.c index 3601763ee566..9529984d8d2b 100644 --- a/arch/arm/mach-omap2/prm2xxx_3xxx.c +++ b/arch/arm/mach-omap2/prm2xxx_3xxx.c | |||
| @@ -17,10 +17,10 @@ | |||
| 17 | #include <linux/io.h> | 17 | #include <linux/io.h> |
| 18 | #include <linux/irq.h> | 18 | #include <linux/irq.h> |
| 19 | 19 | ||
| 20 | #include "common.h" | ||
| 21 | #include <plat/cpu.h> | ||
| 22 | #include <plat/prcm.h> | 20 | #include <plat/prcm.h> |
| 23 | 21 | ||
| 22 | #include "soc.h" | ||
| 23 | #include "common.h" | ||
| 24 | #include "vp.h" | 24 | #include "vp.h" |
| 25 | 25 | ||
| 26 | #include "prm2xxx_3xxx.h" | 26 | #include "prm2xxx_3xxx.h" |
diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c index df2cfe165a23..f0c4d5f4a174 100644 --- a/arch/arm/mach-omap2/prm44xx.c +++ b/arch/arm/mach-omap2/prm44xx.c | |||
| @@ -17,10 +17,9 @@ | |||
| 17 | #include <linux/err.h> | 17 | #include <linux/err.h> |
| 18 | #include <linux/io.h> | 18 | #include <linux/io.h> |
| 19 | 19 | ||
| 20 | #include <plat/cpu.h> | ||
| 21 | #include <plat/prcm.h> | 20 | #include <plat/prcm.h> |
| 22 | #include <plat/hardware.h> | ||
| 23 | 21 | ||
| 22 | #include "soc.h" | ||
| 24 | #include "iomap.h" | 23 | #include "iomap.h" |
| 25 | #include "common.h" | 24 | #include "common.h" |
| 26 | #include "vp.h" | 25 | #include "vp.h" |
diff --git a/arch/arm/mach-omap2/sdrc2xxx.c b/arch/arm/mach-omap2/sdrc2xxx.c index 1133bb2f632b..73e55e485329 100644 --- a/arch/arm/mach-omap2/sdrc2xxx.c +++ b/arch/arm/mach-omap2/sdrc2xxx.c | |||
| @@ -24,11 +24,11 @@ | |||
| 24 | #include <linux/clk.h> | 24 | #include <linux/clk.h> |
| 25 | #include <linux/io.h> | 25 | #include <linux/io.h> |
| 26 | 26 | ||
| 27 | #include <plat/hardware.h> | ||
| 28 | #include <plat/clock.h> | 27 | #include <plat/clock.h> |
| 29 | #include <plat/sram.h> | 28 | #include <plat/sram.h> |
| 30 | #include <plat/sdrc.h> | 29 | #include <plat/sdrc.h> |
| 31 | 30 | ||
| 31 | #include "soc.h" | ||
| 32 | #include "iomap.h" | 32 | #include "iomap.h" |
| 33 | #include "common.h" | 33 | #include "common.h" |
| 34 | #include "prm2xxx_3xxx.h" | 34 | #include "prm2xxx_3xxx.h" |
diff --git a/arch/arm/mach-omap2/sleep34xx.S b/arch/arm/mach-omap2/sleep34xx.S index 1f62f23673fb..3fbe496f391b 100644 --- a/arch/arm/mach-omap2/sleep34xx.S +++ b/arch/arm/mach-omap2/sleep34xx.S | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | 26 | ||
| 27 | #include <asm/assembler.h> | 27 | #include <asm/assembler.h> |
| 28 | 28 | ||
| 29 | #include <plat/hardware.h> | 29 | #include <plat/omap34xx.h> |
| 30 | #include <plat/sram.h> | 30 | #include <plat/sram.h> |
| 31 | 31 | ||
| 32 | #include "iomap.h" | 32 | #include "iomap.h" |
diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h index 40195f1ccdc9..93c08de5bb06 100644 --- a/arch/arm/mach-omap2/soc.h +++ b/arch/arm/mach-omap2/soc.h | |||
| @@ -1 +1,7 @@ | |||
| 1 | #include <plat/cpu.h> | 1 | #include <plat/cpu.h> |
| 2 | #include <plat/omap24xx.h> | ||
| 3 | #include <plat/omap34xx.h> | ||
| 4 | #include <plat/omap44xx.h> | ||
| 5 | #include <plat/ti81xx.h> | ||
| 6 | #include <plat/am33xx.h> | ||
| 7 | #include <plat/omap54xx.h> | ||
diff --git a/arch/arm/mach-omap2/sram242x.S b/arch/arm/mach-omap2/sram242x.S index ee0bfcc1410f..8f7326cd435b 100644 --- a/arch/arm/mach-omap2/sram242x.S +++ b/arch/arm/mach-omap2/sram242x.S | |||
| @@ -32,8 +32,7 @@ | |||
| 32 | 32 | ||
| 33 | #include <asm/assembler.h> | 33 | #include <asm/assembler.h> |
| 34 | 34 | ||
| 35 | #include <mach/hardware.h> | 35 | #include "soc.h" |
| 36 | |||
| 37 | #include "iomap.h" | 36 | #include "iomap.h" |
| 38 | #include "prm2xxx_3xxx.h" | 37 | #include "prm2xxx_3xxx.h" |
| 39 | #include "cm2xxx_3xxx.h" | 38 | #include "cm2xxx_3xxx.h" |
diff --git a/arch/arm/mach-omap2/sram243x.S b/arch/arm/mach-omap2/sram243x.S index d4d39ef04769..b140d6578529 100644 --- a/arch/arm/mach-omap2/sram243x.S +++ b/arch/arm/mach-omap2/sram243x.S | |||
| @@ -32,8 +32,7 @@ | |||
| 32 | 32 | ||
| 33 | #include <asm/assembler.h> | 33 | #include <asm/assembler.h> |
| 34 | 34 | ||
| 35 | #include <mach/hardware.h> | 35 | #include "soc.h" |
| 36 | |||
| 37 | #include "iomap.h" | 36 | #include "iomap.h" |
| 38 | #include "prm2xxx_3xxx.h" | 37 | #include "prm2xxx_3xxx.h" |
| 39 | #include "cm2xxx_3xxx.h" | 38 | #include "cm2xxx_3xxx.h" |
diff --git a/arch/arm/mach-omap2/sram34xx.S b/arch/arm/mach-omap2/sram34xx.S index df5a21322b0a..2d0ceaa23fb8 100644 --- a/arch/arm/mach-omap2/sram34xx.S +++ b/arch/arm/mach-omap2/sram34xx.S | |||
| @@ -29,8 +29,7 @@ | |||
| 29 | 29 | ||
| 30 | #include <asm/assembler.h> | 30 | #include <asm/assembler.h> |
| 31 | 31 | ||
| 32 | #include <mach/hardware.h> | 32 | #include "soc.h" |
| 33 | |||
| 34 | #include "iomap.h" | 33 | #include "iomap.h" |
| 35 | #include "sdrc.h" | 34 | #include "sdrc.h" |
| 36 | #include "cm2xxx_3xxx.h" | 35 | #include "cm2xxx_3xxx.h" |
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 3bdaf9877e0b..25cbe73b0cd7 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c | |||
| @@ -46,8 +46,7 @@ | |||
| 46 | #include <plat/dmtimer.h> | 46 | #include <plat/dmtimer.h> |
| 47 | #include <plat/omap-pm.h> | 47 | #include <plat/omap-pm.h> |
| 48 | 48 | ||
| 49 | #include <mach/hardware.h> | 49 | #include "soc.h" |
| 50 | |||
| 51 | #include "common.h" | 50 | #include "common.h" |
| 52 | #include "powerdomain.h" | 51 | #include "powerdomain.h" |
| 53 | 52 | ||
diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c index b0384ce81789..99be94e94547 100644 --- a/arch/arm/mach-omap2/twl-common.c +++ b/arch/arm/mach-omap2/twl-common.c | |||
| @@ -26,10 +26,10 @@ | |||
| 26 | #include <linux/regulator/machine.h> | 26 | #include <linux/regulator/machine.h> |
| 27 | #include <linux/regulator/fixed.h> | 27 | #include <linux/regulator/fixed.h> |
| 28 | 28 | ||
| 29 | #include <plat/hardware.h> | ||
| 30 | #include <plat/i2c.h> | 29 | #include <plat/i2c.h> |
| 31 | #include <plat/usb.h> | 30 | #include <plat/usb.h> |
| 32 | 31 | ||
| 32 | #include "soc.h" | ||
| 33 | #include "twl-common.h" | 33 | #include "twl-common.h" |
| 34 | #include "pm.h" | 34 | #include "pm.h" |
| 35 | #include "voltage.h" | 35 | #include "voltage.h" |
diff --git a/arch/arm/mach-omap2/usb-host.c b/arch/arm/mach-omap2/usb-host.c index 14368c38c4d8..ac95daaa4702 100644 --- a/arch/arm/mach-omap2/usb-host.c +++ b/arch/arm/mach-omap2/usb-host.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | 25 | ||
| 26 | #include <asm/io.h> | 26 | #include <asm/io.h> |
| 27 | 27 | ||
| 28 | #include <mach/hardware.h> | ||
| 29 | #include <plat/usb.h> | 28 | #include <plat/usb.h> |
| 30 | #include <plat/omap_device.h> | 29 | #include <plat/omap_device.h> |
| 31 | 30 | ||
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c index 3f35e6cc2da1..89150b2435e5 100644 --- a/arch/arm/mach-omap2/usb-musb.c +++ b/arch/arm/mach-omap2/usb-musb.c | |||
| @@ -23,13 +23,13 @@ | |||
| 23 | #include <linux/clk.h> | 23 | #include <linux/clk.h> |
| 24 | #include <linux/dma-mapping.h> | 24 | #include <linux/dma-mapping.h> |
| 25 | #include <linux/io.h> | 25 | #include <linux/io.h> |
| 26 | |||
| 27 | #include <linux/usb/musb.h> | 26 | #include <linux/usb/musb.h> |
| 28 | 27 | ||
| 29 | #include <mach/hardware.h> | ||
| 30 | #include <mach/am35xx.h> | ||
| 31 | #include <plat/usb.h> | 28 | #include <plat/usb.h> |
| 32 | #include <plat/omap_device.h> | 29 | #include <plat/omap_device.h> |
| 30 | |||
| 31 | #include <mach/am35xx.h> | ||
| 32 | |||
| 33 | #include "mux.h" | 33 | #include "mux.h" |
| 34 | 34 | ||
| 35 | static struct musb_hdrc_config musb_config = { | 35 | static struct musb_hdrc_config musb_config = { |
diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c index 84da34f9a7cf..b451f3c13292 100644 --- a/arch/arm/mach-omap2/vc.c +++ b/arch/arm/mach-omap2/vc.c | |||
| @@ -12,8 +12,7 @@ | |||
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/bug.h> | 13 | #include <linux/bug.h> |
| 14 | 14 | ||
| 15 | #include <plat/cpu.h> | 15 | #include "soc.h" |
| 16 | |||
| 17 | #include "voltage.h" | 16 | #include "voltage.h" |
| 18 | #include "vc.h" | 17 | #include "vc.h" |
| 19 | #include "prm-regbits-34xx.h" | 18 | #include "prm-regbits-34xx.h" |
diff --git a/arch/arm/mach-omap2/voltagedomains3xxx_data.c b/arch/arm/mach-omap2/voltagedomains3xxx_data.c index d0103c80d040..63afbfed3cbc 100644 --- a/arch/arm/mach-omap2/voltagedomains3xxx_data.c +++ b/arch/arm/mach-omap2/voltagedomains3xxx_data.c | |||
| @@ -18,9 +18,8 @@ | |||
| 18 | #include <linux/err.h> | 18 | #include <linux/err.h> |
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | 20 | ||
| 21 | #include "soc.h" | ||
| 21 | #include "common.h" | 22 | #include "common.h" |
| 22 | #include <plat/cpu.h> | ||
| 23 | |||
| 24 | #include "prm-regbits-34xx.h" | 23 | #include "prm-regbits-34xx.h" |
| 25 | #include "omap_opp_data.h" | 24 | #include "omap_opp_data.h" |
| 26 | #include "voltage.h" | 25 | #include "voltage.h" |
diff --git a/arch/arm/plat-omap/counter_32k.c b/arch/arm/plat-omap/counter_32k.c index 902d2ffdce9b..2e826f1faf7b 100644 --- a/arch/arm/plat-omap/counter_32k.c +++ b/arch/arm/plat-omap/counter_32k.c | |||
| @@ -22,9 +22,7 @@ | |||
| 22 | #include <asm/mach/time.h> | 22 | #include <asm/mach/time.h> |
| 23 | #include <asm/sched_clock.h> | 23 | #include <asm/sched_clock.h> |
| 24 | 24 | ||
| 25 | #include <plat/hardware.h> | ||
| 26 | #include <plat/common.h> | 25 | #include <plat/common.h> |
| 27 | |||
| 28 | #include <plat/clock.h> | 26 | #include <plat/clock.h> |
| 29 | 27 | ||
| 30 | /* OMAP2_32KSYNCNT_CR_OFF: offset of 32ksync counter register */ | 28 | /* OMAP2_32KSYNCNT_CR_OFF: offset of 32ksync counter register */ |
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index 7fe626761e53..6dcad5873d57 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c | |||
| @@ -36,9 +36,8 @@ | |||
| 36 | #include <linux/slab.h> | 36 | #include <linux/slab.h> |
| 37 | #include <linux/delay.h> | 37 | #include <linux/delay.h> |
| 38 | 38 | ||
| 39 | #include <mach/hardware.h> | 39 | #include <plat/cpu.h> |
| 40 | #include <plat/dma.h> | 40 | #include <plat/dma.h> |
| 41 | |||
| 42 | #include <plat/tc.h> | 41 | #include <plat/tc.h> |
| 43 | 42 | ||
| 44 | /* | 43 | /* |
diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h index bb5d08a70dbc..67da857783ce 100644 --- a/arch/arm/plat-omap/include/plat/cpu.h +++ b/arch/arm/plat-omap/include/plat/cpu.h | |||
| @@ -30,6 +30,8 @@ | |||
| 30 | #ifndef __ASM_ARCH_OMAP_CPU_H | 30 | #ifndef __ASM_ARCH_OMAP_CPU_H |
| 31 | #define __ASM_ARCH_OMAP_CPU_H | 31 | #define __ASM_ARCH_OMAP_CPU_H |
| 32 | 32 | ||
| 33 | #ifndef __ASSEMBLY__ | ||
| 34 | |||
| 33 | #include <linux/bitops.h> | 35 | #include <linux/bitops.h> |
| 34 | #include <plat/multi.h> | 36 | #include <plat/multi.h> |
| 35 | 37 | ||
| @@ -493,4 +495,5 @@ OMAP4_HAS_FEATURE(mpu_1ghz, MPU_1GHZ) | |||
| 493 | OMAP4_HAS_FEATURE(mpu_1_2ghz, MPU_1_2GHZ) | 495 | OMAP4_HAS_FEATURE(mpu_1_2ghz, MPU_1_2GHZ) |
| 494 | OMAP4_HAS_FEATURE(mpu_1_5ghz, MPU_1_5GHZ) | 496 | OMAP4_HAS_FEATURE(mpu_1_5ghz, MPU_1_5GHZ) |
| 495 | 497 | ||
| 498 | #endif /* __ASSEMBLY__ */ | ||
| 496 | #endif | 499 | #endif |
diff --git a/arch/arm/plat-omap/include/plat/hardware.h b/arch/arm/plat-omap/include/plat/hardware.h deleted file mode 100644 index ddbde38e1e33..000000000000 --- a/arch/arm/plat-omap/include/plat/hardware.h +++ /dev/null | |||
| @@ -1,293 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/plat-omap/include/mach/hardware.h | ||
| 3 | * | ||
| 4 | * Hardware definitions for TI OMAP processors and boards | ||
| 5 | * | ||
| 6 | * NOTE: Please put device driver specific defines into a separate header | ||
| 7 | * file for each driver. | ||
| 8 | * | ||
| 9 | * Copyright (C) 2001 RidgeRun, Inc. | ||
| 10 | * Author: RidgeRun, Inc. Greg Lonnon <glonnon@ridgerun.com> | ||
| 11 | * | ||
| 12 | * Reorganized for Linux-2.6 by Tony Lindgren <tony@atomide.com> | ||
| 13 | * and Dirk Behme <dirk.behme@de.bosch.com> | ||
| 14 | * | ||
| 15 | * This program is free software; you can redistribute it and/or modify it | ||
| 16 | * under the terms of the GNU General Public License as published by the | ||
| 17 | * Free Software Foundation; either version 2 of the License, or (at your | ||
| 18 | * option) any later version. | ||
| 19 | * | ||
| 20 | * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED | ||
| 21 | * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
| 22 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN | ||
| 23 | * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
| 24 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 25 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | ||
| 26 | * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
| 27 | * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| 28 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
| 29 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 30 | * | ||
| 31 | * You should have received a copy of the GNU General Public License along | ||
| 32 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
| 33 | * 675 Mass Ave, Cambridge, MA 02139, USA. | ||
| 34 | */ | ||
| 35 | |||
| 36 | #ifndef __ASM_ARCH_OMAP_HARDWARE_H | ||
| 37 | #define __ASM_ARCH_OMAP_HARDWARE_H | ||
| 38 | |||
| 39 | #include <asm/sizes.h> | ||
| 40 | #ifndef __ASSEMBLER__ | ||
| 41 | #include <asm/types.h> | ||
| 42 | #include <plat/cpu.h> | ||
| 43 | #endif | ||
| 44 | #include <plat/serial.h> | ||
| 45 | |||
| 46 | /* | ||
| 47 | * --------------------------------------------------------------------------- | ||
| 48 | * Common definitions for all OMAP processors | ||
| 49 | * NOTE: Put all processor or board specific parts to the special header | ||
| 50 | * files. | ||
| 51 | * --------------------------------------------------------------------------- | ||
| 52 | */ | ||
| 53 | |||
| 54 | /* | ||
| 55 | * ---------------------------------------------------------------------------- | ||
| 56 | * Timers | ||
| 57 | * ---------------------------------------------------------------------------- | ||
| 58 | */ | ||
| 59 | #define OMAP_MPU_TIMER1_BASE (0xfffec500) | ||
| 60 | #define OMAP_MPU_TIMER2_BASE (0xfffec600) | ||
| 61 | #define OMAP_MPU_TIMER3_BASE (0xfffec700) | ||
| 62 | #define MPU_TIMER_FREE (1 << 6) | ||
| 63 | #define MPU_TIMER_CLOCK_ENABLE (1 << 5) | ||
| 64 | #define MPU_TIMER_AR (1 << 1) | ||
| 65 | #define MPU_TIMER_ST (1 << 0) | ||
| 66 | |||
| 67 | /* | ||
| 68 | * ---------------------------------------------------------------------------- | ||
| 69 | * Clocks | ||
| 70 | * ---------------------------------------------------------------------------- | ||
| 71 | */ | ||
| 72 | #define CLKGEN_REG_BASE (0xfffece00) | ||
| 73 | #define ARM_CKCTL (CLKGEN_REG_BASE + 0x0) | ||
| 74 | #define ARM_IDLECT1 (CLKGEN_REG_BASE + 0x4) | ||
| 75 | #define ARM_IDLECT2 (CLKGEN_REG_BASE + 0x8) | ||
| 76 | #define ARM_EWUPCT (CLKGEN_REG_BASE + 0xC) | ||
| 77 | #define ARM_RSTCT1 (CLKGEN_REG_BASE + 0x10) | ||
| 78 | #define ARM_RSTCT2 (CLKGEN_REG_BASE + 0x14) | ||
| 79 | #define ARM_SYSST (CLKGEN_REG_BASE + 0x18) | ||
| 80 | #define ARM_IDLECT3 (CLKGEN_REG_BASE + 0x24) | ||
| 81 | |||
| 82 | #define CK_RATEF 1 | ||
| 83 | #define CK_IDLEF 2 | ||
| 84 | #define CK_ENABLEF 4 | ||
| 85 | #define CK_SELECTF 8 | ||
| 86 | #define SETARM_IDLE_SHIFT | ||
| 87 | |||
| 88 | /* DPLL control registers */ | ||
| 89 | #define DPLL_CTL (0xfffecf00) | ||
| 90 | |||
| 91 | /* DSP clock control. Must use __raw_readw() and __raw_writew() with these */ | ||
| 92 | #define DSP_CONFIG_REG_BASE IOMEM(0xe1008000) | ||
| 93 | #define DSP_CKCTL (DSP_CONFIG_REG_BASE + 0x0) | ||
| 94 | #define DSP_IDLECT1 (DSP_CONFIG_REG_BASE + 0x4) | ||
| 95 | #define DSP_IDLECT2 (DSP_CONFIG_REG_BASE + 0x8) | ||
| 96 | #define DSP_RSTCT2 (DSP_CONFIG_REG_BASE + 0x14) | ||
| 97 | |||
| 98 | /* | ||
| 99 | * --------------------------------------------------------------------------- | ||
| 100 | * UPLD | ||
| 101 | * --------------------------------------------------------------------------- | ||
| 102 | */ | ||
| 103 | #define ULPD_REG_BASE (0xfffe0800) | ||
| 104 | #define ULPD_IT_STATUS (ULPD_REG_BASE + 0x14) | ||
| 105 | #define ULPD_SETUP_ANALOG_CELL_3 (ULPD_REG_BASE + 0x24) | ||
| 106 | #define ULPD_CLOCK_CTRL (ULPD_REG_BASE + 0x30) | ||
| 107 | # define DIS_USB_PVCI_CLK (1 << 5) /* no USB/FAC synch */ | ||
| 108 | # define USB_MCLK_EN (1 << 4) /* enable W4_USB_CLKO */ | ||
| 109 | #define ULPD_SOFT_REQ (ULPD_REG_BASE + 0x34) | ||
| 110 | # define SOFT_UDC_REQ (1 << 4) | ||
| 111 | # define SOFT_USB_CLK_REQ (1 << 3) | ||
| 112 | # define SOFT_DPLL_REQ (1 << 0) | ||
| 113 | #define ULPD_DPLL_CTRL (ULPD_REG_BASE + 0x3c) | ||
| 114 | #define ULPD_STATUS_REQ (ULPD_REG_BASE + 0x40) | ||
| 115 | #define ULPD_APLL_CTRL (ULPD_REG_BASE + 0x4c) | ||
| 116 | #define ULPD_POWER_CTRL (ULPD_REG_BASE + 0x50) | ||
| 117 | #define ULPD_SOFT_DISABLE_REQ_REG (ULPD_REG_BASE + 0x68) | ||
| 118 | # define DIS_MMC2_DPLL_REQ (1 << 11) | ||
| 119 | # define DIS_MMC1_DPLL_REQ (1 << 10) | ||
| 120 | # define DIS_UART3_DPLL_REQ (1 << 9) | ||
| 121 | # define DIS_UART2_DPLL_REQ (1 << 8) | ||
| 122 | # define DIS_UART1_DPLL_REQ (1 << 7) | ||
| 123 | # define DIS_USB_HOST_DPLL_REQ (1 << 6) | ||
| 124 | #define ULPD_SDW_CLK_DIV_CTRL_SEL (ULPD_REG_BASE + 0x74) | ||
| 125 | #define ULPD_CAM_CLK_CTRL (ULPD_REG_BASE + 0x7c) | ||
| 126 | |||
| 127 | /* | ||
| 128 | * --------------------------------------------------------------------------- | ||
| 129 | * Watchdog timer | ||
| 130 | * --------------------------------------------------------------------------- | ||
| 131 | */ | ||
| 132 | |||
| 133 | /* Watchdog timer within the OMAP3.2 gigacell */ | ||
| 134 | #define OMAP_MPU_WATCHDOG_BASE (0xfffec800) | ||
| 135 | #define OMAP_WDT_TIMER (OMAP_MPU_WATCHDOG_BASE + 0x0) | ||
| 136 | #define OMAP_WDT_LOAD_TIM (OMAP_MPU_WATCHDOG_BASE + 0x4) | ||
| 137 | #define OMAP_WDT_READ_TIM (OMAP_MPU_WATCHDOG_BASE + 0x4) | ||
| 138 | #define OMAP_WDT_TIMER_MODE (OMAP_MPU_WATCHDOG_BASE + 0x8) | ||
| 139 | |||
| 140 | /* | ||
| 141 | * --------------------------------------------------------------------------- | ||
| 142 | * Interrupts | ||
| 143 | * --------------------------------------------------------------------------- | ||
| 144 | */ | ||
| 145 | #ifdef CONFIG_ARCH_OMAP1 | ||
| 146 | |||
| 147 | /* | ||
| 148 | * XXX: These probably want to be moved to arch/arm/mach-omap/omap1/irq.c | ||
| 149 | * or something similar.. -- PFM. | ||
| 150 | */ | ||
| 151 | |||
| 152 | #define OMAP_IH1_BASE 0xfffecb00 | ||
| 153 | #define OMAP_IH2_BASE 0xfffe0000 | ||
| 154 | |||
| 155 | #define OMAP_IH1_ITR (OMAP_IH1_BASE + 0x00) | ||
| 156 | #define OMAP_IH1_MIR (OMAP_IH1_BASE + 0x04) | ||
| 157 | #define OMAP_IH1_SIR_IRQ (OMAP_IH1_BASE + 0x10) | ||
| 158 | #define OMAP_IH1_SIR_FIQ (OMAP_IH1_BASE + 0x14) | ||
| 159 | #define OMAP_IH1_CONTROL (OMAP_IH1_BASE + 0x18) | ||
| 160 | #define OMAP_IH1_ILR0 (OMAP_IH1_BASE + 0x1c) | ||
| 161 | #define OMAP_IH1_ISR (OMAP_IH1_BASE + 0x9c) | ||
| 162 | |||
| 163 | #define OMAP_IH2_ITR (OMAP_IH2_BASE + 0x00) | ||
| 164 | #define OMAP_IH2_MIR (OMAP_IH2_BASE + 0x04) | ||
| 165 | #define OMAP_IH2_SIR_IRQ (OMAP_IH2_BASE + 0x10) | ||
| 166 | #define OMAP_IH2_SIR_FIQ (OMAP_IH2_BASE + 0x14) | ||
| 167 | #define OMAP_IH2_CONTROL (OMAP_IH2_BASE + 0x18) | ||
| 168 | #define OMAP_IH2_ILR0 (OMAP_IH2_BASE + 0x1c) | ||
| 169 | #define OMAP_IH2_ISR (OMAP_IH2_BASE + 0x9c) | ||
| 170 | |||
| 171 | #define IRQ_ITR_REG_OFFSET 0x00 | ||
| 172 | #define IRQ_MIR_REG_OFFSET 0x04 | ||
| 173 | #define IRQ_SIR_IRQ_REG_OFFSET 0x10 | ||
| 174 | #define IRQ_SIR_FIQ_REG_OFFSET 0x14 | ||
| 175 | #define IRQ_CONTROL_REG_OFFSET 0x18 | ||
| 176 | #define IRQ_ISR_REG_OFFSET 0x9c | ||
| 177 | #define IRQ_ILR0_REG_OFFSET 0x1c | ||
| 178 | #define IRQ_GMR_REG_OFFSET 0xa0 | ||
| 179 | |||
| 180 | #endif | ||
| 181 | |||
| 182 | /* | ||
| 183 | * ---------------------------------------------------------------------------- | ||
| 184 | * System control registers | ||
| 185 | * ---------------------------------------------------------------------------- | ||
| 186 | */ | ||
| 187 | #define MOD_CONF_CTRL_0 0xfffe1080 | ||
| 188 | #define MOD_CONF_CTRL_1 0xfffe1110 | ||
| 189 | |||
| 190 | /* | ||
| 191 | * ---------------------------------------------------------------------------- | ||
| 192 | * Pin multiplexing registers | ||
| 193 | * ---------------------------------------------------------------------------- | ||
| 194 | */ | ||
| 195 | #define FUNC_MUX_CTRL_0 0xfffe1000 | ||
| 196 | #define FUNC_MUX_CTRL_1 0xfffe1004 | ||
| 197 | #define FUNC_MUX_CTRL_2 0xfffe1008 | ||
| 198 | #define COMP_MODE_CTRL_0 0xfffe100c | ||
| 199 | #define FUNC_MUX_CTRL_3 0xfffe1010 | ||
| 200 | #define FUNC_MUX_CTRL_4 0xfffe1014 | ||
| 201 | #define FUNC_MUX_CTRL_5 0xfffe1018 | ||
| 202 | #define FUNC_MUX_CTRL_6 0xfffe101C | ||
| 203 | #define FUNC_MUX_CTRL_7 0xfffe1020 | ||
| 204 | #define FUNC_MUX_CTRL_8 0xfffe1024 | ||
| 205 | #define FUNC_MUX_CTRL_9 0xfffe1028 | ||
| 206 | #define FUNC_MUX_CTRL_A 0xfffe102C | ||
| 207 | #define FUNC_MUX_CTRL_B 0xfffe1030 | ||
| 208 | #define FUNC_MUX_CTRL_C 0xfffe1034 | ||
| 209 | #define FUNC_MUX_CTRL_D 0xfffe1038 | ||
| 210 | #define PULL_DWN_CTRL_0 0xfffe1040 | ||
| 211 | #define PULL_DWN_CTRL_1 0xfffe1044 | ||
| 212 | #define PULL_DWN_CTRL_2 0xfffe1048 | ||
| 213 | #define PULL_DWN_CTRL_3 0xfffe104c | ||
| 214 | #define PULL_DWN_CTRL_4 0xfffe10ac | ||
| 215 | |||
| 216 | /* OMAP-1610 specific multiplexing registers */ | ||
| 217 | #define FUNC_MUX_CTRL_E 0xfffe1090 | ||
| 218 | #define FUNC_MUX_CTRL_F 0xfffe1094 | ||
| 219 | #define FUNC_MUX_CTRL_10 0xfffe1098 | ||
| 220 | #define FUNC_MUX_CTRL_11 0xfffe109c | ||
| 221 | #define FUNC_MUX_CTRL_12 0xfffe10a0 | ||
| 222 | #define PU_PD_SEL_0 0xfffe10b4 | ||
| 223 | #define PU_PD_SEL_1 0xfffe10b8 | ||
| 224 | #define PU_PD_SEL_2 0xfffe10bc | ||
| 225 | #define PU_PD_SEL_3 0xfffe10c0 | ||
| 226 | #define PU_PD_SEL_4 0xfffe10c4 | ||
| 227 | |||
| 228 | /* Timer32K for 1610 and 1710*/ | ||
| 229 | #define OMAP_TIMER32K_BASE 0xFFFBC400 | ||
| 230 | |||
| 231 | /* | ||
| 232 | * --------------------------------------------------------------------------- | ||
| 233 | * TIPB bus interface | ||
| 234 | * --------------------------------------------------------------------------- | ||
| 235 | */ | ||
| 236 | #define TIPB_PUBLIC_CNTL_BASE 0xfffed300 | ||
| 237 | #define MPU_PUBLIC_TIPB_CNTL (TIPB_PUBLIC_CNTL_BASE + 0x8) | ||
| 238 | #define TIPB_PRIVATE_CNTL_BASE 0xfffeca00 | ||
| 239 | #define MPU_PRIVATE_TIPB_CNTL (TIPB_PRIVATE_CNTL_BASE + 0x8) | ||
| 240 | |||
| 241 | /* | ||
| 242 | * ---------------------------------------------------------------------------- | ||
| 243 | * MPUI interface | ||
| 244 | * ---------------------------------------------------------------------------- | ||
| 245 | */ | ||
| 246 | #define MPUI_BASE (0xfffec900) | ||
| 247 | #define MPUI_CTRL (MPUI_BASE + 0x0) | ||
| 248 | #define MPUI_DEBUG_ADDR (MPUI_BASE + 0x4) | ||
| 249 | #define MPUI_DEBUG_DATA (MPUI_BASE + 0x8) | ||
| 250 | #define MPUI_DEBUG_FLAG (MPUI_BASE + 0xc) | ||
| 251 | #define MPUI_STATUS_REG (MPUI_BASE + 0x10) | ||
| 252 | #define MPUI_DSP_STATUS (MPUI_BASE + 0x14) | ||
| 253 | #define MPUI_DSP_BOOT_CONFIG (MPUI_BASE + 0x18) | ||
| 254 | #define MPUI_DSP_API_CONFIG (MPUI_BASE + 0x1c) | ||
| 255 | |||
| 256 | /* | ||
| 257 | * ---------------------------------------------------------------------------- | ||
| 258 | * LED Pulse Generator | ||
| 259 | * ---------------------------------------------------------------------------- | ||
| 260 | */ | ||
| 261 | #define OMAP_LPG1_BASE 0xfffbd000 | ||
| 262 | #define OMAP_LPG2_BASE 0xfffbd800 | ||
| 263 | #define OMAP_LPG1_LCR (OMAP_LPG1_BASE + 0x00) | ||
| 264 | #define OMAP_LPG1_PMR (OMAP_LPG1_BASE + 0x04) | ||
| 265 | #define OMAP_LPG2_LCR (OMAP_LPG2_BASE + 0x00) | ||
| 266 | #define OMAP_LPG2_PMR (OMAP_LPG2_BASE + 0x04) | ||
| 267 | |||
| 268 | /* | ||
| 269 | * ---------------------------------------------------------------------------- | ||
| 270 | * Pulse-Width Light | ||
| 271 | * ---------------------------------------------------------------------------- | ||
| 272 | */ | ||
| 273 | #define OMAP_PWL_BASE 0xfffb5800 | ||
| 274 | #define OMAP_PWL_ENABLE (OMAP_PWL_BASE + 0x00) | ||
| 275 | #define OMAP_PWL_CLK_ENABLE (OMAP_PWL_BASE + 0x04) | ||
| 276 | |||
| 277 | /* | ||
| 278 | * --------------------------------------------------------------------------- | ||
| 279 | * Processor specific defines | ||
| 280 | * --------------------------------------------------------------------------- | ||
| 281 | */ | ||
| 282 | |||
| 283 | #include <plat/omap7xx.h> | ||
| 284 | #include <plat/omap1510.h> | ||
| 285 | #include <plat/omap16xx.h> | ||
| 286 | #include <plat/omap24xx.h> | ||
| 287 | #include <plat/omap34xx.h> | ||
| 288 | #include <plat/omap44xx.h> | ||
| 289 | #include <plat/ti81xx.h> | ||
| 290 | #include <plat/am33xx.h> | ||
| 291 | #include <plat/omap54xx.h> | ||
| 292 | |||
| 293 | #endif /* __ASM_ARCH_OMAP_HARDWARE_H */ | ||
diff --git a/arch/arm/plat-omap/include/plat/omap4-keypad.h b/arch/arm/plat-omap/include/plat/omap4-keypad.h index 8ad0a377a54b..20de0d5a7e77 100644 --- a/arch/arm/plat-omap/include/plat/omap4-keypad.h +++ b/arch/arm/plat-omap/include/plat/omap4-keypad.h | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | #ifndef ARCH_ARM_PLAT_OMAP4_KEYPAD_H | 1 | #ifndef ARCH_ARM_PLAT_OMAP4_KEYPAD_H |
| 2 | #define ARCH_ARM_PLAT_OMAP4_KEYPAD_H | 2 | #define ARCH_ARM_PLAT_OMAP4_KEYPAD_H |
| 3 | 3 | ||
| 4 | struct omap_board_data; | ||
| 5 | |||
| 4 | extern int omap4_keyboard_init(struct omap4_keypad_platform_data *, | 6 | extern int omap4_keyboard_init(struct omap4_keypad_platform_data *, |
| 5 | struct omap_board_data *); | 7 | struct omap_board_data *); |
| 6 | #endif | 8 | #endif |
diff --git a/arch/arm/plat-omap/include/plat/omap44xx.h b/arch/arm/plat-omap/include/plat/omap44xx.h index 5da9735e4849..43b927b2e2e8 100644 --- a/arch/arm/plat-omap/include/plat/omap44xx.h +++ b/arch/arm/plat-omap/include/plat/omap44xx.h | |||
| @@ -45,7 +45,6 @@ | |||
| 45 | #define OMAP44XX_L2CACHE_BASE 0x48242000 | 45 | #define OMAP44XX_L2CACHE_BASE 0x48242000 |
| 46 | #define OMAP44XX_WKUPGEN_BASE 0x48281000 | 46 | #define OMAP44XX_WKUPGEN_BASE 0x48281000 |
| 47 | #define OMAP44XX_MCPDM_BASE 0x40132000 | 47 | #define OMAP44XX_MCPDM_BASE 0x40132000 |
| 48 | #define OMAP44XX_MCPDM_L3_BASE 0x49032000 | ||
| 49 | #define OMAP44XX_SAR_RAM_BASE 0x4a326000 | 48 | #define OMAP44XX_SAR_RAM_BASE 0x4a326000 |
| 50 | 49 | ||
| 51 | #define OMAP44XX_MAILBOX_BASE (L4_44XX_BASE + 0xF4000) | 50 | #define OMAP44XX_MAILBOX_BASE (L4_44XX_BASE + 0xF4000) |