Commit 987ec5851c5c303417fb04a6a0fed6e4603e1a24

Authored by Nishanth Menon
Committed by Tom Rini
1 parent 6d8abe6a8a

ARM: OMAP3: Rename omap3.h to omap.h to be generic as all SoCs

This is in preperation of using generic cross OMAP code.

Signed-off-by: Nishanth Menon <nm@ti.com>
Tested-by: Matt Porter <mporter@konsulko.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

Showing 21 changed files with 267 additions and 267 deletions Side-by-side Diff

arch/arm/include/asm/arch-omap3/omap.h
  1 +/*
  2 + * (C) Copyright 2006-2008
  3 + * Texas Instruments, <www.ti.com>
  4 + * Richard Woodruff <r-woodruff2@ti.com>
  5 + * Syed Mohammed Khasim <x0khasim@ti.com>
  6 + *
  7 + * SPDX-License-Identifier: GPL-2.0+
  8 + */
  9 +
  10 +#ifndef _OMAP3_H_
  11 +#define _OMAP3_H_
  12 +
  13 +/* Stuff on L3 Interconnect */
  14 +#define SMX_APE_BASE 0x68000000
  15 +
  16 +/* GPMC */
  17 +#define OMAP34XX_GPMC_BASE 0x6E000000
  18 +
  19 +/* SMS */
  20 +#define OMAP34XX_SMS_BASE 0x6C000000
  21 +
  22 +/* SDRC */
  23 +#define OMAP34XX_SDRC_BASE 0x6D000000
  24 +
  25 +/*
  26 + * L4 Peripherals - L4 Wakeup and L4 Core now
  27 + */
  28 +#define OMAP34XX_CORE_L4_IO_BASE 0x48000000
  29 +#define OMAP34XX_WAKEUP_L4_IO_BASE 0x48300000
  30 +#define OMAP34XX_ID_L4_IO_BASE 0x4830A200
  31 +#define OMAP34XX_L4_PER 0x49000000
  32 +#define OMAP34XX_L4_IO_BASE OMAP34XX_CORE_L4_IO_BASE
  33 +
  34 +/* DMA4/SDMA */
  35 +#define OMAP34XX_DMA4_BASE 0x48056000
  36 +
  37 +/* CONTROL */
  38 +#define OMAP34XX_CTRL_BASE (OMAP34XX_L4_IO_BASE + 0x2000)
  39 +
  40 +#ifndef __ASSEMBLY__
  41 +/* Signal Integrity Parameter Control Registers */
  42 +struct control_prog_io {
  43 + unsigned char res[0x408];
  44 + unsigned int io2; /* 0x408 */
  45 + unsigned char res2[0x38];
  46 + unsigned int io0; /* 0x444 */
  47 + unsigned int io1; /* 0x448 */
  48 +};
  49 +#endif /* __ASSEMBLY__ */
  50 +
  51 +/* Bit definition for CONTROL_PROG_IO1 */
  52 +#define PRG_I2C2_PULLUPRESX 0x00000001
  53 +
  54 +/* UART */
  55 +#define OMAP34XX_UART1 (OMAP34XX_L4_IO_BASE + 0x6a000)
  56 +#define OMAP34XX_UART2 (OMAP34XX_L4_IO_BASE + 0x6c000)
  57 +#define OMAP34XX_UART3 (OMAP34XX_L4_PER + 0x20000)
  58 +#define OMAP34XX_UART4 (OMAP34XX_L4_PER + 0x42000)
  59 +
  60 +/* General Purpose Timers */
  61 +#define OMAP34XX_GPT1 0x48318000
  62 +#define OMAP34XX_GPT2 0x49032000
  63 +#define OMAP34XX_GPT3 0x49034000
  64 +#define OMAP34XX_GPT4 0x49036000
  65 +#define OMAP34XX_GPT5 0x49038000
  66 +#define OMAP34XX_GPT6 0x4903A000
  67 +#define OMAP34XX_GPT7 0x4903C000
  68 +#define OMAP34XX_GPT8 0x4903E000
  69 +#define OMAP34XX_GPT9 0x49040000
  70 +#define OMAP34XX_GPT10 0x48086000
  71 +#define OMAP34XX_GPT11 0x48088000
  72 +#define OMAP34XX_GPT12 0x48304000
  73 +
  74 +/* WatchDog Timers (1 secure, 3 GP) */
  75 +#define WD1_BASE 0x4830C000
  76 +#define WD2_BASE 0x48314000
  77 +#define WD3_BASE 0x49030000
  78 +
  79 +/* 32KTIMER */
  80 +#define SYNC_32KTIMER_BASE 0x48320000
  81 +
  82 +#ifndef __ASSEMBLY__
  83 +
  84 +struct s32ktimer {
  85 + unsigned char res[0x10];
  86 + unsigned int s32k_cr; /* 0x10 */
  87 +};
  88 +
  89 +#endif /* __ASSEMBLY__ */
  90 +
  91 +#ifndef __ASSEMBLY__
  92 +struct gpio {
  93 + unsigned char res1[0x34];
  94 + unsigned int oe; /* 0x34 */
  95 + unsigned int datain; /* 0x38 */
  96 + unsigned char res2[0x54];
  97 + unsigned int cleardataout; /* 0x90 */
  98 + unsigned int setdataout; /* 0x94 */
  99 +};
  100 +#endif /* __ASSEMBLY__ */
  101 +
  102 +#define GPIO0 (0x1 << 0)
  103 +#define GPIO1 (0x1 << 1)
  104 +#define GPIO2 (0x1 << 2)
  105 +#define GPIO3 (0x1 << 3)
  106 +#define GPIO4 (0x1 << 4)
  107 +#define GPIO5 (0x1 << 5)
  108 +#define GPIO6 (0x1 << 6)
  109 +#define GPIO7 (0x1 << 7)
  110 +#define GPIO8 (0x1 << 8)
  111 +#define GPIO9 (0x1 << 9)
  112 +#define GPIO10 (0x1 << 10)
  113 +#define GPIO11 (0x1 << 11)
  114 +#define GPIO12 (0x1 << 12)
  115 +#define GPIO13 (0x1 << 13)
  116 +#define GPIO14 (0x1 << 14)
  117 +#define GPIO15 (0x1 << 15)
  118 +#define GPIO16 (0x1 << 16)
  119 +#define GPIO17 (0x1 << 17)
  120 +#define GPIO18 (0x1 << 18)
  121 +#define GPIO19 (0x1 << 19)
  122 +#define GPIO20 (0x1 << 20)
  123 +#define GPIO21 (0x1 << 21)
  124 +#define GPIO22 (0x1 << 22)
  125 +#define GPIO23 (0x1 << 23)
  126 +#define GPIO24 (0x1 << 24)
  127 +#define GPIO25 (0x1 << 25)
  128 +#define GPIO26 (0x1 << 26)
  129 +#define GPIO27 (0x1 << 27)
  130 +#define GPIO28 (0x1 << 28)
  131 +#define GPIO29 (0x1 << 29)
  132 +#define GPIO30 (0x1 << 30)
  133 +#define GPIO31 (0x1 << 31)
  134 +
  135 +/* base address for indirect vectors (internal boot mode) */
  136 +#define SRAM_OFFSET0 0x40000000
  137 +#define SRAM_OFFSET1 0x00200000
  138 +#define SRAM_OFFSET2 0x0000F800
  139 +#define SRAM_VECT_CODE (SRAM_OFFSET0 | SRAM_OFFSET1 | \
  140 + SRAM_OFFSET2)
  141 +#define SRAM_CLK_CODE (SRAM_VECT_CODE + 64)
  142 +
  143 +#define NON_SECURE_SRAM_START 0x40208000 /* Works for GP & EMU */
  144 +#define NON_SECURE_SRAM_END 0x40210000
  145 +
  146 +#define LOW_LEVEL_SRAM_STACK 0x4020FFFC
  147 +
  148 +/* scratch area - accessible on both EMU and GP */
  149 +#define OMAP3_PUBLIC_SRAM_SCRATCH_AREA NON_SECURE_SRAM_START
  150 +
  151 +#define DEBUG_LED1 149 /* gpio */
  152 +#define DEBUG_LED2 150 /* gpio */
  153 +
  154 +#define XDR_POP 5 /* package on package part */
  155 +#define SDR_DISCRETE 4 /* 128M memory SDR module */
  156 +#define DDR_STACKED 3 /* stacked part on 2422 */
  157 +#define DDR_COMBO 2 /* combo part on cpu daughter card */
  158 +#define DDR_DISCRETE 1 /* 2x16 parts on daughter card */
  159 +
  160 +#define DDR_100 100 /* type found on most mem d-boards */
  161 +#define DDR_111 111 /* some combo parts */
  162 +#define DDR_133 133 /* most combo, some mem d-boards */
  163 +#define DDR_165 165 /* future parts */
  164 +
  165 +#define CPU_3430 0x3430
  166 +
  167 +/*
  168 + * 343x real hardware:
  169 + * ES1 = rev 0
  170 + *
  171 + * ES2 onwards, the value maps to contents of IDCODE register [31:28].
  172 + *
  173 + * Note : CPU_3XX_ES20 is used in cache.S. Please review before changing.
  174 + */
  175 +#define CPU_3XX_ES10 0
  176 +#define CPU_3XX_ES20 1
  177 +#define CPU_3XX_ES21 2
  178 +#define CPU_3XX_ES30 3
  179 +#define CPU_3XX_ES31 4
  180 +#define CPU_3XX_ES312 7
  181 +#define CPU_3XX_MAX_REV 8
  182 +
  183 +/*
  184 + * 37xx real hardware:
  185 + * ES1.0 onwards, the value maps to contents of IDCODE register [31:28].
  186 + */
  187 +
  188 +#define CPU_37XX_ES10 0
  189 +#define CPU_37XX_ES11 1
  190 +#define CPU_37XX_ES12 2
  191 +#define CPU_37XX_MAX_REV 3
  192 +
  193 +#define CPU_3XX_ID_SHIFT 28
  194 +
  195 +#define WIDTH_8BIT 0x0000
  196 +#define WIDTH_16BIT 0x1000 /* bit pos for 16 bit in gpmc */
  197 +
  198 +/*
  199 + * Hawkeye values
  200 + */
  201 +#define HAWKEYE_OMAP34XX 0xb7ae
  202 +#define HAWKEYE_AM35XX 0xb868
  203 +#define HAWKEYE_OMAP36XX 0xb891
  204 +
  205 +#define HAWKEYE_SHIFT 12
  206 +
  207 +/*
  208 + * Define CPU families
  209 + */
  210 +#define CPU_OMAP34XX 0x3400 /* OMAP34xx/OMAP35 devices */
  211 +#define CPU_AM35XX 0x3500 /* AM35xx devices */
  212 +#define CPU_OMAP36XX 0x3600 /* OMAP36xx devices */
  213 +
  214 +/*
  215 + * Control status register values corresponding to cpu variants
  216 + */
  217 +#define OMAP3503 0x5c00
  218 +#define OMAP3515 0x1c00
  219 +#define OMAP3525 0x4c00
  220 +#define OMAP3530 0x0c00
  221 +
  222 +#define AM3505 0x5c00
  223 +#define AM3517 0x1c00
  224 +
  225 +#define OMAP3730 0x0c00
  226 +
  227 +/*
  228 + * ROM code API related flags
  229 + */
  230 +#define OMAP3_GP_ROMCODE_API_L2_INVAL 1
  231 +#define OMAP3_GP_ROMCODE_API_WRITE_ACR 3
  232 +
  233 +/*
  234 + * EMU device PPA HAL related flags
  235 + */
  236 +#define OMAP3_EMU_HAL_API_L2_INVAL 40
  237 +#define OMAP3_EMU_HAL_API_WRITE_ACR 42
  238 +
  239 +#define OMAP3_EMU_HAL_START_HAL_CRITICAL 4
  240 +
  241 +/* ABB settings */
  242 +#define OMAP_ABB_SETTLING_TIME 30
  243 +#define OMAP_ABB_CLOCK_CYCLES 8
  244 +
  245 +/* ABB tranxdone mask */
  246 +#define OMAP_ABB_MPU_TXDONE_MASK (0x1 << 26)
  247 +
  248 +#endif
arch/arm/include/asm/arch-omap3/omap3.h
1   -/*
2   - * (C) Copyright 2006-2008
3   - * Texas Instruments, <www.ti.com>
4   - * Richard Woodruff <r-woodruff2@ti.com>
5   - * Syed Mohammed Khasim <x0khasim@ti.com>
6   - *
7   - * SPDX-License-Identifier: GPL-2.0+
8   - */
9   -
10   -#ifndef _OMAP3_H_
11   -#define _OMAP3_H_
12   -
13   -/* Stuff on L3 Interconnect */
14   -#define SMX_APE_BASE 0x68000000
15   -
16   -/* GPMC */
17   -#define OMAP34XX_GPMC_BASE 0x6E000000
18   -
19   -/* SMS */
20   -#define OMAP34XX_SMS_BASE 0x6C000000
21   -
22   -/* SDRC */
23   -#define OMAP34XX_SDRC_BASE 0x6D000000
24   -
25   -/*
26   - * L4 Peripherals - L4 Wakeup and L4 Core now
27   - */
28   -#define OMAP34XX_CORE_L4_IO_BASE 0x48000000
29   -#define OMAP34XX_WAKEUP_L4_IO_BASE 0x48300000
30   -#define OMAP34XX_ID_L4_IO_BASE 0x4830A200
31   -#define OMAP34XX_L4_PER 0x49000000
32   -#define OMAP34XX_L4_IO_BASE OMAP34XX_CORE_L4_IO_BASE
33   -
34   -/* DMA4/SDMA */
35   -#define OMAP34XX_DMA4_BASE 0x48056000
36   -
37   -/* CONTROL */
38   -#define OMAP34XX_CTRL_BASE (OMAP34XX_L4_IO_BASE + 0x2000)
39   -
40   -#ifndef __ASSEMBLY__
41   -/* Signal Integrity Parameter Control Registers */
42   -struct control_prog_io {
43   - unsigned char res[0x408];
44   - unsigned int io2; /* 0x408 */
45   - unsigned char res2[0x38];
46   - unsigned int io0; /* 0x444 */
47   - unsigned int io1; /* 0x448 */
48   -};
49   -#endif /* __ASSEMBLY__ */
50   -
51   -/* Bit definition for CONTROL_PROG_IO1 */
52   -#define PRG_I2C2_PULLUPRESX 0x00000001
53   -
54   -/* UART */
55   -#define OMAP34XX_UART1 (OMAP34XX_L4_IO_BASE + 0x6a000)
56   -#define OMAP34XX_UART2 (OMAP34XX_L4_IO_BASE + 0x6c000)
57   -#define OMAP34XX_UART3 (OMAP34XX_L4_PER + 0x20000)
58   -#define OMAP34XX_UART4 (OMAP34XX_L4_PER + 0x42000)
59   -
60   -/* General Purpose Timers */
61   -#define OMAP34XX_GPT1 0x48318000
62   -#define OMAP34XX_GPT2 0x49032000
63   -#define OMAP34XX_GPT3 0x49034000
64   -#define OMAP34XX_GPT4 0x49036000
65   -#define OMAP34XX_GPT5 0x49038000
66   -#define OMAP34XX_GPT6 0x4903A000
67   -#define OMAP34XX_GPT7 0x4903C000
68   -#define OMAP34XX_GPT8 0x4903E000
69   -#define OMAP34XX_GPT9 0x49040000
70   -#define OMAP34XX_GPT10 0x48086000
71   -#define OMAP34XX_GPT11 0x48088000
72   -#define OMAP34XX_GPT12 0x48304000
73   -
74   -/* WatchDog Timers (1 secure, 3 GP) */
75   -#define WD1_BASE 0x4830C000
76   -#define WD2_BASE 0x48314000
77   -#define WD3_BASE 0x49030000
78   -
79   -/* 32KTIMER */
80   -#define SYNC_32KTIMER_BASE 0x48320000
81   -
82   -#ifndef __ASSEMBLY__
83   -
84   -struct s32ktimer {
85   - unsigned char res[0x10];
86   - unsigned int s32k_cr; /* 0x10 */
87   -};
88   -
89   -#endif /* __ASSEMBLY__ */
90   -
91   -#ifndef __ASSEMBLY__
92   -struct gpio {
93   - unsigned char res1[0x34];
94   - unsigned int oe; /* 0x34 */
95   - unsigned int datain; /* 0x38 */
96   - unsigned char res2[0x54];
97   - unsigned int cleardataout; /* 0x90 */
98   - unsigned int setdataout; /* 0x94 */
99   -};
100   -#endif /* __ASSEMBLY__ */
101   -
102   -#define GPIO0 (0x1 << 0)
103   -#define GPIO1 (0x1 << 1)
104   -#define GPIO2 (0x1 << 2)
105   -#define GPIO3 (0x1 << 3)
106   -#define GPIO4 (0x1 << 4)
107   -#define GPIO5 (0x1 << 5)
108   -#define GPIO6 (0x1 << 6)
109   -#define GPIO7 (0x1 << 7)
110   -#define GPIO8 (0x1 << 8)
111   -#define GPIO9 (0x1 << 9)
112   -#define GPIO10 (0x1 << 10)
113   -#define GPIO11 (0x1 << 11)
114   -#define GPIO12 (0x1 << 12)
115   -#define GPIO13 (0x1 << 13)
116   -#define GPIO14 (0x1 << 14)
117   -#define GPIO15 (0x1 << 15)
118   -#define GPIO16 (0x1 << 16)
119   -#define GPIO17 (0x1 << 17)
120   -#define GPIO18 (0x1 << 18)
121   -#define GPIO19 (0x1 << 19)
122   -#define GPIO20 (0x1 << 20)
123   -#define GPIO21 (0x1 << 21)
124   -#define GPIO22 (0x1 << 22)
125   -#define GPIO23 (0x1 << 23)
126   -#define GPIO24 (0x1 << 24)
127   -#define GPIO25 (0x1 << 25)
128   -#define GPIO26 (0x1 << 26)
129   -#define GPIO27 (0x1 << 27)
130   -#define GPIO28 (0x1 << 28)
131   -#define GPIO29 (0x1 << 29)
132   -#define GPIO30 (0x1 << 30)
133   -#define GPIO31 (0x1 << 31)
134   -
135   -/* base address for indirect vectors (internal boot mode) */
136   -#define SRAM_OFFSET0 0x40000000
137   -#define SRAM_OFFSET1 0x00200000
138   -#define SRAM_OFFSET2 0x0000F800
139   -#define SRAM_VECT_CODE (SRAM_OFFSET0 | SRAM_OFFSET1 | \
140   - SRAM_OFFSET2)
141   -#define SRAM_CLK_CODE (SRAM_VECT_CODE + 64)
142   -
143   -#define NON_SECURE_SRAM_START 0x40208000 /* Works for GP & EMU */
144   -#define NON_SECURE_SRAM_END 0x40210000
145   -
146   -#define LOW_LEVEL_SRAM_STACK 0x4020FFFC
147   -
148   -/* scratch area - accessible on both EMU and GP */
149   -#define OMAP3_PUBLIC_SRAM_SCRATCH_AREA NON_SECURE_SRAM_START
150   -
151   -#define DEBUG_LED1 149 /* gpio */
152   -#define DEBUG_LED2 150 /* gpio */
153   -
154   -#define XDR_POP 5 /* package on package part */
155   -#define SDR_DISCRETE 4 /* 128M memory SDR module */
156   -#define DDR_STACKED 3 /* stacked part on 2422 */
157   -#define DDR_COMBO 2 /* combo part on cpu daughter card */
158   -#define DDR_DISCRETE 1 /* 2x16 parts on daughter card */
159   -
160   -#define DDR_100 100 /* type found on most mem d-boards */
161   -#define DDR_111 111 /* some combo parts */
162   -#define DDR_133 133 /* most combo, some mem d-boards */
163   -#define DDR_165 165 /* future parts */
164   -
165   -#define CPU_3430 0x3430
166   -
167   -/*
168   - * 343x real hardware:
169   - * ES1 = rev 0
170   - *
171   - * ES2 onwards, the value maps to contents of IDCODE register [31:28].
172   - *
173   - * Note : CPU_3XX_ES20 is used in cache.S. Please review before changing.
174   - */
175   -#define CPU_3XX_ES10 0
176   -#define CPU_3XX_ES20 1
177   -#define CPU_3XX_ES21 2
178   -#define CPU_3XX_ES30 3
179   -#define CPU_3XX_ES31 4
180   -#define CPU_3XX_ES312 7
181   -#define CPU_3XX_MAX_REV 8
182   -
183   -/*
184   - * 37xx real hardware:
185   - * ES1.0 onwards, the value maps to contents of IDCODE register [31:28].
186   - */
187   -
188   -#define CPU_37XX_ES10 0
189   -#define CPU_37XX_ES11 1
190   -#define CPU_37XX_ES12 2
191   -#define CPU_37XX_MAX_REV 3
192   -
193   -#define CPU_3XX_ID_SHIFT 28
194   -
195   -#define WIDTH_8BIT 0x0000
196   -#define WIDTH_16BIT 0x1000 /* bit pos for 16 bit in gpmc */
197   -
198   -/*
199   - * Hawkeye values
200   - */
201   -#define HAWKEYE_OMAP34XX 0xb7ae
202   -#define HAWKEYE_AM35XX 0xb868
203   -#define HAWKEYE_OMAP36XX 0xb891
204   -
205   -#define HAWKEYE_SHIFT 12
206   -
207   -/*
208   - * Define CPU families
209   - */
210   -#define CPU_OMAP34XX 0x3400 /* OMAP34xx/OMAP35 devices */
211   -#define CPU_AM35XX 0x3500 /* AM35xx devices */
212   -#define CPU_OMAP36XX 0x3600 /* OMAP36xx devices */
213   -
214   -/*
215   - * Control status register values corresponding to cpu variants
216   - */
217   -#define OMAP3503 0x5c00
218   -#define OMAP3515 0x1c00
219   -#define OMAP3525 0x4c00
220   -#define OMAP3530 0x0c00
221   -
222   -#define AM3505 0x5c00
223   -#define AM3517 0x1c00
224   -
225   -#define OMAP3730 0x0c00
226   -
227   -/*
228   - * ROM code API related flags
229   - */
230   -#define OMAP3_GP_ROMCODE_API_L2_INVAL 1
231   -#define OMAP3_GP_ROMCODE_API_WRITE_ACR 3
232   -
233   -/*
234   - * EMU device PPA HAL related flags
235   - */
236   -#define OMAP3_EMU_HAL_API_L2_INVAL 40
237   -#define OMAP3_EMU_HAL_API_WRITE_ACR 42
238   -
239   -#define OMAP3_EMU_HAL_START_HAL_CRITICAL 4
240   -
241   -/* ABB settings */
242   -#define OMAP_ABB_SETTLING_TIME 30
243   -#define OMAP_ABB_CLOCK_CYCLES 8
244   -
245   -/* ABB tranxdone mask */
246   -#define OMAP_ABB_MPU_TXDONE_MASK (0x1 << 26)
247   -
248   -#endif
include/configs/am3517_crane.h
... ... @@ -23,7 +23,7 @@
23 23 #define CONFIG_EMIF4 /* The chip has EMIF4 controller */
24 24  
25 25 #include <asm/arch/cpu.h> /* get chip and board defs */
26   -#include <asm/arch/omap3.h>
  26 +#include <asm/arch/omap.h>
27 27  
28 28 /*
29 29 * Display CPU and Board information
include/configs/am3517_evm.h
... ... @@ -23,7 +23,7 @@
23 23 #define CONFIG_EMIF4 /* The chip has EMIF4 controller */
24 24  
25 25 #include <asm/arch/cpu.h> /* get chip and board defs */
26   -#include <asm/arch/omap3.h>
  26 +#include <asm/arch/omap.h>
27 27  
28 28 /*
29 29 * Display CPU and Board information
include/configs/cm_t35.h
... ... @@ -30,7 +30,7 @@
30 30 #define CONFIG_SDRC /* The chip has SDRC controller */
31 31  
32 32 #include <asm/arch/cpu.h> /* get chip and board defs */
33   -#include <asm/arch/omap3.h>
  33 +#include <asm/arch/omap.h>
34 34  
35 35 /*
36 36 * Display CPU and Board information
include/configs/cm_t3517.h
... ... @@ -30,7 +30,7 @@
30 30 #define CONFIG_EMIF4 /* The chip has EMIF4 controller */
31 31  
32 32 #include <asm/arch/cpu.h> /* get chip and board defs */
33   -#include <asm/arch/omap3.h>
  33 +#include <asm/arch/omap.h>
34 34  
35 35 /*
36 36 * Display CPU and Board information
include/configs/dig297.h
... ... @@ -36,7 +36,7 @@
36 36 #define CONFIG_SDRC /* The chip has SDRC controller */
37 37  
38 38 #include <asm/arch/cpu.h> /* get chip and board defs */
39   -#include <asm/arch/omap3.h>
  39 +#include <asm/arch/omap.h>
40 40  
41 41 /*
42 42 * Display CPU and Board information
include/configs/mcx.h
... ... @@ -26,7 +26,7 @@
26 26 #define CONFIG_EMIF4 /* The chip has EMIF4 controller */
27 27  
28 28 #include <asm/arch/cpu.h> /* get chip and board defs */
29   -#include <asm/arch/omap3.h>
  29 +#include <asm/arch/omap.h>
30 30  
31 31 #define CONFIG_OF_LIBFDT
32 32 #define CONFIG_FIT
include/configs/nokia_rx51.h
... ... @@ -42,7 +42,7 @@
42 42 #define CONFIG_SDRC /* The chip has SDRC controller */
43 43  
44 44 #include <asm/arch/cpu.h> /* get chip and board defs */
45   -#include <asm/arch/omap3.h>
  45 +#include <asm/arch/omap.h>
46 46 #include <asm/arch/mem.h>
47 47 #include <linux/stringify.h>
48 48  
include/configs/omap3_evm.h
... ... @@ -18,7 +18,7 @@
18 18 #define __OMAP3EVM_CONFIG_H
19 19  
20 20 #include <asm/arch/cpu.h>
21   -#include <asm/arch/omap3.h>
  21 +#include <asm/arch/omap.h>
22 22  
23 23 /* ----------------------------------------------------------------------------
24 24 * Supported U-boot commands
include/configs/omap3_evm_quick_mmc.h
... ... @@ -13,7 +13,7 @@
13 13 #define __OMAP3_EVM_QUICK_MMC_H
14 14  
15 15 #include <asm/arch/cpu.h>
16   -#include <asm/arch/omap3.h>
  16 +#include <asm/arch/omap.h>
17 17  
18 18 /* ----------------------------------------------------------------------------
19 19 * Supported U-boot commands
include/configs/omap3_evm_quick_nand.h
... ... @@ -13,7 +13,7 @@
13 13 #define __OMAP3_EVM_QUICK_NAND_H
14 14  
15 15 #include <asm/arch/cpu.h>
16   -#include <asm/arch/omap3.h>
  16 +#include <asm/arch/omap.h>
17 17  
18 18 /* ----------------------------------------------------------------------------
19 19 * Supported U-boot commands
include/configs/omap3_logic.h
... ... @@ -24,7 +24,7 @@
24 24 #define CONFIG_SDRC /* The chip has SDRC controller */
25 25  
26 26 #include <asm/arch/cpu.h> /* get chip and board defs */
27   -#include <asm/arch/omap3.h>
  27 +#include <asm/arch/omap.h>
28 28  
29 29 /*
30 30 * Display CPU and Board information
include/configs/omap3_mvblx.h
... ... @@ -27,7 +27,7 @@
27 27 #define CONFIG_SDRC /* The chip has SDRC controller */
28 28  
29 29 #include <asm/arch/cpu.h> /* get chip and board defs */
30   -#include <asm/arch/omap3.h>
  30 +#include <asm/arch/omap.h>
31 31  
32 32 /*
33 33 * Display CPU and Board information
include/configs/omap3_pandora.h
... ... @@ -21,7 +21,7 @@
21 21 #define CONFIG_SDRC /* The chip has SDRC controller */
22 22  
23 23 #include <asm/arch/cpu.h> /* get chip and board defs */
24   -#include <asm/arch/omap3.h>
  24 +#include <asm/arch/omap.h>
25 25  
26 26 /*
27 27 * Display CPU and Board information
include/configs/omap3_sdp3430.h
... ... @@ -27,7 +27,7 @@
27 27 #define CONFIG_SDRC /* The chip has SDRC controller */
28 28  
29 29 #include <asm/arch/cpu.h> /* get chip and board defs */
30   -#include <asm/arch/omap3.h>
  30 +#include <asm/arch/omap.h>
31 31  
32 32 /*
33 33 * NOTE: these #defines presume standard SDP jumper settings.
include/configs/omap3_zoom1.h
... ... @@ -22,7 +22,7 @@
22 22 #define CONFIG_NAND
23 23 #define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */
24 24 #include <asm/arch/cpu.h> /* get chip and board defs */
25   -#include <asm/arch/omap3.h>
  25 +#include <asm/arch/omap.h>
26 26 #include <configs/ti_omap3_common.h>
27 27  
28 28 /* Remove SPL boot option - we do not support that on LDP yet */
include/configs/tam3517-common.h
... ... @@ -25,7 +25,7 @@
25 25 #define CONFIG_EMIF4 /* The chip has EMIF4 controller */
26 26  
27 27 #include <asm/arch/cpu.h> /* get chip and board defs */
28   -#include <asm/arch/omap3.h>
  28 +#include <asm/arch/omap.h>
29 29  
30 30 /*
31 31 * Display CPU and Board information
include/configs/tao3530.h
... ... @@ -27,7 +27,7 @@
27 27 #define CONFIG_SDRC /* Has an SDRC controller */
28 28  
29 29 #include <asm/arch/cpu.h> /* get chip and board defs */
30   -#include <asm/arch/omap3.h>
  30 +#include <asm/arch/omap.h>
31 31  
32 32 /*
33 33 * Display CPU and Board information
include/configs/ti_omap3_common.h
... ... @@ -16,7 +16,7 @@
16 16  
17 17  
18 18 #include <asm/arch/cpu.h>
19   -#include <asm/arch/omap3.h>
  19 +#include <asm/arch/omap.h>
20 20  
21 21 #ifndef CONFIG_SPL_BUILD
22 22 # define CONFIG_OMAP_SERIAL
include/configs/tricorder.h
... ... @@ -32,7 +32,7 @@
32 32 #define CONFIG_SDRC /* The chip has SDRC controller */
33 33  
34 34 #include <asm/arch/cpu.h> /* get chip and board defs */
35   -#include <asm/arch/omap3.h>
  35 +#include <asm/arch/omap.h>
36 36  
37 37 #define CONFIG_SYS_GENERIC_BOARD
38 38