dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

ARM: 7159/1: OMAP: Introduce local common.h files 

As suggested by Russell King - ARM Linux <linux@arm.linux.org.uk>,
there's no need to keep local prototypes in non-local headers.

Add mach-omap1/common.h and mach-omap2/common.h and move the
local prototypes there from plat/common.h and mach/omap4-common.h.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Tony Lindgren 2011-11-10 22:45:17 +01:00 committed by Russell King
parent 6a6f1eface
commit 4e65331c6b
88 changed files with 332 additions and 287 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap1/board-ams-delta.c
View File

@ -35,7 +35,7 @@
#include <plat/mux.h>
#include <plat/usb.h>
#include <plat/board.h>
#include <plat/common.h>
#include "common.h"
#include <mach/camera.h>
#include <mach/ams-delta-fiq.h>

2
arch/arm/mach-omap1/board-fsample.c
View File

@ -32,7 +32,7 @@
#include <plat/flash.h>
#include <plat/fpga.h>
#include <plat/keypad.h>
#include <plat/common.h>
#include "common.h"
#include <plat/board.h>
/* fsample is pretty close to p2-sample */

2
arch/arm/mach-omap1/board-generic.c
View File

@ -25,7 +25,7 @@
#include <plat/mux.h>
#include <plat/usb.h>
#include <plat/board.h>
#include <plat/common.h>
#include "common.h"
/* assume no Mini-AB port */

2
arch/arm/mach-omap1/board-h2.c
View File

@ -43,7 +43,7 @@
#include <plat/irda.h>
#include <plat/usb.h>
#include <plat/keypad.h>
#include <plat/common.h>
#include "common.h"
#include <plat/flash.h>
#include "board-h2.h"

2
arch/arm/mach-omap1/board-h3.c
View File

@ -45,7 +45,7 @@
#include <plat/usb.h>
#include <plat/keypad.h>
#include <plat/dma.h>
#include <plat/common.h>
#include "common.h"
#include <plat/flash.h>
#include "board-h3.h"

2
arch/arm/mach-omap1/board-htcherald.c
View File

@ -41,7 +41,7 @@
#include <asm/mach/arch.h>
#include <plat/omap7xx.h>
#include <plat/common.h>
#include "common.h"
#include <plat/board.h>
#include <plat/keypad.h>
#include <plat/usb.h>

2
arch/arm/mach-omap1/board-innovator.c
View File

@ -37,7 +37,7 @@
#include <plat/tc.h>
#include <plat/usb.h>
#include <plat/keypad.h>
#include <plat/common.h>
#include "common.h"
#include <plat/mmc.h>
/* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */

2
arch/arm/mach-omap1/board-nokia770.c
View File

@ -30,7 +30,7 @@
#include <plat/usb.h>
#include <plat/board.h>
#include <plat/keypad.h>
#include <plat/common.h>
#include "common.h"
#include <plat/hwa742.h>
#include <plat/lcd_mipid.h>
#include <plat/mmc.h>

2
arch/arm/mach-omap1/board-osk.c
View File

@ -51,7 +51,7 @@
#include <plat/usb.h>
#include <plat/mux.h>
#include <plat/tc.h>
#include <plat/common.h>
#include "common.h"
/* At OMAP5912 OSK the Ethernet is directly connected to CS1 */
#define OMAP_OSK_ETHR_START 0x04800300

2
arch/arm/mach-omap1/board-palmte.c
View File

@ -41,7 +41,7 @@
#include <plat/board.h>
#include <plat/irda.h>
#include <plat/keypad.h>
#include <plat/common.h>
#include "common.h"
#define PALMTE_USBDETECT_GPIO 0
#define PALMTE_USB_OR_DC_GPIO 1

2
arch/arm/mach-omap1/board-palmtt.c
View File

@ -39,7 +39,7 @@
#include <plat/board.h>
#include <plat/irda.h>
#include <plat/keypad.h>
#include <plat/common.h>
#include "common.h"
#include <linux/spi/spi.h>
#include <linux/spi/ads7846.h>

2
arch/arm/mach-omap1/board-palmz71.c
View File

@ -41,7 +41,7 @@
#include <plat/board.h>
#include <plat/irda.h>
#include <plat/keypad.h>
#include <plat/common.h>
#include "common.h"
#include <linux/spi/spi.h>
#include <linux/spi/ads7846.h>

2
arch/arm/mach-omap1/board-perseus2.c
View File

@ -32,7 +32,7 @@
#include <plat/fpga.h>
#include <plat/flash.h>
#include <plat/keypad.h>
#include <plat/common.h>
#include "common.h"
#include <plat/board.h>
static const unsigned int p2_keymap[] = {

2
arch/arm/mach-omap1/board-sx1.c
View File

@ -40,7 +40,7 @@
#include <plat/usb.h>
#include <plat/tc.h>
#include <plat/board.h>
#include <plat/common.h>
#include "common.h"
#include <plat/keypad.h>
#include <plat/board-sx1.h>

2
arch/arm/mach-omap1/board-voiceblue.c
View File

@ -34,7 +34,7 @@
#include <asm/mach/map.h>
#include <plat/board-voiceblue.h>
#include <plat/common.h>
#include "common.h"
#include <plat/flash.h>
#include <plat/mux.h>
#include <plat/tc.h>

61
arch/arm/mach-omap1/common.h Normal file
View File

@ -0,0 +1,61 @@
/*
*
* Header for code common to all OMAP1 machines.
*
* 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 SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* 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.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef __ARCH_ARM_MACH_OMAP1_COMMON_H
#define __ARCH_ARM_MACH_OMAP1_COMMON_H
#include <plat/common.h>
#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
void omap7xx_map_io(void);
#else
static inline void omap7xx_map_io(void)
{
}
#endif
#ifdef CONFIG_ARCH_OMAP15XX
void omap15xx_map_io(void);
#else
static inline void omap15xx_map_io(void)
{
}
#endif
#ifdef CONFIG_ARCH_OMAP16XX
void omap16xx_map_io(void);
#else
static inline void omap16xx_map_io(void)
{
}
#endif
void omap1_init_early(void);
void omap1_init_irq(void);
extern struct sys_timer omap1_timer;
extern bool omap_32k_timer_init(void);
#endif /* __ARCH_ARM_MACH_OMAP1_COMMON_H */

2
arch/arm/mach-omap1/devices.c
View File

@ -22,7 +22,7 @@
#include <mach/hardware.h>
#include <asm/mach/map.h>
#include <plat/common.h>
#include "common.h"
#include <plat/tc.h>
#include <plat/board.h>
#include <plat/mux.h>

2
arch/arm/mach-omap1/time.c
View File

@ -54,7 +54,7 @@
#include <asm/mach/irq.h>
#include <asm/mach/time.h>
#include <plat/common.h>
#include "common.h"
#ifdef CONFIG_OMAP_MPU_TIMER

2
arch/arm/mach-omap1/timer32k.c
View File

@ -52,7 +52,7 @@
#include <asm/irq.h>
#include <asm/mach/irq.h>
#include <asm/mach/time.h>
#include <plat/common.h>
#include "common.h"
#include <plat/dmtimer.h>
/*

2
arch/arm/mach-omap2/board-2430sdp.c
View File

@ -34,7 +34,7 @@
#include <asm/mach/map.h>
#include <plat/board.h>
#include <plat/common.h>
#include "common.h"
#include <plat/gpmc.h>
#include <plat/usb.h>
#include <plat/gpmc-smc91x.h>

2
arch/arm/mach-omap2/board-3430sdp.c
View File

@ -33,7 +33,7 @@
#include <plat/mcspi.h>
#include <plat/board.h>
#include <plat/usb.h>
#include <plat/common.h>
#include "common.h"
#include <plat/dma.h>
#include <plat/gpmc.h>
#include <video/omapdss.h>

2
arch/arm/mach-omap2/board-3630sdp.c
View File

@ -16,7 +16,7 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <plat/common.h>
#include "common.h"
#include <plat/board.h>
#include <plat/gpmc-smc91x.h>
#include <plat/usb.h>

3
arch/arm/mach-omap2/board-4430sdp.c
View File

@ -27,13 +27,12 @@
#include <linux/leds_pwm.h>
#include <mach/hardware.h>
#include <mach/omap4-common.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <plat/board.h>
#include <plat/common.h>
#include "common.h"
#include <plat/usb.h>
#include <plat/mmc.h>
#include <plat/omap4-keypad.h>

2
arch/arm/mach-omap2/board-am3517crane.c
View File

@ -27,7 +27,7 @@
#include <asm/mach/map.h>
#include <plat/board.h>
#include <plat/common.h>
#include "common.h"
#include <plat/usb.h>
#include "mux.h"

2
arch/arm/mach-omap2/board-am3517evm.c
View File

@ -32,7 +32,7 @@
#include <asm/mach/map.h>
#include <plat/board.h>
#include <plat/common.h>
#include "common.h"
#include <plat/usb.h>
#include <video/omapdss.h>
#include <video/omap-panel-generic-dpi.h>

2
arch/arm/mach-omap2/board-apollon.c
View File

@ -37,7 +37,7 @@
#include <plat/led.h>
#include <plat/usb.h>
#include <plat/board.h>
#include <plat/common.h>
#include "common.h"
#include <plat/gpmc.h>
#include <video/omapdss.h>

2
arch/arm/mach-omap2/board-cm-t35.c
View File

@ -37,7 +37,7 @@
#include <asm/mach/map.h>
#include <plat/board.h>
#include <plat/common.h>
#include "common.h"
#include <plat/nand.h>
#include <plat/gpmc.h>
#include <plat/usb.h>

2
arch/arm/mach-omap2/board-cm-t3517.c
View File

@ -39,7 +39,7 @@
#include <asm/mach/map.h>
#include <plat/board.h>
#include <plat/common.h>
#include "common.h"
#include <plat/usb.h>
#include <plat/nand.h>
#include <plat/gpmc.h>

2
arch/arm/mach-omap2/board-devkit8000.c
View File

@ -41,7 +41,7 @@
#include <asm/mach/flash.h>
#include <plat/board.h>
#include <plat/common.h>
#include "common.h"
#include <plat/gpmc.h>
#include <plat/nand.h>
#include <plat/usb.h>

3
arch/arm/mach-omap2/board-generic.c
View File

@ -20,8 +20,7 @@
#include <asm/mach/arch.h>
#include <plat/board.h>
#include <plat/common.h>
#include <mach/omap4-common.h>
#include "common.h"
#include "common-board-devices.h"
/*

2
arch/arm/mach-omap2/board-h4.c
View File

@ -34,7 +34,7 @@
#include <plat/usb.h>
#include <plat/board.h>
#include <plat/common.h>
#include "common.h"
#include <plat/menelaus.h>
#include <plat/dma.h>
#include <plat/gpmc.h>

2
arch/arm/mach-omap2/board-igep0020.c
View File

@ -28,7 +28,7 @@
#include <asm/mach/arch.h>
#include <plat/board.h>
#include <plat/common.h>
#include "common.h"
#include <plat/gpmc.h>
#include <plat/usb.h>
#include <video/omapdss.h>

2
arch/arm/mach-omap2/board-ldp.c
View File

@ -36,7 +36,7 @@
#include <plat/mcspi.h>
#include <plat/board.h>
#include <plat/common.h>
#include "common.h"
#include <plat/gpmc.h>
#include <mach/board-zoom.h>

2
arch/arm/mach-omap2/board-n8x0.c
View File

@ -26,7 +26,7 @@
#include <asm/mach-types.h>
#include <plat/board.h>
#include <plat/common.h>
#include "common.h"
#include <plat/menelaus.h>
#include <mach/irqs.h>
#include <plat/mcspi.h>

2
arch/arm/mach-omap2/board-omap3beagle.c
View File

@ -40,7 +40,7 @@
#include <asm/mach/flash.h>
#include <plat/board.h>
#include <plat/common.h>
#include "common.h"
#include <video/omapdss.h>
#include <video/omap-panel-dvi.h>
#include <plat/gpmc.h>

2
arch/arm/mach-omap2/board-omap3evm.c
View File

@ -43,7 +43,7 @@
#include <plat/board.h>
#include <plat/usb.h>
#include <plat/common.h>
#include "common.h"
#include <plat/mcspi.h>
#include <video/omapdss.h>
#include <video/omap-panel-dvi.h>

2
arch/arm/mach-omap2/board-omap3logic.c
View File

@ -40,7 +40,7 @@
#include <plat/mux.h>
#include <plat/board.h>
#include <plat/common.h>
#include "common.h"
#include <plat/gpmc-smsc911x.h>
#include <plat/gpmc.h>
#include <plat/sdrc.h>

2
arch/arm/mach-omap2/board-omap3pandora.c
View File

@ -41,7 +41,7 @@
#include <asm/mach/map.h>
#include <plat/board.h>
#include <plat/common.h>
#include "common.h"
#include <mach/hardware.h>
#include <plat/mcspi.h>
#include <plat/usb.h>

2
arch/arm/mach-omap2/board-omap3stalker.c
View File

@ -35,7 +35,7 @@
#include <asm/mach/flash.h>
#include <plat/board.h>
#include <plat/common.h>
#include "common.h"
#include <plat/gpmc.h>
#include <plat/nand.h>
#include <plat/usb.h>

2
arch/arm/mach-omap2/board-omap3touchbook.c
View File

@ -44,7 +44,7 @@
#include <asm/mach/flash.h>
#include <plat/board.h>
#include <plat/common.h>
#include "common.h"
#include <plat/gpmc.h>
#include <plat/nand.h>
#include <plat/usb.h>

3
arch/arm/mach-omap2/board-omap4panda.c
View File

@ -30,14 +30,13 @@
#include <linux/wl12xx.h>
#include <mach/hardware.h>
#include <mach/omap4-common.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <video/omapdss.h>
#include <plat/board.h>
#include <plat/common.h>
#include "common.h"
#include <plat/usb.h>
#include <plat/mmc.h>
#include <video/omap-panel-dvi.h>

2
arch/arm/mach-omap2/board-overo.c
View File

@ -43,7 +43,7 @@
#include <asm/mach/map.h>
#include <plat/board.h>
#include <plat/common.h>
#include "common.h"
#include <video/omapdss.h>
#include <video/omap-panel-generic-dpi.h>
#include <video/omap-panel-dvi.h>

2
arch/arm/mach-omap2/board-rm680.c
View File

@ -25,7 +25,7 @@
#include <plat/mmc.h>
#include <plat/usb.h>
#include <plat/gpmc.h>
#include <plat/common.h>
#include "common.h"
#include <plat/onenand.h>
#include "mux.h"

2
arch/arm/mach-omap2/board-rx51-peripherals.c
View File

@ -27,7 +27,7 @@
#include <plat/mcspi.h>
#include <plat/board.h>
#include <plat/common.h>
#include "common.h"
#include <plat/dma.h>
#include <plat/gpmc.h>
#include <plat/onenand.h>

2
arch/arm/mach-omap2/board-rx51.c
View File

@ -25,7 +25,7 @@
#include <plat/mcspi.h>
#include <plat/board.h>
#include <plat/common.h>
#include "common.h"
#include <plat/dma.h>
#include <plat/gpmc.h>
#include <plat/usb.h>

2
arch/arm/mach-omap2/board-ti8168evm.c
View File

@ -22,7 +22,7 @@
#include <plat/irqs.h>
#include <plat/board.h>
#include <plat/common.h>
#include "common.h"
static struct omap_board_config_kernel ti8168_evm_config[] __initdata = {
};

2
arch/arm/mach-omap2/board-zoom-peripherals.c
View File

@ -24,7 +24,7 @@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <plat/common.h>
#include "common.h"
#include <plat/usb.h>
#include <mach/board-zoom.h>

2
arch/arm/mach-omap2/board-zoom.c
View File

@ -21,7 +21,7 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <plat/common.h>
#include "common.h"
#include <plat/board.h>
#include <plat/usb.h>

2
arch/arm/mach-omap2/cm2xxx_3xxx.c
View File

@ -18,7 +18,7 @@
#include <linux/err.h>
#include <linux/io.h>
#include <plat/common.h>
#include "common.h"
#include "cm.h"
#include "cm2xxx_3xxx.h"

2
arch/arm/mach-omap2/cm44xx.c
View File

@ -18,7 +18,7 @@
#include <linux/err.h>
#include <linux/io.h>
#include <plat/common.h>
#include "common.h"
#include "cm.h"
#include "cm1_44xx.h"

2
arch/arm/mach-omap2/cminst44xx.c
View File

@ -20,7 +20,7 @@
#include <linux/err.h>
#include <linux/io.h>
#include <plat/common.h>
#include "common.h"
#include "cm.h"
#include "cm1_44xx.h"

2
arch/arm/mach-omap2/common.c
View File

@ -17,7 +17,7 @@
#include <linux/clk.h>
#include <linux/io.h>
#include <plat/common.h>
#include "common.h"
#include <plat/board.h>
#include <plat/mux.h>

185
arch/arm/mach-omap2/common.h Normal file
View File

@ -0,0 +1,185 @@
/*
* Header for code common to all OMAP2+ machines.
*
* 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 SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* 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.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H
#define __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H
#include <linux/delay.h>
#include <plat/common.h>
#ifdef CONFIG_SOC_OMAP2420
extern void omap242x_map_common_io(void);
#else
static inline void omap242x_map_common_io(void)
{
}
#endif
#ifdef CONFIG_SOC_OMAP2430
extern void omap243x_map_common_io(void);
#else
static inline void omap243x_map_common_io(void)
{
}
#endif
#ifdef CONFIG_ARCH_OMAP3
extern void omap34xx_map_common_io(void);
#else
static inline void omap34xx_map_common_io(void)
{
}
#endif
#ifdef CONFIG_SOC_OMAPTI816X
extern void omapti816x_map_common_io(void);
#else
static inline void omapti816x_map_common_io(void)
{
}
#endif
#ifdef CONFIG_ARCH_OMAP4
extern void omap44xx_map_common_io(void);
#else
static inline void omap44xx_map_common_io(void)
{
}
#endif
extern void omap2_init_common_infrastructure(void);
extern struct sys_timer omap2_timer;
extern struct sys_timer omap3_timer;
extern struct sys_timer omap3_secure_timer;
extern struct sys_timer omap4_timer;
void omap2420_init_early(void);
void omap2430_init_early(void);
void omap3430_init_early(void);
void omap35xx_init_early(void);
void omap3630_init_early(void);
void omap3_init_early(void); /* Do not use this one */
void am35xx_init_early(void);
void ti816x_init_early(void);
void omap4430_init_early(void);
/*
* IO bases for various OMAP processors
* Except the tap base, rest all the io bases
* listed are physical addresses.
*/
struct omap_globals {
u32 class; /* OMAP class to detect */
void __iomem *tap; /* Control module ID code */
void __iomem *sdrc; /* SDRAM Controller */
void __iomem *sms; /* SDRAM Memory Scheduler */
void __iomem *ctrl; /* System Control Module */
void __iomem *ctrl_pad; /* PAD Control Module */
void __iomem *prm; /* Power and Reset Management */
void __iomem *cm; /* Clock Management */
void __iomem *cm2;
};
void omap2_set_globals_242x(void);
void omap2_set_globals_243x(void);
void omap2_set_globals_3xxx(void);
void omap2_set_globals_443x(void);
void omap2_set_globals_ti816x(void);
/* These get called from omap2_set_globals_xxxx(), do not call these */
void omap2_set_globals_tap(struct omap_globals *);
void omap2_set_globals_sdrc(struct omap_globals *);
void omap2_set_globals_control(struct omap_globals *);
void omap2_set_globals_prcm(struct omap_globals *);
void omap242x_map_io(void);
void omap243x_map_io(void);
void omap3_map_io(void);
void omap4_map_io(void);
/**
* omap_test_timeout - busy-loop, testing a condition
* @cond: condition to test until it evaluates to true
* @timeout: maximum number of microseconds in the timeout
* @index: loop index (integer)
*
* Loop waiting for @cond to become true or until at least @timeout
* microseconds have passed. To use, define some integer @index in the
* calling code. After running, if @index == @timeout, then the loop has
* timed out.
*/
#define omap_test_timeout(cond, timeout, index) \
({ \
for (index = 0; index < timeout; index++) { \
if (cond) \
break; \
udelay(1); \
} \
})
extern struct device *omap2_get_mpuss_device(void);
extern struct device *omap2_get_iva_device(void);
extern struct device *omap2_get_l3_device(void);
extern struct device *omap4_get_dsp_device(void);
void omap2_init_irq(void);
void omap3_init_irq(void);
void ti816x_init_irq(void);
extern int omap_irq_pending(void);
void omap_intc_save_context(void);
void omap_intc_restore_context(void);
void omap3_intc_suspend(void);
void omap3_intc_prepare_idle(void);
void omap3_intc_resume_idle(void);
/*
* wfi used in low power code. Directly opcode is used instead
* of instruction to avoid mulit-omap build break
*/
#ifdef CONFIG_THUMB2_KERNEL
#define do_wfi() __asm__ __volatile__ ("wfi" : : : "memory")
#else
#define do_wfi() \
__asm__ __volatile__ (".word 0xe320f003" : : : "memory")
#endif
#ifdef CONFIG_CACHE_L2X0
extern void __iomem *l2cache_base;
#endif
extern void __iomem *gic_dist_base_addr;
extern void __init gic_init_irq(void);
extern void omap_smc1(u32 fn, u32 arg);
#ifdef CONFIG_SMP
/* Needed for secondary core boot */
extern void omap_secondary_startup(void);
extern u32 omap_modify_auxcoreboot0(u32 set_mask, u32 clear_mask);
extern void omap_auxcoreboot_addr(u32 cpu_addr);
extern u32 omap_read_auxcoreboot0(void);
#endif
#endif /* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */

2
arch/arm/mach-omap2/control.c
View File

@ -15,7 +15,7 @@
#include <linux/kernel.h>
#include <linux/io.h>
#include <plat/common.h>
#include "common.h"
#include <plat/sdrc.h>
#include "cm-regbits-34xx.h"

2
arch/arm/mach-omap2/i2c.c
View File

@ -21,7 +21,7 @@
#include <plat/cpu.h>
#include <plat/i2c.h>
#include <plat/common.h>
#include "common.h"
#include <plat/omap_hwmod.h>
#include "mux.h"

2
arch/arm/mach-omap2/id.c
View File

@ -21,7 +21,7 @@
#include <asm/cputype.h>
#include <plat/common.h>
#include "common.h"
#include <plat/cpu.h>
#include <mach/id.h>

43
arch/arm/mach-omap2/include/mach/omap4-common.h
View File

@ -1,43 +0,0 @@
/*
* omap4-common.h: OMAP4 specific common header file
*
* Copyright (C) 2010 Texas Instruments, Inc.
*
* Author:
* 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 version 2 as
* published by the Free Software Foundation.
*/
#ifndef OMAP_ARCH_OMAP4_COMMON_H
#define OMAP_ARCH_OMAP4_COMMON_H
/*
* wfi used in low power code. Directly opcode is used instead
* of instruction to avoid mulit-omap build break
*/
#ifdef CONFIG_THUMB2_KERNEL
#define do_wfi() __asm__ __volatile__ ("wfi" : : : "memory")
#else
#define do_wfi() \
__asm__ __volatile__ (".word 0xe320f003" : : : "memory")
#endif
#ifdef CONFIG_CACHE_L2X0
extern void __iomem *l2cache_base;
#endif
extern void __iomem *gic_dist_base_addr;
extern void __init gic_init_irq(void);
extern void omap_smc1(u32 fn, u32 arg);
#ifdef CONFIG_SMP
/* Needed for secondary core boot */
extern void omap_secondary_startup(void);
extern u32 omap_modify_auxcoreboot0(u32 set_mask, u32 clear_mask);
extern void omap_auxcoreboot_addr(u32 cpu_addr);
extern u32 omap_read_auxcoreboot0(void);
#endif
#endif

4
arch/arm/mach-omap2/io.c
View File

@ -35,7 +35,7 @@
#include "clock3xxx.h"
#include "clock44xx.h"
#include <plat/common.h>
#include "common.h"
#include <plat/omap-pm.h>
#include "voltage.h"
#include "powerdomain.h"
@ -43,7 +43,7 @@
#include "clockdomain.h"
#include <plat/omap_hwmod.h>
#include <plat/multi.h>
#include <plat/common.h>
#include "common.h"
/*
* The machine specific code may provide the extra mapping besides the

3
arch/arm/mach-omap2/omap-hotplug.c
View File

@ -19,7 +19,8 @@
#include <linux/smp.h>
#include <asm/cacheflush.h>
#include <mach/omap4-common.h>
#include "common.h"
int platform_cpu_kill(unsigned int cpu)
{

3
arch/arm/mach-omap2/omap-smp.c
View File

@ -24,7 +24,8 @@
#include <asm/hardware/gic.h>
#include <asm/smp_scu.h>
#include <mach/hardware.h>
#include <mach/omap4-common.h>
#include "common.h"
/* SCU base address */
static void __iomem *scu_base;

3
arch/arm/mach-omap2/omap4-common.c
View File

@ -22,7 +22,8 @@
#include <plat/irqs.h>
#include <mach/hardware.h>
#include <mach/omap4-common.h>
#include "common.h"
#ifdef CONFIG_CACHE_L2X0
void __iomem *l2cache_base;

2
arch/arm/mach-omap2/omap_hwmod.c
View File

@ -137,7 +137,7 @@
#include <linux/mutex.h>
#include <linux/spinlock.h>
#include <plat/common.h>
#include "common.h"
#include <plat/cpu.h>
#include "clockdomain.h"
#include "powerdomain.h"

2
arch/arm/mach-omap2/pm.c
View File

@ -18,7 +18,7 @@
#include <plat/omap-pm.h>
#include <plat/omap_device.h>
#include <plat/common.h>
#include "common.h"
#include "voltage.h"
#include "powerdomain.h"

1
arch/arm/mach-omap2/pm24xx.c
View File

@ -42,6 +42,7 @@
#include <plat/dma.h>
#include <plat/board.h>
#include "common.h"
#include "prm2xxx_3xxx.h"
#include "prm-regbits-24xx.h"
#include "cm2xxx_3xxx.h"

1
arch/arm/mach-omap2/pm34xx.c
View File

@ -42,6 +42,7 @@
#include <plat/gpmc.h>
#include <plat/dma.h>
#include "common.h"
#include "cm2xxx_3xxx.h"
#include "cm-regbits-34xx.h"
#include "prm-regbits-34xx.h"

2
arch/arm/mach-omap2/pm44xx.c
View File

@ -16,8 +16,8 @@
#include <linux/err.h>
#include <linux/slab.h>
#include "common.h"
#include "powerdomain.h"
#include <mach/omap4-common.h>
struct power_state {
struct powerdomain *pwrdm;

2
arch/arm/mach-omap2/prcm.c
View File

@ -26,7 +26,7 @@
#include <linux/export.h>
#include <mach/system.h>
#include <plat/common.h>
#include "common.h"
#include <plat/prcm.h>
#include <plat/irqs.h>

2
arch/arm/mach-omap2/prcm_mpu44xx.c
View File

@ -15,7 +15,7 @@
#include <linux/err.h>
#include <linux/io.h>
#include <plat/common.h>
#include "common.h"
#include "prcm_mpu44xx.h"
#include "cm-regbits-44xx.h"

2
arch/arm/mach-omap2/prm2xxx_3xxx.c
View File

@ -16,7 +16,7 @@
#include <linux/err.h>
#include <linux/io.h>
#include <plat/common.h>
#include "common.h"
#include <plat/cpu.h>
#include <plat/prcm.h>

2
arch/arm/mach-omap2/prm44xx.c
View File

@ -17,7 +17,7 @@
#include <linux/err.h>
#include <linux/io.h>
#include <plat/common.h>
#include "common.h"
#include <plat/cpu.h>
#include <plat/prcm.h>

2
arch/arm/mach-omap2/prminst44xx.c
View File

@ -16,7 +16,7 @@
#include <linux/err.h>
#include <linux/io.h>
#include <plat/common.h>
#include "common.h"
#include "prm44xx.h"
#include "prminst44xx.h"

2
arch/arm/mach-omap2/sdram-nokia.c
View File

@ -18,7 +18,7 @@
#include <linux/io.h>
#include <plat/io.h>
#include <plat/common.h>
#include "common.h"
#include <plat/clock.h>
#include <plat/sdrc.h>

2
arch/arm/mach-omap2/sdrc.c
View File

@ -23,7 +23,7 @@
#include <linux/clk.h>
#include <linux/io.h>
#include <plat/common.h>
#include "common.h"
#include <plat/clock.h>
#include <plat/sram.h>

2
arch/arm/mach-omap2/sdrc2xxx.c
View File

@ -24,7 +24,7 @@
#include <linux/clk.h>
#include <linux/io.h>
#include <plat/common.h>
#include "common.h"
#include <plat/clock.h>
#include <plat/sram.h>

2
arch/arm/mach-omap2/serial.c
View File

@ -33,7 +33,7 @@
#include <plat/omap-serial.h>
#endif
#include <plat/common.h>
#include "common.h"
#include <plat/board.h>
#include <plat/clock.h>
#include <plat/dma.h>

2
arch/arm/mach-omap2/smartreflex.c
View File

@ -26,7 +26,7 @@
#include <linux/slab.h>
#include <linux/pm_runtime.h>
#include <plat/common.h>
#include "common.h"
#include "pm.h"
#include "smartreflex.h"

2
arch/arm/mach-omap2/timer.c
View File

@ -41,7 +41,7 @@
#include <plat/dmtimer.h>
#include <asm/localtimer.h>
#include <asm/sched_clock.h>
#include <plat/common.h>
#include "common.h"
#include <plat/omap_hwmod.h>
#include <plat/omap_device.h>
#include <plat/omap-pm.h>

2
arch/arm/mach-omap2/vc3xxx_data.c
View File

@ -18,7 +18,7 @@
#include <linux/err.h>
#include <linux/init.h>
#include <plat/common.h>
#include "common.h"
#include "prm-regbits-34xx.h"
#include "voltage.h"

2
arch/arm/mach-omap2/vc44xx_data.c
View File

@ -18,7 +18,7 @@
#include <linux/err.h>
#include <linux/init.h>
#include <plat/common.h>
#include "common.h"
#include "prm44xx.h"
#include "prm-regbits-44xx.h"

2
arch/arm/mach-omap2/voltage.c
View File

@ -27,7 +27,7 @@
#include <linux/slab.h>
#include <linux/clk.h>
#include <plat/common.h>
#include "common.h"
#include "prm-regbits-34xx.h"
#include "prm-regbits-44xx.h"

2
arch/arm/mach-omap2/voltagedomains3xxx_data.c
View File

@ -18,7 +18,7 @@
#include <linux/err.h>
#include <linux/init.h>
#include <plat/common.h>
#include "common.h"
#include <plat/cpu.h>
#include "prm-regbits-34xx.h"

2
arch/arm/mach-omap2/voltagedomains44xx_data.c
View File

@ -21,7 +21,7 @@
#include <linux/err.h>
#include <linux/init.h>
#include <plat/common.h>
#include "common.h"
#include "prm-regbits-44xx.h"
#include "prm44xx.h"

2
arch/arm/mach-omap2/vp.c
View File

@ -1,7 +1,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <plat/common.h>
#include "common.h"
#include "voltage.h"
#include "vp.h"

2
arch/arm/mach-omap2/vp3xxx_data.c
View File

@ -19,7 +19,7 @@
#include <linux/err.h>
#include <linux/init.h>
#include <plat/common.h>
#include "common.h"
#include "prm-regbits-34xx.h"
#include "voltage.h"

2
arch/arm/mach-omap2/vp44xx_data.c
View File

@ -19,7 +19,7 @@
#include <linux/err.h>
#include <linux/init.h>
#include <plat/common.h>
#include "common.h"
#include "prm44xx.h"
#include "prm-regbits-44xx.h"

82
arch/arm/plat-omap/include/plat/common.h
View File

@ -27,94 +27,12 @@
#ifndef __ARCH_ARM_MACH_OMAP_COMMON_H
#define __ARCH_ARM_MACH_OMAP_COMMON_H
#include <linux/delay.h>
#include <plat/i2c.h>
struct sys_timer;
extern void omap_map_common_io(void);
extern struct sys_timer omap1_timer;
extern struct sys_timer omap2_timer;
extern struct sys_timer omap3_timer;
extern struct sys_timer omap3_secure_timer;
extern struct sys_timer omap4_timer;
extern bool omap_32k_timer_init(void);
extern int __init omap_init_clocksource_32k(void);
extern unsigned long long notrace omap_32k_sched_clock(void);
extern void omap_reserve(void);
void omap2420_init_early(void);
void omap2430_init_early(void);
void omap3430_init_early(void);
void omap35xx_init_early(void);
void omap3630_init_early(void);
void omap3_init_early(void); /* Do not use this one */
void am35xx_init_early(void);
void ti816x_init_early(void);
void omap4430_init_early(void);
void omap_sram_init(void);
/*
* IO bases for various OMAP processors
* Except the tap base, rest all the io bases
* listed are physical addresses.
*/
struct omap_globals {
u32 class; /* OMAP class to detect */
void __iomem *tap; /* Control module ID code */
void __iomem *sdrc; /* SDRAM Controller */
void __iomem *sms; /* SDRAM Memory Scheduler */
void __iomem *ctrl; /* System Control Module */
void __iomem *ctrl_pad; /* PAD Control Module */
void __iomem *prm; /* Power and Reset Management */
void __iomem *cm; /* Clock Management */
void __iomem *cm2;
};
void omap2_set_globals_242x(void);
void omap2_set_globals_243x(void);
void omap2_set_globals_3xxx(void);
void omap2_set_globals_443x(void);
void omap2_set_globals_ti816x(void);
/* These get called from omap2_set_globals_xxxx(), do not call these */
void omap2_set_globals_tap(struct omap_globals *);
void omap2_set_globals_sdrc(struct omap_globals *);
void omap2_set_globals_control(struct omap_globals *);
void omap2_set_globals_prcm(struct omap_globals *);
void omap242x_map_io(void);
void omap243x_map_io(void);
void omap3_map_io(void);
void omap4_map_io(void);
/**
* omap_test_timeout - busy-loop, testing a condition
* @cond: condition to test until it evaluates to true
* @timeout: maximum number of microseconds in the timeout
* @index: loop index (integer)
*
* Loop waiting for @cond to become true or until at least @timeout
* microseconds have passed. To use, define some integer @index in the
* calling code. After running, if @index == @timeout, then the loop has
* timed out.
*/
#define omap_test_timeout(cond, timeout, index) \
({ \
for (index = 0; index < timeout; index++) { \
if (cond) \
break; \
udelay(1); \
} \
})
extern struct device *omap2_get_mpuss_device(void);
extern struct device *omap2_get_iva_device(void);
extern struct device *omap2_get_l3_device(void);
extern struct device *omap4_get_dsp_device(void);
#endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */

68
arch/arm/plat-omap/include/plat/io.h
View File

@ -257,74 +257,6 @@ extern void omap_writew(u16 v, u32 pa);
extern void omap_writel(u32 v, u32 pa);
struct omap_sdrc_params;
#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
void omap7xx_map_io(void);
#else
static inline void omap_map_io(void)
{
}
#endif
#ifdef CONFIG_ARCH_OMAP15XX
void omap15xx_map_io(void);
#else
static inline void omap15xx_map_io(void)
{
}
#endif
#ifdef CONFIG_ARCH_OMAP16XX
void omap16xx_map_io(void);
#else
static inline void omap16xx_map_io(void)
{
}
#endif
void omap1_init_early(void);
#ifdef CONFIG_SOC_OMAP2420
extern void omap242x_map_common_io(void);
#else
static inline void omap242x_map_common_io(void)
{
}
#endif
#ifdef CONFIG_SOC_OMAP2430
extern void omap243x_map_common_io(void);
#else
static inline void omap243x_map_common_io(void)
{
}
#endif
#ifdef CONFIG_ARCH_OMAP3
extern void omap34xx_map_common_io(void);
#else
static inline void omap34xx_map_common_io(void)
{
}
#endif
#ifdef CONFIG_SOC_OMAPTI816X
extern void omapti816x_map_common_io(void);
#else
static inline void omapti816x_map_common_io(void)
{
}
#endif
#ifdef CONFIG_ARCH_OMAP4
extern void omap44xx_map_common_io(void);
#else
static inline void omap44xx_map_common_io(void)
{
}
#endif
extern void omap2_init_common_infrastructure(void);
extern void omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0,
struct omap_sdrc_params *sdrc_cs1);

10
arch/arm/plat-omap/include/plat/irqs.h
View File

@ -438,16 +438,6 @@
#ifndef __ASSEMBLY__
extern void __iomem *omap_irq_base;
void omap1_init_irq(void);
void omap2_init_irq(void);
void omap3_init_irq(void);
void ti816x_init_irq(void);
extern int omap_irq_pending(void);
void omap_intc_save_context(void);
void omap_intc_restore_context(void);
void omap3_intc_suspend(void);
void omap3_intc_prepare_idle(void);
void omap3_intc_resume_idle(void);
#endif
#include <mach/hardware.h>