diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-01 23:58:25 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-01 23:58:25 -0400 |
commit | 81a3c10ce8a7fd5bf9a06bfc38bd417512911831 (patch) | |
tree | 12ceac10fae8c4b2dc17b362672a5db305a8d960 /arch/arm/plat-omap/include | |
parent | 6585dea1f99cc2265582ff2e4cc1727062136e92 (diff) | |
parent | df80442d1ee2902c2e39f90f18160f2e08d14c06 (diff) |
Merge branch 'next/cleanup2' of git://git.linaro.org/people/arnd/arm-soc
* 'next/cleanup2' of git://git.linaro.org/people/arnd/arm-soc: (31 commits)
ARM: OMAP: Warn if omap_ioremap is called before SoC detection
ARM: OMAP: Move set_globals initialization to happen in init_early
ARM: OMAP: Map SRAM later on with ioremap_exec()
ARM: OMAP: Remove calls to SRAM allocations for framebuffer
ARM: OMAP: Avoid cpu_is_omapxxxx usage until map_io is done
ARM: OMAP1: Use generic map_io, init_early and init_irq
arm/dts: OMAP3+: Add mpu, dsp and iva nodes
arm/dts: OMAP4: Add a main ocp entry bound to l3-noc driver
ARM: OMAP2+: l3-noc: Add support for device-tree
ARM: OMAP2+: board-generic: Add i2c static init
ARM: OMAP2+: board-generic: Add DT support to generic board
arm/dts: Add support for OMAP3 Beagle board
arm/dts: Add initial device tree support for OMAP3 SoC
arm/dts: Add support for OMAP4 SDP board
arm/dts: Add support for OMAP4 PandaBoard
arm/dts: Add initial device tree support for OMAP4 SoC
ARM: OMAP: omap_device: Add a method to build an omap_device from a DT node
ARM: OMAP: omap_device: Add omap_device_[alloc|delete] for DT integration
of: Add helpers to get one string in multiple strings property
ARM: OMAP2+: devices: Remove all omap_device_pm_latency structures
...
Fix up trivial header file conflicts in arch/arm/mach-omap2/board-generic.c
Diffstat (limited to 'arch/arm/plat-omap/include')
-rw-r--r-- | arch/arm/plat-omap/include/plat/common.h | 17 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/plat/io.h | 33 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/plat/omap_device.h | 1 |
3 files changed, 40 insertions, 11 deletions
diff --git a/arch/arm/plat-omap/include/plat/common.h b/arch/arm/plat-omap/include/plat/common.h index abda2c7e499..c50df4814f6 100644 --- a/arch/arm/plat-omap/include/plat/common.h +++ b/arch/arm/plat-omap/include/plat/common.h | |||
@@ -50,10 +50,13 @@ void omap2430_init_early(void); | |||
50 | void omap3430_init_early(void); | 50 | void omap3430_init_early(void); |
51 | void omap35xx_init_early(void); | 51 | void omap35xx_init_early(void); |
52 | void omap3630_init_early(void); | 52 | void omap3630_init_early(void); |
53 | void omap3_init_early(void); /* Do not use this one */ | ||
53 | void am35xx_init_early(void); | 54 | void am35xx_init_early(void); |
54 | void ti816x_init_early(void); | 55 | void ti816x_init_early(void); |
55 | void omap4430_init_early(void); | 56 | void omap4430_init_early(void); |
56 | 57 | ||
58 | void omap_sram_init(void); | ||
59 | |||
57 | /* | 60 | /* |
58 | * IO bases for various OMAP processors | 61 | * IO bases for various OMAP processors |
59 | * Except the tap base, rest all the io bases | 62 | * Except the tap base, rest all the io bases |
@@ -62,13 +65,13 @@ void omap4430_init_early(void); | |||
62 | struct omap_globals { | 65 | struct omap_globals { |
63 | u32 class; /* OMAP class to detect */ | 66 | u32 class; /* OMAP class to detect */ |
64 | void __iomem *tap; /* Control module ID code */ | 67 | void __iomem *tap; /* Control module ID code */ |
65 | unsigned long sdrc; /* SDRAM Controller */ | 68 | void __iomem *sdrc; /* SDRAM Controller */ |
66 | unsigned long sms; /* SDRAM Memory Scheduler */ | 69 | void __iomem *sms; /* SDRAM Memory Scheduler */ |
67 | unsigned long ctrl; /* System Control Module */ | 70 | void __iomem *ctrl; /* System Control Module */ |
68 | unsigned long ctrl_pad; /* PAD Control Module */ | 71 | void __iomem *ctrl_pad; /* PAD Control Module */ |
69 | unsigned long prm; /* Power and Reset Management */ | 72 | void __iomem *prm; /* Power and Reset Management */ |
70 | unsigned long cm; /* Clock Management */ | 73 | void __iomem *cm; /* Clock Management */ |
71 | unsigned long cm2; | 74 | void __iomem *cm2; |
72 | }; | 75 | }; |
73 | 76 | ||
74 | void omap2_set_globals_242x(void); | 77 | void omap2_set_globals_242x(void); |
diff --git a/arch/arm/plat-omap/include/plat/io.h b/arch/arm/plat-omap/include/plat/io.h index a93a00db93d..7f2969eadb8 100644 --- a/arch/arm/plat-omap/include/plat/io.h +++ b/arch/arm/plat-omap/include/plat/io.h | |||
@@ -228,13 +228,13 @@ | |||
228 | 228 | ||
229 | #define OMAP44XX_EMIF2_PHYS OMAP44XX_EMIF2_BASE | 229 | #define OMAP44XX_EMIF2_PHYS OMAP44XX_EMIF2_BASE |
230 | /* 0x4d000000 --> 0xfd200000 */ | 230 | /* 0x4d000000 --> 0xfd200000 */ |
231 | #define OMAP44XX_EMIF2_VIRT (OMAP44XX_EMIF2_PHYS + OMAP4_L3_PER_IO_OFFSET) | ||
232 | #define OMAP44XX_EMIF2_SIZE SZ_1M | 231 | #define OMAP44XX_EMIF2_SIZE SZ_1M |
232 | #define OMAP44XX_EMIF2_VIRT (OMAP44XX_EMIF1_VIRT + OMAP44XX_EMIF1_SIZE) | ||
233 | 233 | ||
234 | #define OMAP44XX_DMM_PHYS OMAP44XX_DMM_BASE | 234 | #define OMAP44XX_DMM_PHYS OMAP44XX_DMM_BASE |
235 | /* 0x4e000000 --> 0xfd300000 */ | 235 | /* 0x4e000000 --> 0xfd300000 */ |
236 | #define OMAP44XX_DMM_VIRT (OMAP44XX_DMM_PHYS + OMAP4_L3_PER_IO_OFFSET) | ||
237 | #define OMAP44XX_DMM_SIZE SZ_1M | 236 | #define OMAP44XX_DMM_SIZE SZ_1M |
237 | #define OMAP44XX_DMM_VIRT (OMAP44XX_EMIF2_VIRT + OMAP44XX_EMIF2_SIZE) | ||
238 | /* | 238 | /* |
239 | * ---------------------------------------------------------------------------- | 239 | * ---------------------------------------------------------------------------- |
240 | * Omap specific register access | 240 | * Omap specific register access |
@@ -247,6 +247,8 @@ | |||
247 | * NOTE: Please use ioremap + __raw_read/write where possible instead of these | 247 | * NOTE: Please use ioremap + __raw_read/write where possible instead of these |
248 | */ | 248 | */ |
249 | 249 | ||
250 | void omap_ioremap_init(void); | ||
251 | |||
250 | extern u8 omap_readb(u32 pa); | 252 | extern u8 omap_readb(u32 pa); |
251 | extern u16 omap_readw(u32 pa); | 253 | extern u16 omap_readw(u32 pa); |
252 | extern u32 omap_readl(u32 pa); | 254 | extern u32 omap_readl(u32 pa); |
@@ -256,8 +258,31 @@ extern void omap_writel(u32 v, u32 pa); | |||
256 | 258 | ||
257 | struct omap_sdrc_params; | 259 | struct omap_sdrc_params; |
258 | 260 | ||
259 | extern void omap1_map_common_io(void); | 261 | #if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850) |
260 | extern void omap1_init_common_hw(void); | 262 | void omap7xx_map_io(void); |
263 | #else | ||
264 | static inline void omap_map_io(void) | ||
265 | { | ||
266 | } | ||
267 | #endif | ||
268 | |||
269 | #ifdef CONFIG_ARCH_OMAP15XX | ||
270 | void omap15xx_map_io(void); | ||
271 | #else | ||
272 | static inline void omap15xx_map_io(void) | ||
273 | { | ||
274 | } | ||
275 | #endif | ||
276 | |||
277 | #ifdef CONFIG_ARCH_OMAP16XX | ||
278 | void omap16xx_map_io(void); | ||
279 | #else | ||
280 | static inline void omap16xx_map_io(void) | ||
281 | { | ||
282 | } | ||
283 | #endif | ||
284 | |||
285 | void omap1_init_early(void); | ||
261 | 286 | ||
262 | #ifdef CONFIG_SOC_OMAP2420 | 287 | #ifdef CONFIG_SOC_OMAP2420 |
263 | extern void omap242x_map_common_io(void); | 288 | extern void omap242x_map_common_io(void); |
diff --git a/arch/arm/plat-omap/include/plat/omap_device.h b/arch/arm/plat-omap/include/plat/omap_device.h index d4d9b96f961..12c5b0c345b 100644 --- a/arch/arm/plat-omap/include/plat/omap_device.h +++ b/arch/arm/plat-omap/include/plat/omap_device.h | |||
@@ -101,6 +101,7 @@ struct platform_device *omap_device_build_ss(const char *pdev_name, int pdev_id, | |||
101 | int pm_lats_cnt, int is_early_device); | 101 | int pm_lats_cnt, int is_early_device); |
102 | 102 | ||
103 | void __iomem *omap_device_get_rt_va(struct omap_device *od); | 103 | void __iomem *omap_device_get_rt_va(struct omap_device *od); |
104 | struct device *omap_device_get_by_hwmod_name(const char *oh_name); | ||
104 | 105 | ||
105 | /* OMAP PM interface */ | 106 | /* OMAP PM interface */ |
106 | int omap_device_align_pm_lat(struct platform_device *pdev, | 107 | int omap_device_align_pm_lat(struct platform_device *pdev, |