aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/arm/mach-omap2/Makefile2
-rw-r--r--arch/arm/mach-omap2/soc.h140
2 files changed, 22 insertions, 120 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 0ba6a0e6fa19..04e276ce8413 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -2,7 +2,7 @@
2# Makefile for the linux kernel. 2# Makefile for the linux kernel.
3# 3#
4 4
5ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \ 5ccflags-y := -I$(srctree)/$(src)/include \
6 -I$(srctree)/arch/arm/plat-omap/include 6 -I$(srctree)/arch/arm/plat-omap/include
7 7
8# Common support 8# Common support
diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h
index 70df8f6cddcc..8862c095095f 100644
--- a/arch/arm/mach-omap2/soc.h
+++ b/arch/arm/mach-omap2/soc.h
@@ -39,82 +39,10 @@
39#include <linux/of.h> 39#include <linux/of.h>
40 40
41/* 41/*
42 * Test if multicore OMAP support is needed 42 * OMAP2+ is always defined as ARCH_MULTIPLATFORM in Kconfig
43 */ 43 */
44#undef MULTI_OMAP2 44#undef MULTI_OMAP2
45#undef OMAP_NAME
46
47#ifdef CONFIG_ARCH_MULTIPLATFORM
48#define MULTI_OMAP2 45#define MULTI_OMAP2
49#endif
50#ifdef CONFIG_SOC_OMAP2420
51# ifdef OMAP_NAME
52# undef MULTI_OMAP2
53# define MULTI_OMAP2
54# else
55# define OMAP_NAME omap2420
56# endif
57#endif
58#ifdef CONFIG_SOC_OMAP2430
59# ifdef OMAP_NAME
60# undef MULTI_OMAP2
61# define MULTI_OMAP2
62# else
63# define OMAP_NAME omap2430
64# endif
65#endif
66#ifdef CONFIG_ARCH_OMAP3
67# ifdef OMAP_NAME
68# undef MULTI_OMAP2
69# define MULTI_OMAP2
70# else
71# define OMAP_NAME omap3
72# endif
73#endif
74#ifdef CONFIG_ARCH_OMAP4
75# ifdef OMAP_NAME
76# undef MULTI_OMAP2
77# define MULTI_OMAP2
78# else
79# define OMAP_NAME omap4
80# endif
81#endif
82
83#ifdef CONFIG_SOC_OMAP5
84# ifdef OMAP_NAME
85# undef MULTI_OMAP2
86# define MULTI_OMAP2
87# else
88# define OMAP_NAME omap5
89# endif
90#endif
91
92#ifdef CONFIG_SOC_AM33XX
93# ifdef OMAP_NAME
94# undef MULTI_OMAP2
95# define MULTI_OMAP2
96# else
97# define OMAP_NAME am33xx
98# endif
99#endif
100
101#ifdef CONFIG_SOC_AM43XX
102# ifdef OMAP_NAME
103# undef MULTI_OMAP2
104# define MULTI_OMAP2
105# else
106# define OMAP_NAME am43xx
107# endif
108#endif
109
110#ifdef CONFIG_SOC_DRA7XX
111# ifdef OMAP_NAME
112# undef MULTI_OMAP2
113# define MULTI_OMAP2
114# else
115# define OMAP_NAME DRA7XX
116# endif
117#endif
118 46
119/* 47/*
120 * Omap device type i.e. EMU/HS/TST/GP/BAD 48 * Omap device type i.e. EMU/HS/TST/GP/BAD
@@ -242,11 +170,6 @@ IS_AM_SUBCLASS(437x, 0x437)
242IS_DRA_SUBCLASS(75x, 0x75) 170IS_DRA_SUBCLASS(75x, 0x75)
243IS_DRA_SUBCLASS(72x, 0x72) 171IS_DRA_SUBCLASS(72x, 0x72)
244 172
245#define soc_is_omap24xx() 0
246#define soc_is_omap242x() 0
247#define soc_is_omap243x() 0
248#define soc_is_omap34xx() 0
249#define soc_is_omap343x() 0
250#define soc_is_ti81xx() 0 173#define soc_is_ti81xx() 0
251#define soc_is_ti816x() 0 174#define soc_is_ti816x() 0
252#define soc_is_ti814x() 0 175#define soc_is_ti814x() 0
@@ -265,46 +188,27 @@ IS_DRA_SUBCLASS(72x, 0x72)
265#define soc_is_dra74x() 0 188#define soc_is_dra74x() 0
266#define soc_is_dra72x() 0 189#define soc_is_dra72x() 0
267 190
268#if defined(MULTI_OMAP2) 191#if defined(CONFIG_ARCH_OMAP2)
269# if defined(CONFIG_ARCH_OMAP2) 192# define soc_is_omap24xx() is_omap24xx()
270# undef soc_is_omap24xx
271# define soc_is_omap24xx() is_omap24xx()
272# endif
273# if defined (CONFIG_SOC_OMAP2420)
274# undef soc_is_omap242x
275# define soc_is_omap242x() is_omap242x()
276# endif
277# if defined (CONFIG_SOC_OMAP2430)
278# undef soc_is_omap243x
279# define soc_is_omap243x() is_omap243x()
280# endif
281# if defined(CONFIG_ARCH_OMAP3)
282# undef soc_is_omap34xx
283# undef soc_is_omap343x
284# define soc_is_omap34xx() is_omap34xx()
285# define soc_is_omap343x() is_omap343x()
286# endif
287#else 193#else
288# if defined(CONFIG_ARCH_OMAP2) 194# define soc_is_omap24xx() 0
289# undef soc_is_omap24xx 195#endif
290# define soc_is_omap24xx() 1 196#if defined(CONFIG_SOC_OMAP2420)
291# endif 197# define soc_is_omap242x() is_omap242x()
292# if defined(CONFIG_SOC_OMAP2420) 198#else
293# undef soc_is_omap242x 199# define soc_is_omap242x() 0
294# define soc_is_omap242x() 1 200#endif
295# endif 201#if defined(CONFIG_SOC_OMAP2430)
296# if defined(CONFIG_SOC_OMAP2430) 202# define soc_is_omap243x() is_omap243x()
297# undef soc_is_omap243x 203#else
298# define soc_is_omap243x() 1 204# define soc_is_omap243x() 0
299# endif 205#endif
300# if defined(CONFIG_ARCH_OMAP3) 206#if defined(CONFIG_ARCH_OMAP3)
301# undef soc_is_omap34xx 207# define soc_is_omap34xx() is_omap34xx()
302# define soc_is_omap34xx() 1 208# define soc_is_omap343x() is_omap343x()
303# endif 209#else
304# if defined(CONFIG_SOC_OMAP3430) 210# define soc_is_omap34xx() 0
305# undef soc_is_omap343x 211# define soc_is_omap343x() 0
306# define soc_is_omap343x() 1
307# endif
308#endif 212#endif
309 213
310/* 214/*
@@ -339,7 +243,6 @@ IS_OMAP_TYPE(3430, 0x3430)
339#define soc_is_omap5430() 0 243#define soc_is_omap5430() 0
340 244
341/* These are needed for the common code */ 245/* These are needed for the common code */
342#ifdef CONFIG_ARCH_OMAP2PLUS
343#define soc_is_omap7xx() 0 246#define soc_is_omap7xx() 0
344#define soc_is_omap15xx() 0 247#define soc_is_omap15xx() 0
345#define soc_is_omap16xx() 0 248#define soc_is_omap16xx() 0
@@ -350,7 +253,6 @@ IS_OMAP_TYPE(3430, 0x3430)
350#define soc_is_omap1710() 0 253#define soc_is_omap1710() 0
351#define cpu_class_is_omap1() 0 254#define cpu_class_is_omap1() 0
352#define cpu_class_is_omap2() 1 255#define cpu_class_is_omap2() 1
353#endif
354 256
355#if defined(CONFIG_ARCH_OMAP2) 257#if defined(CONFIG_ARCH_OMAP2)
356# undef soc_is_omap2420 258# undef soc_is_omap2420
generated by cgit v1.2.2 (git 2.25.0) at 2026-04-27 23:48:58 -0400