ARM: OMAP1: Remove relative includes
As discussed on linux-arm-kernel, we want to avoid relative includes for the arch/arm/*omap* code: http://www.spinics.net/lists/linux-omap/msg80520.html Note that eventually when the omap1 specific drivers are fixed to not use cpu_is_omap macros and not depend on mach/hardware.h, this patch can be reverted and these headers can be local. But since just fixing the drivers for omap2+ is already a big enough hassle, let's deal with that properly first. [tony@atomide.com: also drop unused include for ispvideo.c] Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Tony Lindgren
parent
8280960181
commit
4e969010c5
|
|
@ -13,8 +13,6 @@
|
||||||
#include <mach/hardware.h>
|
#include <mach/hardware.h>
|
||||||
#include <mach/irqs.h>
|
#include <mach/irqs.h>
|
||||||
|
|
||||||
#include "../../iomap.h"
|
|
||||||
|
|
||||||
.macro get_irqnr_preamble, base, tmp
|
.macro get_irqnr_preamble, base, tmp
|
||||||
.endm
|
.endm
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,7 @@
|
||||||
#include <asm/sizes.h>
|
#include <asm/sizes.h>
|
||||||
#ifndef __ASSEMBLER__
|
#ifndef __ASSEMBLER__
|
||||||
#include <asm/types.h>
|
#include <asm/types.h>
|
||||||
#include "../../mach-omap1/soc.h"
|
#include <mach/soc.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* NOTE: Please use ioremap + __raw_read/write where possible instead of these
|
* NOTE: Please use ioremap + __raw_read/write where possible instead of these
|
||||||
|
|
@ -72,6 +72,9 @@ static inline u32 omap_cs3_phys(void)
|
||||||
|
|
||||||
#endif /* ifndef __ASSEMBLER__ */
|
#endif /* ifndef __ASSEMBLER__ */
|
||||||
|
|
||||||
|
#define OMAP1_IO_OFFSET 0x01000000 /* Virtual IO = 0xfefb0000 */
|
||||||
|
#define OMAP1_IO_ADDRESS(pa) IOMEM((pa) - OMAP1_IO_OFFSET)
|
||||||
|
|
||||||
#include <mach/serial.h>
|
#include <mach/serial.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@
|
||||||
* because of the strncmp().
|
* because of the strncmp().
|
||||||
*/
|
*/
|
||||||
#if defined(CONFIG_ARCH_OMAP15XX) && !defined(__ASSEMBLER__)
|
#if defined(CONFIG_ARCH_OMAP15XX) && !defined(__ASSEMBLER__)
|
||||||
#include "../../mach-omap1/soc.h"
|
#include <mach/soc.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* OMAP-1510 Local Bus address offset
|
* OMAP-1510 Local Bus address offset
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,229 @@
|
||||||
|
/*
|
||||||
|
* OMAP cpu type detection
|
||||||
|
*
|
||||||
|
* Copyright (C) 2004, 2008 Nokia Corporation
|
||||||
|
*
|
||||||
|
* Copyright (C) 2009-11 Texas Instruments.
|
||||||
|
*
|
||||||
|
* Written by Tony Lindgren <tony.lindgren@nokia.com>
|
||||||
|
*
|
||||||
|
* Added OMAP4/5 specific defines - Santosh Shilimkar<santosh.shilimkar@ti.com>
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef __ASM_ARCH_OMAP_CPU_H
|
||||||
|
#define __ASM_ARCH_OMAP_CPU_H
|
||||||
|
|
||||||
|
#ifndef __ASSEMBLY__
|
||||||
|
|
||||||
|
#include <linux/bitops.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Test if multicore OMAP support is needed
|
||||||
|
*/
|
||||||
|
#undef MULTI_OMAP1
|
||||||
|
#undef OMAP_NAME
|
||||||
|
|
||||||
|
#ifdef CONFIG_ARCH_OMAP730
|
||||||
|
# ifdef OMAP_NAME
|
||||||
|
# undef MULTI_OMAP1
|
||||||
|
# define MULTI_OMAP1
|
||||||
|
# else
|
||||||
|
# define OMAP_NAME omap730
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
#ifdef CONFIG_ARCH_OMAP850
|
||||||
|
# ifdef OMAP_NAME
|
||||||
|
# undef MULTI_OMAP1
|
||||||
|
# define MULTI_OMAP1
|
||||||
|
# else
|
||||||
|
# define OMAP_NAME omap850
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
#ifdef CONFIG_ARCH_OMAP15XX
|
||||||
|
# ifdef OMAP_NAME
|
||||||
|
# undef MULTI_OMAP1
|
||||||
|
# define MULTI_OMAP1
|
||||||
|
# else
|
||||||
|
# define OMAP_NAME omap1510
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
#ifdef CONFIG_ARCH_OMAP16XX
|
||||||
|
# ifdef OMAP_NAME
|
||||||
|
# undef MULTI_OMAP1
|
||||||
|
# define MULTI_OMAP1
|
||||||
|
# else
|
||||||
|
# define OMAP_NAME omap16xx
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* omap_rev bits:
|
||||||
|
* CPU id bits (0730, 1510, 1710, 2422...) [31:16]
|
||||||
|
* CPU revision (See _REV_ defined in cpu.h) [15:08]
|
||||||
|
* CPU class bits (15xx, 16xx, 24xx, 34xx...) [07:00]
|
||||||
|
*/
|
||||||
|
unsigned int omap_rev(void);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Get the CPU revision for OMAP devices
|
||||||
|
*/
|
||||||
|
#define GET_OMAP_REVISION() ((omap_rev() >> 8) & 0xff)
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Macros to group OMAP into cpu classes.
|
||||||
|
* These can be used in most places.
|
||||||
|
* cpu_is_omap7xx(): True for OMAP730, OMAP850
|
||||||
|
* cpu_is_omap15xx(): True for OMAP1510, OMAP5910 and OMAP310
|
||||||
|
* cpu_is_omap16xx(): True for OMAP1610, OMAP5912 and OMAP1710
|
||||||
|
*/
|
||||||
|
#define GET_OMAP_CLASS (omap_rev() & 0xff)
|
||||||
|
|
||||||
|
#define IS_OMAP_CLASS(class, id) \
|
||||||
|
static inline int is_omap ##class (void) \
|
||||||
|
{ \
|
||||||
|
return (GET_OMAP_CLASS == (id)) ? 1 : 0; \
|
||||||
|
}
|
||||||
|
|
||||||
|
#define GET_OMAP_SUBCLASS ((omap_rev() >> 20) & 0x0fff)
|
||||||
|
|
||||||
|
#define IS_OMAP_SUBCLASS(subclass, id) \
|
||||||
|
static inline int is_omap ##subclass (void) \
|
||||||
|
{ \
|
||||||
|
return (GET_OMAP_SUBCLASS == (id)) ? 1 : 0; \
|
||||||
|
}
|
||||||
|
|
||||||
|
IS_OMAP_CLASS(7xx, 0x07)
|
||||||
|
IS_OMAP_CLASS(15xx, 0x15)
|
||||||
|
IS_OMAP_CLASS(16xx, 0x16)
|
||||||
|
|
||||||
|
#define cpu_is_omap7xx() 0
|
||||||
|
#define cpu_is_omap15xx() 0
|
||||||
|
#define cpu_is_omap16xx() 0
|
||||||
|
|
||||||
|
#if defined(MULTI_OMAP1)
|
||||||
|
# if defined(CONFIG_ARCH_OMAP730)
|
||||||
|
# undef cpu_is_omap7xx
|
||||||
|
# define cpu_is_omap7xx() is_omap7xx()
|
||||||
|
# endif
|
||||||
|
# if defined(CONFIG_ARCH_OMAP850)
|
||||||
|
# undef cpu_is_omap7xx
|
||||||
|
# define cpu_is_omap7xx() is_omap7xx()
|
||||||
|
# endif
|
||||||
|
# if defined(CONFIG_ARCH_OMAP15XX)
|
||||||
|
# undef cpu_is_omap15xx
|
||||||
|
# define cpu_is_omap15xx() is_omap15xx()
|
||||||
|
# endif
|
||||||
|
# if defined(CONFIG_ARCH_OMAP16XX)
|
||||||
|
# undef cpu_is_omap16xx
|
||||||
|
# define cpu_is_omap16xx() is_omap16xx()
|
||||||
|
# endif
|
||||||
|
#else
|
||||||
|
# if defined(CONFIG_ARCH_OMAP730)
|
||||||
|
# undef cpu_is_omap7xx
|
||||||
|
# define cpu_is_omap7xx() 1
|
||||||
|
# endif
|
||||||
|
# if defined(CONFIG_ARCH_OMAP850)
|
||||||
|
# undef cpu_is_omap7xx
|
||||||
|
# define cpu_is_omap7xx() 1
|
||||||
|
# endif
|
||||||
|
# if defined(CONFIG_ARCH_OMAP15XX)
|
||||||
|
# undef cpu_is_omap15xx
|
||||||
|
# define cpu_is_omap15xx() 1
|
||||||
|
# endif
|
||||||
|
# if defined(CONFIG_ARCH_OMAP16XX)
|
||||||
|
# undef cpu_is_omap16xx
|
||||||
|
# define cpu_is_omap16xx() 1
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Macros to detect individual cpu types.
|
||||||
|
* These are only rarely needed.
|
||||||
|
* cpu_is_omap310(): True for OMAP310
|
||||||
|
* cpu_is_omap1510(): True for OMAP1510
|
||||||
|
* cpu_is_omap1610(): True for OMAP1610
|
||||||
|
* cpu_is_omap1611(): True for OMAP1611
|
||||||
|
* cpu_is_omap5912(): True for OMAP5912
|
||||||
|
* cpu_is_omap1621(): True for OMAP1621
|
||||||
|
* cpu_is_omap1710(): True for OMAP1710
|
||||||
|
*/
|
||||||
|
#define GET_OMAP_TYPE ((omap_rev() >> 16) & 0xffff)
|
||||||
|
|
||||||
|
#define IS_OMAP_TYPE(type, id) \
|
||||||
|
static inline int is_omap ##type (void) \
|
||||||
|
{ \
|
||||||
|
return (GET_OMAP_TYPE == (id)) ? 1 : 0; \
|
||||||
|
}
|
||||||
|
|
||||||
|
IS_OMAP_TYPE(310, 0x0310)
|
||||||
|
IS_OMAP_TYPE(1510, 0x1510)
|
||||||
|
IS_OMAP_TYPE(1610, 0x1610)
|
||||||
|
IS_OMAP_TYPE(1611, 0x1611)
|
||||||
|
IS_OMAP_TYPE(5912, 0x1611)
|
||||||
|
IS_OMAP_TYPE(1621, 0x1621)
|
||||||
|
IS_OMAP_TYPE(1710, 0x1710)
|
||||||
|
|
||||||
|
#define cpu_is_omap310() 0
|
||||||
|
#define cpu_is_omap1510() 0
|
||||||
|
#define cpu_is_omap1610() 0
|
||||||
|
#define cpu_is_omap5912() 0
|
||||||
|
#define cpu_is_omap1611() 0
|
||||||
|
#define cpu_is_omap1621() 0
|
||||||
|
#define cpu_is_omap1710() 0
|
||||||
|
|
||||||
|
/* These are needed to compile common code */
|
||||||
|
#ifdef CONFIG_ARCH_OMAP1
|
||||||
|
#define cpu_is_omap242x() 0
|
||||||
|
#define cpu_is_omap2430() 0
|
||||||
|
#define cpu_is_omap243x() 0
|
||||||
|
#define cpu_is_omap24xx() 0
|
||||||
|
#define cpu_is_omap34xx() 0
|
||||||
|
#define cpu_is_omap44xx() 0
|
||||||
|
#define soc_is_omap54xx() 0
|
||||||
|
#define soc_is_am33xx() 0
|
||||||
|
#define cpu_class_is_omap1() 1
|
||||||
|
#define cpu_class_is_omap2() 0
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Whether we have MULTI_OMAP1 or not, we still need to distinguish
|
||||||
|
* between 310 vs. 1510 and 1611B/5912 vs. 1710.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#if defined(CONFIG_ARCH_OMAP15XX)
|
||||||
|
# undef cpu_is_omap310
|
||||||
|
# undef cpu_is_omap1510
|
||||||
|
# define cpu_is_omap310() is_omap310()
|
||||||
|
# define cpu_is_omap1510() is_omap1510()
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(CONFIG_ARCH_OMAP16XX)
|
||||||
|
# undef cpu_is_omap1610
|
||||||
|
# undef cpu_is_omap1611
|
||||||
|
# undef cpu_is_omap5912
|
||||||
|
# undef cpu_is_omap1621
|
||||||
|
# undef cpu_is_omap1710
|
||||||
|
# define cpu_is_omap1610() is_omap1610()
|
||||||
|
# define cpu_is_omap1611() is_omap1611()
|
||||||
|
# define cpu_is_omap5912() is_omap5912()
|
||||||
|
# define cpu_is_omap1621() is_omap1621()
|
||||||
|
# define cpu_is_omap1710() is_omap1710()
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif /* __ASSEMBLY__ */
|
||||||
|
#endif
|
||||||
|
|
@ -22,9 +22,6 @@
|
||||||
* 675 Mass Ave, Cambridge, MA 02139, USA.
|
* 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define OMAP1_IO_OFFSET 0x01000000 /* Virtual IO = 0xfefb0000 */
|
|
||||||
#define OMAP1_IO_ADDRESS(pa) IOMEM((pa) - OMAP1_IO_OFFSET)
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ----------------------------------------------------------------------------
|
* ----------------------------------------------------------------------------
|
||||||
* Omap1 specific IO mapping
|
* Omap1 specific IO mapping
|
||||||
|
|
|
||||||
|
|
@ -36,6 +36,8 @@
|
||||||
|
|
||||||
#include <asm/assembler.h>
|
#include <asm/assembler.h>
|
||||||
|
|
||||||
|
#include <mach/hardware.h>
|
||||||
|
|
||||||
#include "iomap.h"
|
#include "iomap.h"
|
||||||
#include "pm.h"
|
#include "pm.h"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,229 +1,4 @@
|
||||||
/*
|
/*
|
||||||
* OMAP cpu type detection
|
* We can move mach/soc.h here once the drivers are fixed
|
||||||
*
|
|
||||||
* Copyright (C) 2004, 2008 Nokia Corporation
|
|
||||||
*
|
|
||||||
* Copyright (C) 2009-11 Texas Instruments.
|
|
||||||
*
|
|
||||||
* Written by Tony Lindgren <tony.lindgren@nokia.com>
|
|
||||||
*
|
|
||||||
* Added OMAP4/5 specific defines - Santosh Shilimkar<santosh.shilimkar@ti.com>
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation; either version 2 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
|
#include <mach/soc.h>
|
||||||
#ifndef __ASM_ARCH_OMAP_CPU_H
|
|
||||||
#define __ASM_ARCH_OMAP_CPU_H
|
|
||||||
|
|
||||||
#ifndef __ASSEMBLY__
|
|
||||||
|
|
||||||
#include <linux/bitops.h>
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Test if multicore OMAP support is needed
|
|
||||||
*/
|
|
||||||
#undef MULTI_OMAP1
|
|
||||||
#undef OMAP_NAME
|
|
||||||
|
|
||||||
#ifdef CONFIG_ARCH_OMAP730
|
|
||||||
# ifdef OMAP_NAME
|
|
||||||
# undef MULTI_OMAP1
|
|
||||||
# define MULTI_OMAP1
|
|
||||||
# else
|
|
||||||
# define OMAP_NAME omap730
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
#ifdef CONFIG_ARCH_OMAP850
|
|
||||||
# ifdef OMAP_NAME
|
|
||||||
# undef MULTI_OMAP1
|
|
||||||
# define MULTI_OMAP1
|
|
||||||
# else
|
|
||||||
# define OMAP_NAME omap850
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
#ifdef CONFIG_ARCH_OMAP15XX
|
|
||||||
# ifdef OMAP_NAME
|
|
||||||
# undef MULTI_OMAP1
|
|
||||||
# define MULTI_OMAP1
|
|
||||||
# else
|
|
||||||
# define OMAP_NAME omap1510
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
#ifdef CONFIG_ARCH_OMAP16XX
|
|
||||||
# ifdef OMAP_NAME
|
|
||||||
# undef MULTI_OMAP1
|
|
||||||
# define MULTI_OMAP1
|
|
||||||
# else
|
|
||||||
# define OMAP_NAME omap16xx
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* omap_rev bits:
|
|
||||||
* CPU id bits (0730, 1510, 1710, 2422...) [31:16]
|
|
||||||
* CPU revision (See _REV_ defined in cpu.h) [15:08]
|
|
||||||
* CPU class bits (15xx, 16xx, 24xx, 34xx...) [07:00]
|
|
||||||
*/
|
|
||||||
unsigned int omap_rev(void);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Get the CPU revision for OMAP devices
|
|
||||||
*/
|
|
||||||
#define GET_OMAP_REVISION() ((omap_rev() >> 8) & 0xff)
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Macros to group OMAP into cpu classes.
|
|
||||||
* These can be used in most places.
|
|
||||||
* cpu_is_omap7xx(): True for OMAP730, OMAP850
|
|
||||||
* cpu_is_omap15xx(): True for OMAP1510, OMAP5910 and OMAP310
|
|
||||||
* cpu_is_omap16xx(): True for OMAP1610, OMAP5912 and OMAP1710
|
|
||||||
*/
|
|
||||||
#define GET_OMAP_CLASS (omap_rev() & 0xff)
|
|
||||||
|
|
||||||
#define IS_OMAP_CLASS(class, id) \
|
|
||||||
static inline int is_omap ##class (void) \
|
|
||||||
{ \
|
|
||||||
return (GET_OMAP_CLASS == (id)) ? 1 : 0; \
|
|
||||||
}
|
|
||||||
|
|
||||||
#define GET_OMAP_SUBCLASS ((omap_rev() >> 20) & 0x0fff)
|
|
||||||
|
|
||||||
#define IS_OMAP_SUBCLASS(subclass, id) \
|
|
||||||
static inline int is_omap ##subclass (void) \
|
|
||||||
{ \
|
|
||||||
return (GET_OMAP_SUBCLASS == (id)) ? 1 : 0; \
|
|
||||||
}
|
|
||||||
|
|
||||||
IS_OMAP_CLASS(7xx, 0x07)
|
|
||||||
IS_OMAP_CLASS(15xx, 0x15)
|
|
||||||
IS_OMAP_CLASS(16xx, 0x16)
|
|
||||||
|
|
||||||
#define cpu_is_omap7xx() 0
|
|
||||||
#define cpu_is_omap15xx() 0
|
|
||||||
#define cpu_is_omap16xx() 0
|
|
||||||
|
|
||||||
#if defined(MULTI_OMAP1)
|
|
||||||
# if defined(CONFIG_ARCH_OMAP730)
|
|
||||||
# undef cpu_is_omap7xx
|
|
||||||
# define cpu_is_omap7xx() is_omap7xx()
|
|
||||||
# endif
|
|
||||||
# if defined(CONFIG_ARCH_OMAP850)
|
|
||||||
# undef cpu_is_omap7xx
|
|
||||||
# define cpu_is_omap7xx() is_omap7xx()
|
|
||||||
# endif
|
|
||||||
# if defined(CONFIG_ARCH_OMAP15XX)
|
|
||||||
# undef cpu_is_omap15xx
|
|
||||||
# define cpu_is_omap15xx() is_omap15xx()
|
|
||||||
# endif
|
|
||||||
# if defined(CONFIG_ARCH_OMAP16XX)
|
|
||||||
# undef cpu_is_omap16xx
|
|
||||||
# define cpu_is_omap16xx() is_omap16xx()
|
|
||||||
# endif
|
|
||||||
#else
|
|
||||||
# if defined(CONFIG_ARCH_OMAP730)
|
|
||||||
# undef cpu_is_omap7xx
|
|
||||||
# define cpu_is_omap7xx() 1
|
|
||||||
# endif
|
|
||||||
# if defined(CONFIG_ARCH_OMAP850)
|
|
||||||
# undef cpu_is_omap7xx
|
|
||||||
# define cpu_is_omap7xx() 1
|
|
||||||
# endif
|
|
||||||
# if defined(CONFIG_ARCH_OMAP15XX)
|
|
||||||
# undef cpu_is_omap15xx
|
|
||||||
# define cpu_is_omap15xx() 1
|
|
||||||
# endif
|
|
||||||
# if defined(CONFIG_ARCH_OMAP16XX)
|
|
||||||
# undef cpu_is_omap16xx
|
|
||||||
# define cpu_is_omap16xx() 1
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Macros to detect individual cpu types.
|
|
||||||
* These are only rarely needed.
|
|
||||||
* cpu_is_omap310(): True for OMAP310
|
|
||||||
* cpu_is_omap1510(): True for OMAP1510
|
|
||||||
* cpu_is_omap1610(): True for OMAP1610
|
|
||||||
* cpu_is_omap1611(): True for OMAP1611
|
|
||||||
* cpu_is_omap5912(): True for OMAP5912
|
|
||||||
* cpu_is_omap1621(): True for OMAP1621
|
|
||||||
* cpu_is_omap1710(): True for OMAP1710
|
|
||||||
*/
|
|
||||||
#define GET_OMAP_TYPE ((omap_rev() >> 16) & 0xffff)
|
|
||||||
|
|
||||||
#define IS_OMAP_TYPE(type, id) \
|
|
||||||
static inline int is_omap ##type (void) \
|
|
||||||
{ \
|
|
||||||
return (GET_OMAP_TYPE == (id)) ? 1 : 0; \
|
|
||||||
}
|
|
||||||
|
|
||||||
IS_OMAP_TYPE(310, 0x0310)
|
|
||||||
IS_OMAP_TYPE(1510, 0x1510)
|
|
||||||
IS_OMAP_TYPE(1610, 0x1610)
|
|
||||||
IS_OMAP_TYPE(1611, 0x1611)
|
|
||||||
IS_OMAP_TYPE(5912, 0x1611)
|
|
||||||
IS_OMAP_TYPE(1621, 0x1621)
|
|
||||||
IS_OMAP_TYPE(1710, 0x1710)
|
|
||||||
|
|
||||||
#define cpu_is_omap310() 0
|
|
||||||
#define cpu_is_omap1510() 0
|
|
||||||
#define cpu_is_omap1610() 0
|
|
||||||
#define cpu_is_omap5912() 0
|
|
||||||
#define cpu_is_omap1611() 0
|
|
||||||
#define cpu_is_omap1621() 0
|
|
||||||
#define cpu_is_omap1710() 0
|
|
||||||
|
|
||||||
/* These are needed to compile common code */
|
|
||||||
#ifdef CONFIG_ARCH_OMAP1
|
|
||||||
#define cpu_is_omap242x() 0
|
|
||||||
#define cpu_is_omap2430() 0
|
|
||||||
#define cpu_is_omap243x() 0
|
|
||||||
#define cpu_is_omap24xx() 0
|
|
||||||
#define cpu_is_omap34xx() 0
|
|
||||||
#define cpu_is_omap44xx() 0
|
|
||||||
#define soc_is_omap54xx() 0
|
|
||||||
#define soc_is_am33xx() 0
|
|
||||||
#define cpu_class_is_omap1() 1
|
|
||||||
#define cpu_class_is_omap2() 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Whether we have MULTI_OMAP1 or not, we still need to distinguish
|
|
||||||
* between 310 vs. 1510 and 1611B/5912 vs. 1710.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#if defined(CONFIG_ARCH_OMAP15XX)
|
|
||||||
# undef cpu_is_omap310
|
|
||||||
# undef cpu_is_omap1510
|
|
||||||
# define cpu_is_omap310() is_omap310()
|
|
||||||
# define cpu_is_omap1510() is_omap1510()
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(CONFIG_ARCH_OMAP16XX)
|
|
||||||
# undef cpu_is_omap1610
|
|
||||||
# undef cpu_is_omap1611
|
|
||||||
# undef cpu_is_omap5912
|
|
||||||
# undef cpu_is_omap1621
|
|
||||||
# undef cpu_is_omap1710
|
|
||||||
# define cpu_is_omap1610() is_omap1610()
|
|
||||||
# define cpu_is_omap1611() is_omap1611()
|
|
||||||
# define cpu_is_omap5912() is_omap5912()
|
|
||||||
# define cpu_is_omap1621() is_omap1621()
|
|
||||||
# define cpu_is_omap1710() is_omap1710()
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* __ASSEMBLY__ */
|
|
||||||
#endif
|
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@
|
||||||
#define __ASM_ARCH_OMAP_CPU_H
|
#define __ASM_ARCH_OMAP_CPU_H
|
||||||
|
|
||||||
#ifdef CONFIG_ARCH_OMAP1
|
#ifdef CONFIG_ARCH_OMAP1
|
||||||
#include "../../mach-omap1/soc.h"
|
#include <mach/soc.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_ARCH_OMAP2PLUS
|
#ifdef CONFIG_ARCH_OMAP2PLUS
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue