Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ad5897c authored by Tony Lindgren's avatar Tony Lindgren Committed by Russell King
Browse files

[ARM] 3143/1: OMAP 4/5: Update omap include files 



Patch from Tony Lindgren

This patch syncs the mainline kernel with linux-omap tree.

This patch contains changes to common header files for
omap1xxx and omap24xx by various omap developers, and
improved cpu detection by Imre Deak

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 046d6b28

include/asm-arm/arch-omap/board-h4.h

+4 −0
Original line number Diff line number Diff line
@@ -34,5 +34,9 @@ 
#define OMAP24XX_ETHR_START             0x08000300

#define OMAP24XX_ETHR_GPIO_IRQ		92



#define H4_CS0_BASE		     0x04000000



#define H4_CS0_BASE		     0x04000000



#endif /*  __ASM_ARCH_OMAP_H4_H */

include/asm-arm/arch-omap/board-innovator.h

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#ifndef __ASM_ARCH_OMAP_INNOVATOR_H

#define __ASM_ARCH_OMAP_INNOVATOR_H



#if defined (CONFIG_ARCH_OMAP1510)

#if defined (CONFIG_ARCH_OMAP15XX)



#ifndef OMAP_SDRAM_DEVICE

#define OMAP_SDRAM_DEVICE			D256M_1X16_4B
@@ -44,7 +44,7 @@ void fpga_write(unsigned char val, int reg); 
unsigned char fpga_read(int reg);

#endif



#endif /* CONFIG_ARCH_OMAP1510 */

#endif /* CONFIG_ARCH_OMAP15XX */



#if defined (CONFIG_ARCH_OMAP16XX)

include/asm-arm/arch-omap/clock.h

0 → 100644
+91 −0
Original line number Diff line number Diff line 
/*

 *  linux/include/asm-arm/arch-omap/clock.h

 *

 *  Copyright (C) 2004 - 2005 Nokia corporation

 *  Written by Tuukka Tikkanen <tuukka.tikkanen@elektrobit.com>

 *  Based on clocks.h by Tony Lindgren, Gordon McNutt and RidgeRun, Inc

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#ifndef __ARCH_ARM_OMAP_CLOCK_H

#define __ARCH_ARM_OMAP_CLOCK_H



struct module;



struct clk {

	struct list_head	node;

	struct module		*owner;

	const char		*name;

	struct clk		*parent;

	unsigned long		rate;

	__u32			flags;

	void __iomem		*enable_reg;

	__u8			enable_bit;

	__u8			rate_offset;

	__u8			src_offset;

	__s8			usecount;

	void			(*recalc)(struct clk *);

	int			(*set_rate)(struct clk *, unsigned long);

	long			(*round_rate)(struct clk *, unsigned long);

	void			(*init)(struct clk *);

	int			(*enable)(struct clk *);

	void			(*disable)(struct clk *);

};



struct clk_functions {

	int		(*clk_enable)(struct clk *clk);

	void		(*clk_disable)(struct clk *clk);

	int		(*clk_use)(struct clk *clk);

	void		(*clk_unuse)(struct clk *clk);

	long		(*clk_round_rate)(struct clk *clk, unsigned long rate);

	int		(*clk_set_rate)(struct clk *clk, unsigned long rate);

	int		(*clk_set_parent)(struct clk *clk, struct clk *parent);

	struct clk *	(*clk_get_parent)(struct clk *clk);

	void		(*clk_allow_idle)(struct clk *clk);

	void		(*clk_deny_idle)(struct clk *clk);

};



extern unsigned int mpurate;

extern struct list_head clocks;

extern spinlock_t clockfw_lock;



extern int clk_init(struct clk_functions * custom_clocks);

extern int clk_register(struct clk *clk);

extern void clk_unregister(struct clk *clk);

extern void propagate_rate(struct clk *clk);

extern void followparent_recalc(struct clk * clk);

extern void clk_allow_idle(struct clk *clk);

extern void clk_deny_idle(struct clk *clk);



/* Clock flags */

#define RATE_CKCTL		(1 << 0)	/* Main fixed ratio clocks */

#define RATE_FIXED		(1 << 1)	/* Fixed clock rate */

#define RATE_PROPAGATES		(1 << 2)	/* Program children too */

#define VIRTUAL_CLOCK		(1 << 3)	/* Composite clock from table */

#define ALWAYS_ENABLED		(1 << 4)	/* Clock cannot be disabled */

#define ENABLE_REG_32BIT	(1 << 5)	/* Use 32-bit access */

#define VIRTUAL_IO_ADDRESS	(1 << 6)	/* Clock in virtual address */

#define CLOCK_IDLE_CONTROL	(1 << 7)

#define CLOCK_NO_IDLE_PARENT	(1 << 8)

#define DELAYED_APP		(1 << 9)	/* Delay application of clock */

#define CONFIG_PARTICIPANT	(1 << 10)	/* Fundamental clock */

#define CM_MPU_SEL1		(1 << 11)	/* Domain divider/source */

#define CM_DSP_SEL1		(1 << 12)

#define CM_GFX_SEL1		(1 << 13)

#define CM_MODEM_SEL1		(1 << 14)

#define CM_CORE_SEL1		(1 << 15)	/* Sets divider for many */

#define CM_CORE_SEL2		(1 << 16)	/* sets parent for GPT */

#define CM_WKUP_SEL1		(1 << 17)

#define CM_PLL_SEL1		(1 << 18)

#define CM_PLL_SEL2		(1 << 19)

#define CM_SYSCLKOUT_SEL1	(1 << 20)

#define CLOCK_IN_OMAP730	(1 << 21)

#define CLOCK_IN_OMAP1510	(1 << 22)

#define CLOCK_IN_OMAP16XX	(1 << 23)

#define CLOCK_IN_OMAP242X	(1 << 24)

#define CLOCK_IN_OMAP243X	(1 << 25)



#endif

include/asm-arm/arch-omap/common.h

+1 −1
Original line number Diff line number Diff line
@@ -31,6 +31,6 @@ struct sys_timer; 


extern void omap_map_common_io(void);

extern struct sys_timer omap_timer;

extern void omap_serial_init(int ports[]);

extern void omap_serial_init(void);



#endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */

include/asm-arm/arch-omap/cpu.h

+59 −23
Original line number Diff line number Diff line
@@ -28,12 +28,7 @@ 


extern unsigned int system_rev;



#define OMAP_DIE_ID_0		0xfffe1800

#define OMAP_DIE_ID_1		0xfffe1804

#define OMAP_PRODUCTION_ID_0	0xfffe2000

#define OMAP_PRODUCTION_ID_1	0xfffe2004

#define OMAP32_ID_0		0xfffed400

#define OMAP32_ID_1		0xfffed404

#define omap2_cpu_rev()		((system_rev >> 8) & 0x0f)



/*

 * Test if multicore OMAP support is needed
@@ -50,7 +45,7 @@ extern unsigned int system_rev; 
#  define OMAP_NAME omap730

# endif

#endif

#ifdef CONFIG_ARCH_OMAP1510

#ifdef CONFIG_ARCH_OMAP15XX

# ifdef OMAP_NAME

#  undef  MULTI_OMAP1

#  define MULTI_OMAP1
@@ -79,9 +74,11 @@ extern unsigned int system_rev; 
 * Macros to group OMAP into cpu classes.

 * These can be used in most places.

 * cpu_is_omap7xx():	True for OMAP730

 * cpu_is_omap15xx():	True for OMAP1510 and OMAP5910

 * cpu_is_omap15xx():	True for OMAP1510, OMAP5910 and OMAP310

 * cpu_is_omap16xx():	True for OMAP1610, OMAP5912 and OMAP1710

 * cpu_is_omap24xx():	True for OMAP2420

 * cpu_is_omap24xx():	True for OMAP2420, OMAP2422, OMAP2423, OMAP2430

 * cpu_is_omap242x():	True for OMAP2420, OMAP2422, OMAP2423

 * cpu_is_omap243x():	True for OMAP2430

 */

#define GET_OMAP_CLASS	(system_rev & 0xff)
@@ -91,22 +88,35 @@ static inline int is_omap ##class (void) \ 
	return (GET_OMAP_CLASS == (id)) ? 1 : 0;	\

}



#define GET_OMAP_SUBCLASS	((system_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)

IS_OMAP_CLASS(24xx, 0x24)



IS_OMAP_SUBCLASS(242x, 0x242)

IS_OMAP_SUBCLASS(243x, 0x243)



#define cpu_is_omap7xx()		0

#define cpu_is_omap15xx()		0

#define cpu_is_omap16xx()		0

#define cpu_is_omap24xx()		0

#define cpu_is_omap242x()		0

#define cpu_is_omap243x()		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_OMAP1510)

# if defined(CONFIG_ARCH_OMAP15XX)

#  undef  cpu_is_omap15xx

#  define cpu_is_omap15xx()		is_omap15xx()

# endif
@@ -119,7 +129,7 @@ IS_OMAP_CLASS(24xx, 0x24) 
#  undef  cpu_is_omap7xx

#  define cpu_is_omap7xx()		1

# endif

# if defined(CONFIG_ARCH_OMAP1510)

# if defined(CONFIG_ARCH_OMAP15XX)

#  undef  cpu_is_omap15xx

#  define cpu_is_omap15xx()		1

# endif
@@ -129,13 +139,18 @@ IS_OMAP_CLASS(24xx, 0x24) 
# endif

# if defined(CONFIG_ARCH_OMAP24XX)

#  undef  cpu_is_omap24xx

#  undef  cpu_is_omap242x

#  undef  cpu_is_omap243x

#  define cpu_is_omap24xx()		1

#  define cpu_is_omap242x()		is_omap242x()

#  define cpu_is_omap243x()		is_omap243x()

# endif

#endif



/*

 * Macros to detect individual cpu types.

 * These are only rarely needed.

 * cpu_is_omap330():	True for OMAP330

 * cpu_is_omap730():	True for OMAP730

 * cpu_is_omap1510():	True for OMAP1510

 * cpu_is_omap1610():	True for OMAP1610
@@ -144,6 +159,9 @@ IS_OMAP_CLASS(24xx, 0x24) 
 * cpu_is_omap1621():	True for OMAP1621

 * cpu_is_omap1710():	True for OMAP1710

 * cpu_is_omap2420():	True for OMAP2420

 * cpu_is_omap2422():	True for OMAP2422

 * cpu_is_omap2423():	True for OMAP2423

 * cpu_is_omap2430():	True for OMAP2430

 */

#define GET_OMAP_TYPE	((system_rev >> 16) & 0xffff)
@@ -153,6 +171,7 @@ static inline int is_omap ##type (void) \ 
	return (GET_OMAP_TYPE == (id)) ? 1 : 0;		\

}



IS_OMAP_TYPE(310, 0x0310)

IS_OMAP_TYPE(730, 0x0730)

IS_OMAP_TYPE(1510, 0x1510)

IS_OMAP_TYPE(1610, 0x1610)
@@ -161,7 +180,11 @@ IS_OMAP_TYPE(5912, 0x1611) 
IS_OMAP_TYPE(1621, 0x1621)

IS_OMAP_TYPE(1710, 0x1710)

IS_OMAP_TYPE(2420, 0x2420)

IS_OMAP_TYPE(2422, 0x2422)

IS_OMAP_TYPE(2423, 0x2423)

IS_OMAP_TYPE(2430, 0x2430)



#define cpu_is_omap310()		0

#define cpu_is_omap730()		0

#define cpu_is_omap1510()		0

#define cpu_is_omap1610()		0
@@ -170,31 +193,33 @@ IS_OMAP_TYPE(2420, 0x2420) 
#define cpu_is_omap1621()		0

#define cpu_is_omap1710()		0

#define cpu_is_omap2420()		0

#define cpu_is_omap2422()		0

#define cpu_is_omap2423()		0

#define cpu_is_omap2430()		0



#if defined(MULTI_OMAP1)

# if defined(CONFIG_ARCH_OMAP730)

#  undef  cpu_is_omap730

#  define cpu_is_omap730()		is_omap730()

# endif

# if defined(CONFIG_ARCH_OMAP1510)

#  undef  cpu_is_omap1510

#  define cpu_is_omap1510()		is_omap1510()

# endif

#else

# if defined(CONFIG_ARCH_OMAP730)

#  undef  cpu_is_omap730

#  define cpu_is_omap730()		1

# endif

# if defined(CONFIG_ARCH_OMAP1510)

#  undef  cpu_is_omap1510

#  define cpu_is_omap1510()		1

# endif

#endif



/*

 * Whether we have MULTI_OMAP1 or not, we still need to distinguish

 * between 1611B/5912 and 1710.

 * between 330 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
@@ -208,9 +233,20 @@ IS_OMAP_TYPE(2420, 0x2420) 
# define cpu_is_omap1710()		is_omap1710()

#endif



#if defined(CONFIG_ARCH_OMAP2420)

#if defined(CONFIG_ARCH_OMAP24XX)

# undef  cpu_is_omap2420

#  define cpu_is_omap2420()		1

#endif

# undef  cpu_is_omap2422

# undef  cpu_is_omap2423

# undef  cpu_is_omap2430

# define cpu_is_omap2420()		is_omap2420()

# define cpu_is_omap2422()		is_omap2422()

# define cpu_is_omap2423()		is_omap2423()

# define cpu_is_omap2430()		is_omap2430()

#endif



/* Macros to detect if we have OMAP1 or OMAP2 */

#define cpu_class_is_omap1()	(cpu_is_omap730() || cpu_is_omap15xx() || \

				cpu_is_omap16xx())

#define cpu_class_is_omap2()	cpu_is_omap24xx()



#endif