adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

omap: headers: Move remaining headers from include/mach to include/plat

Browse source 
Move the remaining headers under plat-omap/include/mach
to plat-omap/include/plat. Also search and replace the
files using these headers to include using the right path.

This was done with:

#!/bin/bash
mach_dir_old="arch/arm/plat-omap/include/mach"
plat_dir_new="arch/arm/plat-omap/include/plat"
headers=$(cd $mach_dir_old && ls *.h)
omap_dirs="arch/arm/*omap*/ \
drivers/video/omap \
sound/soc/omap"
other_files="drivers/leds/leds-ams-delta.c \
drivers/mfd/menelaus.c \
drivers/mfd/twl4030-core.c \
drivers/mtd/nand/ams-delta.c"

for header in $headers; do
	old="#include <mach\/$header"
	new="#include <plat\/$header"
	for dir in $omap_dirs; do
		find $dir -type f -name \*.[chS] | \
			xargs sed -i "s/$old/$new/"
	done
	find drivers/ -type f -name \*omap*.[chS] | \
		xargs sed -i "s/$old/$new/"
	for file in $other_files; do
		sed -i "s/$old/$new/" $file
	done
done

for header in $(ls $mach_dir_old/*.h); do
	git mv $header $plat_dir_new/
done

Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Tony Lindgren 2009-10-20 09:40:47 -07:00
parent 3eff851b9d
commit ce491cf854
228 changed files with 543 additions and 543 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
arch/arm/mach-omap1/board-ams-delta.c
View file

@ -25,13 +25,13 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/board-ams-delta.h> #include <plat/board-ams-delta.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/keypad.h> #include <plat/keypad.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/usb.h> #include <plat/usb.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/common.h> #include <plat/common.h>
static u8 ams_delta_latch1_reg; static u8 ams_delta_latch1_reg;
static u16 ams_delta_latch2_reg; static u16 ams_delta_latch2_reg;

14
arch/arm/mach-omap1/board-fsample.c
View file

@ -26,14 +26,14 @@
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/tc.h> #include <plat/tc.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/fpga.h> #include <plat/fpga.h>
#include <mach/nand.h> #include <plat/nand.h>
#include <mach/keypad.h> #include <plat/keypad.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/board.h> #include <plat/board.h>
/* fsample is pretty close to p2-sample */ /* fsample is pretty close to p2-sample */

8
arch/arm/mach-omap1/board-generic.c
View file

@ -23,10 +23,10 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/usb.h> #include <plat/usb.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/common.h> #include <plat/common.h>
static void __init omap_generic_init_irq(void) static void __init omap_generic_init_irq(void)
{ {

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

@ -16,7 +16,7 @@
#include <linux/i2c/tps65010.h> #include <linux/i2c/tps65010.h>
#include <mach/mmc.h> #include <plat/mmc.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include "board-h2.h" #include "board-h2.h"

16
arch/arm/mach-omap1/board-h2.c
View file

@ -37,14 +37,14 @@
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/dma.h> #include <plat/dma.h>
#include <mach/tc.h> #include <plat/tc.h>
#include <mach/nand.h> #include <plat/nand.h>
#include <mach/irda.h> #include <plat/irda.h>
#include <mach/usb.h> #include <plat/usb.h>
#include <mach/keypad.h> #include <plat/keypad.h>
#include <mach/common.h> #include <plat/common.h>
#include "board-h2.h" #include "board-h2.h"

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

@ -16,7 +16,7 @@
#include <linux/i2c/tps65010.h> #include <linux/i2c/tps65010.h>
#include <mach/mmc.h> #include <plat/mmc.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include "board-h3.h" #include "board-h3.h"

14
arch/arm/mach-omap1/board-h3.c
View file

@ -40,13 +40,13 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/tc.h> #include <plat/tc.h>
#include <mach/nand.h> #include <plat/nand.h>
#include <mach/usb.h> #include <plat/usb.h>
#include <mach/keypad.h> #include <plat/keypad.h>
#include <mach/dma.h> #include <plat/dma.h>
#include <mach/common.h> #include <plat/common.h>
#include "board-h3.h" #include "board-h3.h"

14
arch/arm/mach-omap1/board-innovator.c
View file

@ -30,14 +30,14 @@
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/fpga.h> #include <plat/fpga.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/tc.h> #include <plat/tc.h>
#include <mach/usb.h> #include <plat/usb.h>
#include <mach/keypad.h> #include <plat/keypad.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/mmc.h> #include <plat/mmc.h>
/* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */ /* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */
#define INNOVATOR1610_ETHR_START 0x04000300 #define INNOVATOR1610_ETHR_START 0x04000300

22
arch/arm/mach-omap1/board-nokia770.c
View file

@ -26,17 +26,17 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/usb.h> #include <plat/usb.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/keypad.h> #include <plat/keypad.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/dsp_common.h> #include <plat/dsp_common.h>
#include <mach/omapfb.h> #include <plat/omapfb.h>
#include <mach/hwa742.h> #include <plat/hwa742.h>
#include <mach/lcd_mipid.h> #include <plat/lcd_mipid.h>
#include <mach/mmc.h> #include <plat/mmc.h>
#include <mach/clock.h> #include <plat/clock.h>
#define ADS7846_PENDOWN_GPIO 15 #define ADS7846_PENDOWN_GPIO 15

10
arch/arm/mach-omap1/board-osk.c
View file

@ -47,10 +47,10 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
#include <mach/usb.h> #include <plat/usb.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/tc.h> #include <plat/tc.h>
#include <mach/common.h> #include <plat/common.h>
/* At OMAP5912 OSK the Ethernet is directly connected to CS1 */ /* At OMAP5912 OSK the Ethernet is directly connected to CS1 */
#define OMAP_OSK_ETHR_START 0x04800300 #define OMAP_OSK_ETHR_START 0x04800300
@ -312,7 +312,7 @@ static struct omap_board_config_kernel osk_config[] __initdata = {
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/ads7846.h> #include <linux/spi/ads7846.h>
#include <mach/keypad.h> #include <plat/keypad.h>
static struct at24_platform_data at24c04 = { static struct at24_platform_data at24c04 = {
.byte_len = SZ_4K / 8, .byte_len = SZ_4K / 8,

16
arch/arm/mach-omap1/board-palmte.c
View file

@ -34,14 +34,14 @@
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/usb.h> #include <plat/usb.h>
#include <mach/tc.h> #include <plat/tc.h>
#include <mach/dma.h> #include <plat/dma.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/irda.h> #include <plat/irda.h>
#include <mach/keypad.h> #include <plat/keypad.h>
#include <mach/common.h> #include <plat/common.h>
#define PALMTE_USBDETECT_GPIO 0 #define PALMTE_USBDETECT_GPIO 0
#define PALMTE_USB_OR_DC_GPIO 1 #define PALMTE_USB_OR_DC_GPIO 1

18
arch/arm/mach-omap1/board-palmtt.c
View file

@ -29,16 +29,16 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
#include <mach/led.h> #include <plat/led.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/usb.h> #include <plat/usb.h>
#include <mach/dma.h> #include <plat/dma.h>
#include <mach/tc.h> #include <plat/tc.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/irda.h> #include <plat/irda.h>
#include <mach/keypad.h> #include <plat/keypad.h>
#include <mach/common.h> #include <plat/common.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/ads7846.h> #include <linux/spi/ads7846.h>

18
arch/arm/mach-omap1/board-palmz71.c
View file

@ -33,15 +33,15 @@
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/usb.h> #include <plat/usb.h>
#include <mach/dma.h> #include <plat/dma.h>
#include <mach/tc.h> #include <plat/tc.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/irda.h> #include <plat/irda.h>
#include <mach/keypad.h> #include <plat/keypad.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/omap-alsa.h> #include <plat/omap-alsa.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/ads7846.h> #include <linux/spi/ads7846.h>

14
arch/arm/mach-omap1/board-perseus2.c
View file

@ -26,14 +26,14 @@
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/tc.h> #include <plat/tc.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/fpga.h> #include <plat/fpga.h>
#include <mach/nand.h> #include <plat/nand.h>
#include <mach/keypad.h> #include <plat/keypad.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/board.h> #include <plat/board.h>
static int p2_keymap[] = { static int p2_keymap[] = {
KEY(0,0,KEY_UP), KEY(0,0,KEY_UP),

4
arch/arm/mach-omap1/board-sx1-mmc.c
View file

@ -15,9 +15,9 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/mmc.h> #include <plat/mmc.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/board-sx1.h> #include <plat/board-sx1.h>
#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE)

18
arch/arm/mach-omap1/board-sx1.c
View file

@ -33,15 +33,15 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/dma.h> #include <plat/dma.h>
#include <mach/irda.h> #include <plat/irda.h>
#include <mach/usb.h> #include <plat/usb.h>
#include <mach/tc.h> #include <plat/tc.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/keypad.h> #include <plat/keypad.h>
#include <mach/board-sx1.h> #include <plat/board-sx1.h>
/* Write to I2C device */ /* Write to I2C device */
int sx1_i2c_write_byte(u8 devaddr, u8 regoffset, u8 value) int sx1_i2c_write_byte(u8 devaddr, u8 regoffset, u8 value)

8
arch/arm/mach-omap1/board-voiceblue.c
View file

@ -29,11 +29,11 @@
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/tc.h> #include <plat/tc.h>
#include <mach/usb.h> #include <plat/usb.h>
static struct plat_serial8250_port voiceblue_ports[] = { static struct plat_serial8250_port voiceblue_ports[] = {
{ {

8
arch/arm/mach-omap1/clock.c
View file

@ -22,10 +22,10 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/clkdev.h> #include <asm/clkdev.h>
#include <mach/cpu.h> #include <plat/cpu.h>
#include <mach/usb.h> #include <plat/usb.h>
#include <mach/clock.h> #include <plat/clock.h>
#include <mach/sram.h> #include <plat/sram.h>
static const struct clkops clkops_generic; static const struct clkops clkops_generic;
static const struct clkops clkops_uart; static const struct clkops clkops_uart;

8
arch/arm/mach-omap1/devices.c
View file

@ -18,11 +18,11 @@
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/tc.h> #include <plat/tc.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/mmc.h> #include <plat/mmc.h>
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/

2
arch/arm/mach-omap1/fpga.c
View file

@ -27,7 +27,7 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/mach/irq.h> #include <asm/mach/irq.h>
#include <mach/fpga.h> #include <plat/fpga.h>
#include <mach/gpio.h> #include <mach/gpio.h>
static void fpga_mask_irq(unsigned int irq) static void fpga_mask_irq(unsigned int irq)

2
arch/arm/mach-omap1/id.c
View file

@ -15,7 +15,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/io.h> #include <linux/io.h>
#include <mach/cpu.h> #include <plat/cpu.h>
#define OMAP_DIE_ID_0 0xfffe1800 #define OMAP_DIE_ID_0 0xfffe1800
#define OMAP_DIE_ID_1 0xfffe1804 #define OMAP_DIE_ID_1 0xfffe1804

4
arch/arm/mach-omap1/io.c
View file

@ -15,8 +15,8 @@
#include <asm/tlb.h> #include <asm/tlb.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/tc.h> #include <plat/tc.h>
extern int omap1_clk_init(void); extern int omap1_clk_init(void);
extern void omap_check_revision(void); extern void omap_check_revision(void);

2
arch/arm/mach-omap1/irq.c
View file

@ -46,7 +46,7 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/mach/irq.h> #include <asm/mach/irq.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/cpu.h> #include <plat/cpu.h>
#define IRQ_BANK(irq) ((irq) >> 5) #define IRQ_BANK(irq) ((irq) >> 5)
#define IRQ_BIT(irq) ((irq) & 0x1f) #define IRQ_BIT(irq) ((irq) & 0x1f)

2
arch/arm/mach-omap1/leds-h2p2-debug.c
View file

@ -19,7 +19,7 @@
#include <asm/system.h> #include <asm/system.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <mach/fpga.h> #include <plat/fpga.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include "leds.h" #include "leds.h"

2
arch/arm/mach-omap1/leds.c
View file

@ -10,7 +10,7 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/mux.h> #include <plat/mux.h>
#include "leds.h" #include "leds.h"

2
arch/arm/mach-omap1/mailbox.c
View file

@ -14,7 +14,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/io.h> #include <linux/io.h>
#include <mach/mailbox.h> #include <plat/mailbox.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#define MAILBOX_ARM2DSP1 0x00 #define MAILBOX_ARM2DSP1 0x00

10
arch/arm/mach-omap1/mcbsp.c
View file

@ -18,11 +18,11 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/dma.h> #include <plat/dma.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/cpu.h> #include <plat/cpu.h>
#include <mach/mcbsp.h> #include <plat/mcbsp.h>
#include <mach/dsp_common.h> #include <plat/dsp_common.h>
#define DPS_RSTCT2_PER_EN (1 << 0) #define DPS_RSTCT2_PER_EN (1 << 0)
#define DSP_RSTCT2_WD_PER_EN (1 << 1) #define DSP_RSTCT2_WD_PER_EN (1 << 1)

2
arch/arm/mach-omap1/mux.c
View file

@ -29,7 +29,7 @@
#include <asm/system.h> #include <asm/system.h>
#include <mach/mux.h> #include <plat/mux.h>
#ifdef CONFIG_OMAP_MUX #ifdef CONFIG_OMAP_MUX

14
arch/arm/mach-omap1/pm.c
View file

@ -48,14 +48,14 @@
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <asm/mach/irq.h> #include <asm/mach/irq.h>
#include <mach/cpu.h> #include <plat/cpu.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/clock.h> #include <plat/clock.h>
#include <mach/sram.h> #include <plat/sram.h>
#include <mach/tc.h> #include <plat/tc.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/dma.h> #include <plat/dma.h>
#include <mach/dmtimer.h> #include <plat/dmtimer.h>
#include "pm.h" #include "pm.h"

6
arch/arm/mach-omap1/serial.c
View file

@ -22,10 +22,10 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/fpga.h> #include <plat/fpga.h>
static struct clk * uart1_ck; static struct clk * uart1_ck;
static struct clk * uart2_ck; static struct clk * uart2_ck;

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

@ -52,7 +52,7 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/mach/irq.h> #include <asm/mach/irq.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <mach/dmtimer.h> #include <plat/dmtimer.h>
struct sys_timer omap_timer; struct sys_timer omap_timer;

12
arch/arm/mach-omap2/board-2430sdp.c
View file

@ -31,12 +31,12 @@
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/gpmc.h> #include <plat/gpmc.h>
#include <mach/usb.h> #include <plat/usb.h>
#include <mach/gpmc-smc91x.h> #include <plat/gpmc-smc91x.h>
#include "mmc-twl4030.h" #include "mmc-twl4030.h"

20
arch/arm/mach-omap2/board-3430sdp.c
View file

@ -29,17 +29,17 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/mcspi.h> #include <plat/mcspi.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/usb.h> #include <plat/usb.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/dma.h> #include <plat/dma.h>
#include <mach/gpmc.h> #include <plat/gpmc.h>
#include <mach/control.h> #include <plat/control.h>
#include <mach/keypad.h> #include <plat/keypad.h>
#include <mach/gpmc-smc91x.h> #include <plat/gpmc-smc91x.h>
#include "sdram-qimonda-hyb18m512160af-6.h" #include "sdram-qimonda-hyb18m512160af-6.h"
#include "mmc-twl4030.h" #include "mmc-twl4030.h"

8
arch/arm/mach-omap2/board-4430sdp.c
View file

@ -23,10 +23,10 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/control.h> #include <plat/control.h>
#include <mach/timer-gp.h> #include <plat/timer-gp.h>
#include <asm/hardware/gic.h> #include <asm/hardware/gic.h>
static struct platform_device sdp4430_lcd_device = { static struct platform_device sdp4430_lcd_device = {

14
arch/arm/mach-omap2/board-apollon.c
View file

@ -33,13 +33,13 @@
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/led.h> #include <plat/led.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/usb.h> #include <plat/usb.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/gpmc.h> #include <plat/gpmc.h>
#include <mach/control.h> #include <plat/control.h>
/* LED & Switch macros */ /* LED & Switch macros */
#define LED0_GPIO13 13 #define LED0_GPIO13 13

8
arch/arm/mach-omap2/board-generic.c
View file

@ -26,10 +26,10 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/usb.h> #include <plat/usb.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/common.h> #include <plat/common.h>
static struct omap_board_config_kernel generic_config[] = { static struct omap_board_config_kernel generic_config[] = {
}; };

18
arch/arm/mach-omap2/board-h4.c
View file

@ -31,16 +31,16 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
#include <mach/control.h> #include <plat/control.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/usb.h> #include <plat/usb.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/keypad.h> #include <plat/keypad.h>
#include <mach/menelaus.h> #include <plat/menelaus.h>
#include <mach/dma.h> #include <plat/dma.h>
#include <mach/gpmc.h> #include <plat/gpmc.h>
#define H4_FLASH_CS 0 #define H4_FLASH_CS 0
#define H4_SMC91X_CS 1 #define H4_SMC91X_CS 1

14
arch/arm/mach-omap2/board-ldp.c
View file

@ -32,16 +32,16 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/mcspi.h> #include <plat/mcspi.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/gpmc.h> #include <plat/gpmc.h>
#include <asm/delay.h> #include <asm/delay.h>
#include <mach/control.h> #include <plat/control.h>
#include <mach/usb.h> #include <plat/usb.h>
#include <mach/keypad.h> #include <plat/keypad.h>
#include "mmc-twl4030.h" #include "mmc-twl4030.h"

10
arch/arm/mach-omap2/board-n8x0.c
View file

@ -23,12 +23,12 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/mcspi.h> #include <plat/mcspi.h>
#include <mach/onenand.h> #include <plat/onenand.h>
#include <mach/serial.h> #include <plat/serial.h>
static struct omap2_mcspi_device_config p54spi_mcspi_config = { static struct omap2_mcspi_device_config p54spi_mcspi_config = {
.turbo_mode = 0, .turbo_mode = 0,

14
arch/arm/mach-omap2/board-omap3beagle.c
View file

@ -37,13 +37,13 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/gpmc.h> #include <plat/gpmc.h>
#include <mach/nand.h> #include <plat/nand.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/usb.h> #include <plat/usb.h>
#include <mach/timer-gp.h> #include <plat/timer-gp.h>
#include "mmc-twl4030.h" #include "mmc-twl4030.h"

12
arch/arm/mach-omap2/board-omap3evm.c
View file

@ -32,12 +32,12 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/usb.h> #include <plat/usb.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/mcspi.h> #include <plat/mcspi.h>
#include <mach/keypad.h> #include <plat/keypad.h>
#include "sdram-micron-mt46h32m32lf-6.h" #include "sdram-micron-mt46h32m32lf-6.h"
#include "mmc-twl4030.h" #include "mmc-twl4030.h"

12
arch/arm/mach-omap2/board-omap3pandora.c
View file

@ -33,14 +33,14 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/mcspi.h> #include <plat/mcspi.h>
#include <mach/usb.h> #include <plat/usb.h>
#include <mach/keypad.h> #include <plat/keypad.h>
#include <mach/mux.h> #include <plat/mux.h>
#include "sdram-micron-mt46h32m32lf-6.h" #include "sdram-micron-mt46h32m32lf-6.h"
#include "mmc-twl4030.h" #include "mmc-twl4030.h"

14
arch/arm/mach-omap2/board-overo.c
View file

@ -38,14 +38,14 @@
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/gpmc.h> #include <plat/gpmc.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/nand.h> #include <plat/nand.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/usb.h> #include <plat/usb.h>
#include "sdram-micron-mt46h32m32lf-6.h" #include "sdram-micron-mt46h32m32lf-6.h"
#include "mmc-twl4030.h" #include "mmc-twl4030.h"
@ -67,7 +67,7 @@
#if defined(CONFIG_TOUCHSCREEN_ADS7846) || \ #if defined(CONFIG_TOUCHSCREEN_ADS7846) || \
defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE) defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE)
#include <mach/mcspi.h> #include <plat/mcspi.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/spi/ads7846.h> #include <linux/spi/ads7846.h>

18
arch/arm/mach-omap2/board-rx51-peripherals.c
View file

@ -21,15 +21,15 @@
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/mmc/host.h> #include <linux/mmc/host.h>
#include <mach/mcspi.h> #include <plat/mcspi.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/dma.h> #include <plat/dma.h>
#include <mach/gpmc.h> #include <plat/gpmc.h>
#include <mach/keypad.h> #include <plat/keypad.h>
#include <mach/onenand.h> #include <plat/onenand.h>
#include <mach/gpmc-smc91x.h> #include <plat/gpmc-smc91x.h>
#include "mmc-twl4030.h" #include "mmc-twl4030.h"

16
arch/arm/mach-omap2/board-rx51.c
View file

@ -22,14 +22,14 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/mcspi.h> #include <plat/mcspi.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/keypad.h> #include <plat/keypad.h>
#include <mach/dma.h> #include <plat/dma.h>
#include <mach/gpmc.h> #include <plat/gpmc.h>
#include <mach/usb.h> #include <plat/usb.h>
static struct omap_lcd_config rx51_lcd_config = { static struct omap_lcd_config rx51_lcd_config = {
.ctrl_name = "internal", .ctrl_name = "internal",

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

@ -14,7 +14,7 @@
#include <linux/smsc911x.h> #include <linux/smsc911x.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <mach/gpmc.h> #include <plat/gpmc.h>
#define ZOOM2_SMSC911X_CS 7 #define ZOOM2_SMSC911X_CS 7
#define ZOOM2_SMSC911X_GPIO 158 #define ZOOM2_SMSC911X_GPIO 158

6
arch/arm/mach-omap2/board-zoom2.c
View file

@ -20,9 +20,9 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/usb.h> #include <plat/usb.h>
#include <mach/keypad.h> #include <plat/keypad.h>
#include "mmc-twl4030.h" #include "mmc-twl4030.h"
#include "sdram-micron-mt46h32m32lf-6.h" #include "sdram-micron-mt46h32m32lf-6.h"

10
arch/arm/mach-omap2/clock.c
View file

@ -24,13 +24,13 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <mach/clock.h> #include <plat/clock.h>
#include <mach/clockdomain.h> #include <plat/clockdomain.h>
#include <mach/cpu.h> #include <plat/cpu.h>
#include <mach/prcm.h> #include <plat/prcm.h>
#include <asm/div64.h> #include <asm/div64.h>
#include <mach/sdrc.h> #include <plat/sdrc.h>
#include "sdrc.h" #include "sdrc.h"
#include "clock.h" #include "clock.h"
#include "prm.h" #include "prm.h"

2
arch/arm/mach-omap2/clock.h
View file

@ -16,7 +16,7 @@
#ifndef __ARCH_ARM_MACH_OMAP2_CLOCK_H #ifndef __ARCH_ARM_MACH_OMAP2_CLOCK_H
#define __ARCH_ARM_MACH_OMAP2_CLOCK_H #define __ARCH_ARM_MACH_OMAP2_CLOCK_H
#include <mach/clock.h> #include <plat/clock.h>
/* The maximum error between a target DPLL rate and the rounded rate in Hz */ /* The maximum error between a target DPLL rate and the rounded rate in Hz */
#define DEFAULT_DPLL_RATE_TOLERANCE 50000 #define DEFAULT_DPLL_RATE_TOLERANCE 50000

8
arch/arm/mach-omap2/clock24xx.c
View file

@ -28,13 +28,13 @@
#include <linux/cpufreq.h> #include <linux/cpufreq.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <mach/clock.h> #include <plat/clock.h>
#include <mach/sram.h> #include <plat/sram.h>
#include <mach/prcm.h> #include <plat/prcm.h>
#include <asm/div64.h> #include <asm/div64.h>
#include <asm/clkdev.h> #include <asm/clkdev.h>
#include <mach/sdrc.h> #include <plat/sdrc.h>
#include "clock.h" #include "clock.h"
#include "prm.h" #include "prm.h"
#include "prm-regbits-24xx.h" #include "prm-regbits-24xx.h"

8
arch/arm/mach-omap2/clock34xx.c
View file

@ -27,13 +27,13 @@
#include <linux/limits.h> #include <linux/limits.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <mach/cpu.h> #include <plat/cpu.h>
#include <mach/clock.h> #include <plat/clock.h>
#include <mach/sram.h> #include <plat/sram.h>
#include <asm/div64.h> #include <asm/div64.h>
#include <asm/clkdev.h> #include <asm/clkdev.h>
#include <mach/sdrc.h> #include <plat/sdrc.h>
#include "clock.h" #include "clock.h"
#include "prm.h" #include "prm.h"
#include "prm-regbits-34xx.h" #include "prm-regbits-34xx.h"

2
arch/arm/mach-omap2/clock34xx.h
View file

@ -19,7 +19,7 @@
#ifndef __ARCH_ARM_MACH_OMAP2_CLOCK34XX_H #ifndef __ARCH_ARM_MACH_OMAP2_CLOCK34XX_H
#define __ARCH_ARM_MACH_OMAP2_CLOCK34XX_H #define __ARCH_ARM_MACH_OMAP2_CLOCK34XX_H
#include <mach/control.h> #include <plat/control.h>
#include "clock.h" #include "clock.h"
#include "cm.h" #include "cm.h"

6
arch/arm/mach-omap2/clockdomain.c
View file

@ -28,14 +28,14 @@
#include <linux/bitops.h> #include <linux/bitops.h>
#include <mach/clock.h> #include <plat/clock.h>
#include "prm.h" #include "prm.h"
#include "prm-regbits-24xx.h" #include "prm-regbits-24xx.h"
#include "cm.h" #include "cm.h"
#include <mach/powerdomain.h> #include <plat/powerdomain.h>
#include <mach/clockdomain.h> #include <plat/clockdomain.h>
/* clkdm_list contains all registered struct clockdomains */ /* clkdm_list contains all registered struct clockdomains */
static LIST_HEAD(clkdm_list); static LIST_HEAD(clkdm_list);

2
arch/arm/mach-omap2/clockdomains.h
View file

@ -10,7 +10,7 @@
#ifndef __ARCH_ARM_MACH_OMAP2_CLOCKDOMAINS_H #ifndef __ARCH_ARM_MACH_OMAP2_CLOCKDOMAINS_H
#define __ARCH_ARM_MACH_OMAP2_CLOCKDOMAINS_H #define __ARCH_ARM_MACH_OMAP2_CLOCKDOMAINS_H
#include <mach/clockdomain.h> #include <plat/clockdomain.h>
/* /*
* OMAP2/3-common clockdomains * OMAP2/3-common clockdomains

4
arch/arm/mach-omap2/control.c
View file

@ -15,8 +15,8 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/io.h> #include <linux/io.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/control.h> #include <plat/control.h>
static void __iomem *omap2_ctrl_base; static void __iomem *omap2_ctrl_base;

12
arch/arm/mach-omap2/devices.c
View file

@ -20,12 +20,12 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/control.h> #include <plat/control.h>
#include <mach/tc.h> #include <plat/tc.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/mmc.h> #include <plat/mmc.h>
#if defined(CONFIG_VIDEO_OMAP2) || defined(CONFIG_VIDEO_OMAP2_MODULE) #if defined(CONFIG_VIDEO_OMAP2) || defined(CONFIG_VIDEO_OMAP2_MODULE)
@ -250,7 +250,7 @@ static inline void omap_init_sti(void) {}
#if defined(CONFIG_SPI_OMAP24XX) || defined(CONFIG_SPI_OMAP24XX_MODULE) #if defined(CONFIG_SPI_OMAP24XX) || defined(CONFIG_SPI_OMAP24XX_MODULE)
#include <mach/mcspi.h> #include <plat/mcspi.h>
#define OMAP2_MCSPI1_BASE 0x48098000 #define OMAP2_MCSPI1_BASE 0x48098000
#define OMAP2_MCSPI2_BASE 0x4809a000 #define OMAP2_MCSPI2_BASE 0x4809a000

6
arch/arm/mach-omap2/gpmc-onenand.c
View file

@ -17,9 +17,9 @@
#include <asm/mach/flash.h> #include <asm/mach/flash.h>
#include <mach/onenand.h> #include <plat/onenand.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/gpmc.h> #include <plat/gpmc.h>
static struct omap_onenand_platform_data *gpmc_onenand_data; static struct omap_onenand_platform_data *gpmc_onenand_data;

6
arch/arm/mach-omap2/gpmc-smc91x.c
View file

@ -17,9 +17,9 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/smc91x.h> #include <linux/smc91x.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/gpmc.h> #include <plat/gpmc.h>
#include <mach/gpmc-smc91x.h> #include <plat/gpmc-smc91x.h>
static struct omap_smc91x_platform_data *gpmc_cfg; static struct omap_smc91x_platform_data *gpmc_cfg;

4
arch/arm/mach-omap2/gpmc.c
View file

@ -24,9 +24,9 @@
#include <linux/module.h> #include <linux/module.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <mach/gpmc.h> #include <plat/gpmc.h>
#include <mach/sdrc.h> #include <plat/sdrc.h>
/* GPMC register offsets */ /* GPMC register offsets */
#define GPMC_REVISION 0x00 #define GPMC_REVISION 0x00

6
arch/arm/mach-omap2/id.c
View file

@ -21,9 +21,9 @@
#include <asm/cputype.h> #include <asm/cputype.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/control.h> #include <plat/control.h>
#include <mach/cpu.h> #include <plat/cpu.h>
static struct omap_chip_id omap_chip; static struct omap_chip_id omap_chip;
static unsigned int omap_revision; static unsigned int omap_revision;

6
arch/arm/mach-omap2/include/mach/entry-macro.S
View file

@ -15,8 +15,8 @@
#include <mach/irqs.h> #include <mach/irqs.h>
#include <asm/hardware/gic.h> #include <asm/hardware/gic.h>
#include <mach/omap24xx.h> #include <plat/omap24xx.h>
#include <mach/omap34xx.h> #include <plat/omap34xx.h>
/* REVISIT: This should be set dynamically if CONFIG_MULTI_OMAP2 is selected */ /* REVISIT: This should be set dynamically if CONFIG_MULTI_OMAP2 is selected */
#if defined(CONFIG_ARCH_OMAP2420) || defined(CONFIG_ARCH_OMAP2430) #if defined(CONFIG_ARCH_OMAP2420) || defined(CONFIG_ARCH_OMAP2430)
@ -25,7 +25,7 @@
#define OMAP2_VA_IC_BASE OMAP2_L4_IO_ADDRESS(OMAP34XX_IC_BASE) #define OMAP2_VA_IC_BASE OMAP2_L4_IO_ADDRESS(OMAP34XX_IC_BASE)
#endif #endif
#if defined(CONFIG_ARCH_OMAP4) #if defined(CONFIG_ARCH_OMAP4)
#include <mach/omap44xx.h> #include <plat/omap44xx.h>
#endif #endif
#define INTCPS_SIR_IRQ_OFFSET 0x0040 /* Active interrupt offset */ #define INTCPS_SIR_IRQ_OFFSET 0x0040 /* Active interrupt offset */
#define ACTIVEIRQ_MASK 0x7f /* Active interrupt bits */ #define ACTIVEIRQ_MASK 0x7f /* Active interrupt bits */

20
arch/arm/mach-omap2/io.c
View file

@ -27,24 +27,24 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/omapfb.h> #include <plat/omapfb.h>
#include <mach/sram.h> #include <plat/sram.h>
#include <mach/sdrc.h> #include <plat/sdrc.h>
#include <mach/gpmc.h> #include <plat/gpmc.h>
#include <mach/serial.h> #include <plat/serial.h>
#ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once clkdev is ready */ #ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once clkdev is ready */
#include "clock.h" #include "clock.h"
#include <mach/omap-pm.h> #include <plat/omap-pm.h>
#include <mach/powerdomain.h> #include <plat/powerdomain.h>
#include "powerdomains.h" #include "powerdomains.h"
#include <mach/clockdomain.h> #include <plat/clockdomain.h>
#include "clockdomains.h" #include "clockdomains.h"
#endif #endif
#include <mach/omap_hwmod.h> #include <plat/omap_hwmod.h>
#include "omap_hwmod_2420.h" #include "omap_hwmod_2420.h"
#include "omap_hwmod_2430.h" #include "omap_hwmod_2430.h"
#include "omap_hwmod_34xx.h" #include "omap_hwmod_34xx.h"

2
arch/arm/mach-omap2/iommu2.c
View file

@ -17,7 +17,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/stringify.h> #include <linux/stringify.h>
#include <mach/iommu.h> #include <plat/iommu.h>
/* /*
* omap2 architecture specific register bit definitions * omap2 architecture specific register bit definitions

2
arch/arm/mach-omap2/mailbox.c
View file

@ -15,7 +15,7 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/io.h> #include <linux/io.h>
#include <mach/mailbox.h> #include <plat/mailbox.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#define MAILBOX_REVISION 0x000 #define MAILBOX_REVISION 0x000

8
arch/arm/mach-omap2/mcbsp.c
View file

@ -18,10 +18,10 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/dma.h> #include <plat/dma.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/cpu.h> #include <plat/cpu.h>
#include <mach/mcbsp.h> #include <plat/mcbsp.h>
static void omap2_mcbsp2_mux_setup(void) static void omap2_mcbsp2_mux_setup(void)
{ {

6
arch/arm/mach-omap2/mmc-twl4030.c
View file

@ -20,9 +20,9 @@
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/control.h> #include <plat/control.h>
#include <mach/mmc.h> #include <plat/mmc.h>
#include <mach/board.h> #include <plat/board.h>
#include "mmc-twl4030.h" #include "mmc-twl4030.h"

4
arch/arm/mach-omap2/mux.c
View file

@ -30,8 +30,8 @@
#include <asm/system.h> #include <asm/system.h>
#include <mach/control.h> #include <plat/control.h>
#include <mach/mux.h> #include <plat/mux.h>
#ifdef CONFIG_OMAP_MUX #ifdef CONFIG_OMAP_MUX

2
arch/arm/mach-omap2/omap-smp.c
View file

@ -24,7 +24,7 @@
#include <asm/localtimer.h> #include <asm/localtimer.h>
#include <asm/smp_scu.h> #include <asm/smp_scu.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/common.h> #include <plat/common.h>
/* Registers used for communicating startup information */ /* Registers used for communicating startup information */
static void __iomem *omap4_auxcoreboot_reg0; static void __iomem *omap4_auxcoreboot_reg0;

2
arch/arm/mach-omap2/omap3-iommu.c
View file

@ -12,7 +12,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <mach/iommu.h> #include <plat/iommu.h>
#define OMAP3_MMU1_BASE 0x480bd400 #define OMAP3_MMU1_BASE 0x480bd400
#define OMAP3_MMU2_BASE 0x5d000000 #define OMAP3_MMU2_BASE 0x5d000000

10
arch/arm/mach-omap2/omap_hwmod.c
View file

@ -45,11 +45,11 @@
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/bootmem.h> #include <linux/bootmem.h>
#include <mach/cpu.h> #include <plat/cpu.h>
#include <mach/clockdomain.h> #include <plat/clockdomain.h>
#include <mach/powerdomain.h> #include <plat/powerdomain.h>
#include <mach/clock.h> #include <plat/clock.h>
#include <mach/omap_hwmod.h> #include <plat/omap_hwmod.h>
#include "cm.h" #include "cm.h"

6
arch/arm/mach-omap2/omap_hwmod_2420.h
View file

@ -16,10 +16,10 @@
#ifdef CONFIG_ARCH_OMAP2420 #ifdef CONFIG_ARCH_OMAP2420
#include <mach/omap_hwmod.h> #include <plat/omap_hwmod.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/cpu.h> #include <plat/cpu.h>
#include <mach/dma.h> #include <plat/dma.h>
#include "prm-regbits-24xx.h" #include "prm-regbits-24xx.h"

6
arch/arm/mach-omap2/omap_hwmod_2430.h
View file

@ -16,10 +16,10 @@
#ifdef CONFIG_ARCH_OMAP2430 #ifdef CONFIG_ARCH_OMAP2430
#include <mach/omap_hwmod.h> #include <plat/omap_hwmod.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/cpu.h> #include <plat/cpu.h>
#include <mach/dma.h> #include <plat/dma.h>
#include "prm-regbits-24xx.h" #include "prm-regbits-24xx.h"

6
arch/arm/mach-omap2/omap_hwmod_34xx.h
View file

@ -14,10 +14,10 @@
#ifdef CONFIG_ARCH_OMAP34XX #ifdef CONFIG_ARCH_OMAP34XX
#include <mach/omap_hwmod.h> #include <plat/omap_hwmod.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/cpu.h> #include <plat/cpu.h>
#include <mach/dma.h> #include <plat/dma.h>
#include "prm-regbits-34xx.h" #include "prm-regbits-34xx.h"

8
arch/arm/mach-omap2/pm-debug.c
View file

@ -26,10 +26,10 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/module.h> #include <linux/module.h>
#include <mach/clock.h> #include <plat/clock.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/powerdomain.h> #include <plat/powerdomain.h>
#include <mach/clockdomain.h> #include <plat/clockdomain.h>
#include "prm.h" #include "prm.h"
#include "cm.h" #include "cm.h"

2
arch/arm/mach-omap2/pm.h
View file

@ -11,7 +11,7 @@
#ifndef __ARCH_ARM_MACH_OMAP2_PM_H #ifndef __ARCH_ARM_MACH_OMAP2_PM_H
#define __ARCH_ARM_MACH_OMAP2_PM_H #define __ARCH_ARM_MACH_OMAP2_PM_H
#include <mach/powerdomain.h> #include <plat/powerdomain.h>
extern int omap3_pm_get_suspend_state(struct powerdomain *pwrdm); extern int omap3_pm_get_suspend_state(struct powerdomain *pwrdm);
extern int omap3_pm_set_suspend_state(struct powerdomain *pwrdm, int state); extern int omap3_pm_set_suspend_state(struct powerdomain *pwrdm, int state);

16
arch/arm/mach-omap2/pm24xx.c
View file

@ -36,12 +36,12 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/clock.h> #include <plat/clock.h>
#include <mach/sram.h> #include <plat/sram.h>
#include <mach/control.h> #include <plat/control.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/dma.h> #include <plat/dma.h>
#include <mach/board.h> #include <plat/board.h>
#include "prm.h" #include "prm.h"
#include "prm-regbits-24xx.h" #include "prm-regbits-24xx.h"
@ -50,8 +50,8 @@
#include "sdrc.h" #include "sdrc.h"
#include "pm.h" #include "pm.h"
#include <mach/powerdomain.h> #include <plat/powerdomain.h>
#include <mach/clockdomain.h> #include <plat/clockdomain.h>
static void (*omap2_sram_idle)(void); static void (*omap2_sram_idle)(void);
static void (*omap2_sram_suspend)(u32 dllctrl, void __iomem *sdrc_dlla_ctrl, static void (*omap2_sram_suspend)(u32 dllctrl, void __iomem *sdrc_dlla_ctrl,

10
arch/arm/mach-omap2/pm34xx.c
View file

@ -23,11 +23,11 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <mach/sram.h> #include <plat/sram.h>
#include <mach/clockdomain.h> #include <plat/clockdomain.h>
#include <mach/powerdomain.h> #include <plat/powerdomain.h>
#include <mach/control.h> #include <plat/control.h>
#include <mach/serial.h> #include <plat/serial.h>
#include "cm.h" #include "cm.h"
#include "cm-regbits-34xx.h" #include "cm-regbits-34xx.h"

6
arch/arm/mach-omap2/powerdomain.c
View file

@ -31,9 +31,9 @@
#include "prm.h" #include "prm.h"
#include "prm-regbits-34xx.h" #include "prm-regbits-34xx.h"
#include <mach/cpu.h> #include <plat/cpu.h>
#include <mach/powerdomain.h> #include <plat/powerdomain.h>
#include <mach/clockdomain.h> #include <plat/clockdomain.h>
#include "pm.h" #include "pm.h"

2
arch/arm/mach-omap2/powerdomains.h
View file

@ -63,7 +63,7 @@
* XXX encode hardware fixed wakeup dependencies -- esp. for 3430 CORE * XXX encode hardware fixed wakeup dependencies -- esp. for 3430 CORE
*/ */
#include <mach/powerdomain.h> #include <plat/powerdomain.h>
#include "prcm-common.h" #include "prcm-common.h"
#include "prm.h" #include "prm.h"

2
arch/arm/mach-omap2/powerdomains24xx.h
View file

@ -20,7 +20,7 @@
* the array in mach-omap2/powerdomains.h. * the array in mach-omap2/powerdomains.h.
*/ */
#include <mach/powerdomain.h> #include <plat/powerdomain.h>
#include "prcm-common.h" #include "prcm-common.h"
#include "prm.h" #include "prm.h"

2
arch/arm/mach-omap2/powerdomains34xx.h
View file

@ -20,7 +20,7 @@
* the array in mach-omap2/powerdomains.h. * the array in mach-omap2/powerdomains.h.
*/ */
#include <mach/powerdomain.h> #include <plat/powerdomain.h>
#include "prcm-common.h" #include "prcm-common.h"
#include "prm.h" #include "prm.h"

4
arch/arm/mach-omap2/prcm.c
View file

@ -19,8 +19,8 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/prcm.h> #include <plat/prcm.h>
#include "clock.h" #include "clock.h"
#include "prm.h" #include "prm.h"

2
arch/arm/mach-omap2/sdram-micron-mt46h32m32lf-6.h
View file

@ -14,7 +14,7 @@
#ifndef ARCH_ARM_MACH_OMAP2_SDRAM_MICRON_MT46H32M32LF #ifndef ARCH_ARM_MACH_OMAP2_SDRAM_MICRON_MT46H32M32LF
#define ARCH_ARM_MACH_OMAP2_SDRAM_MICRON_MT46H32M32LF #define ARCH_ARM_MACH_OMAP2_SDRAM_MICRON_MT46H32M32LF
#include <mach/sdrc.h> #include <plat/sdrc.h>
/* Micron MT46H32M32LF-6 */ /* Micron MT46H32M32LF-6 */
/* XXX Using ARE = 0x1 (no autorefresh burst) -- can this be changed? */ /* XXX Using ARE = 0x1 (no autorefresh burst) -- can this be changed? */

2
arch/arm/mach-omap2/sdram-qimonda-hyb18m512160af-6.h
View file

@ -14,7 +14,7 @@
#ifndef ARCH_ARM_MACH_OMAP2_SDRAM_QIMONDA_HYB18M512160AF6 #ifndef ARCH_ARM_MACH_OMAP2_SDRAM_QIMONDA_HYB18M512160AF6
#define ARCH_ARM_MACH_OMAP2_SDRAM_QIMONDA_HYB18M512160AF6 #define ARCH_ARM_MACH_OMAP2_SDRAM_QIMONDA_HYB18M512160AF6
#include <mach/sdrc.h> #include <plat/sdrc.h>
/* Qimonda HYB18M512160AF-6 */ /* Qimonda HYB18M512160AF-6 */
static struct omap_sdrc_params hyb18m512160af6_sdrc_params[] = { static struct omap_sdrc_params hyb18m512160af6_sdrc_params[] = {

8
arch/arm/mach-omap2/sdrc.c
View file

@ -23,13 +23,13 @@
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/io.h> #include <linux/io.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/clock.h> #include <plat/clock.h>
#include <mach/sram.h> #include <plat/sram.h>
#include "prm.h" #include "prm.h"
#include <mach/sdrc.h> #include <plat/sdrc.h>
#include "sdrc.h" #include "sdrc.h"
static struct omap_sdrc_params *sdrc_init_params_cs0, *sdrc_init_params_cs1; static struct omap_sdrc_params *sdrc_init_params_cs0, *sdrc_init_params_cs1;

2
arch/arm/mach-omap2/sdrc.h
View file

@ -15,7 +15,7 @@
*/ */
#undef DEBUG #undef DEBUG
#include <mach/sdrc.h> #include <plat/sdrc.h>
#ifndef __ASSEMBLER__ #ifndef __ASSEMBLER__
extern void __iomem *omap2_sdrc_base; extern void __iomem *omap2_sdrc_base;

8
arch/arm/mach-omap2/sdrc2xxx.c
View file

@ -24,13 +24,13 @@
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/io.h> #include <linux/io.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/clock.h> #include <plat/clock.h>
#include <mach/sram.h> #include <plat/sram.h>
#include "prm.h" #include "prm.h"
#include "clock.h" #include "clock.h"
#include <mach/sdrc.h> #include <plat/sdrc.h>
#include "sdrc.h" #include "sdrc.h"
/* Memory timing, DLL mode flags */ /* Memory timing, DLL mode flags */

8
arch/arm/mach-omap2/serial.c
View file

@ -24,10 +24,10 @@
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/io.h> #include <linux/io.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/clock.h> #include <plat/clock.h>
#include <mach/control.h> #include <plat/control.h>
#include "prm.h" #include "prm.h"
#include "pm.h" #include "pm.h"

2
arch/arm/mach-omap2/sleep24xx.S
View file

@ -29,7 +29,7 @@
#include <asm/assembler.h> #include <asm/assembler.h>
#include <mach/io.h> #include <mach/io.h>
#include <mach/omap24xx.h> #include <plat/omap24xx.h>
#include "sdrc.h" #include "sdrc.h"

2
arch/arm/mach-omap2/sleep34xx.S
View file

@ -27,7 +27,7 @@
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/assembler.h> #include <asm/assembler.h>
#include <mach/io.h> #include <mach/io.h>
#include <mach/control.h> #include <plat/control.h>
#include "prm.h" #include "prm.h"
#include "sdrc.h" #include "sdrc.h"

2
arch/arm/mach-omap2/timer-gp.c
View file

@ -37,7 +37,7 @@
#include <linux/clockchips.h> #include <linux/clockchips.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <mach/dmtimer.h> #include <plat/dmtimer.h>
#include <asm/localtimer.h> #include <asm/localtimer.h>
/* MAX_GPTIMER_ID: number of GPTIMERs on the chip */ /* MAX_GPTIMER_ID: number of GPTIMERs on the chip */

4
arch/arm/mach-omap2/usb-musb.c
View file

@ -28,8 +28,8 @@
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/usb.h> #include <plat/usb.h>
#ifdef CONFIG_USB_MUSB_SOC #ifdef CONFIG_USB_MUSB_SOC

4
arch/arm/mach-omap2/usb-tusb6010.c
View file

@ -16,8 +16,8 @@
#include <linux/usb/musb.h> #include <linux/usb/musb.h>
#include <mach/gpmc.h> #include <plat/gpmc.h>
#include <mach/mux.h> #include <plat/mux.h>
static u8 async_cs, sync_cs; static u8 async_cs, sync_cs;

2
arch/arm/plat-omap/clock.c
View file

@ -24,7 +24,7 @@
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <linux/io.h> #include <linux/io.h>
#include <mach/clock.h> #include <plat/clock.h>
static LIST_HEAD(clocks); static LIST_HEAD(clocks);
static DEFINE_MUTEX(clocks_mutex); static DEFINE_MUTEX(clocks_mutex);

12
arch/arm/plat-omap/common.c
View file

@ -29,13 +29,13 @@
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <mach/common.h> #include <plat/common.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/control.h> #include <plat/control.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/fpga.h> #include <plat/fpga.h>
#include <mach/clock.h> #include <plat/clock.h>
#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
# include "../mach-omap2/sdrc.h" # include "../mach-omap2/sdrc.h"

2
arch/arm/plat-omap/cpu-omap.c
View file

@ -23,7 +23,7 @@
#include <linux/io.h> #include <linux/io.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/clock.h> #include <plat/clock.h>
#include <asm/system.h> #include <asm/system.h>
#define VERY_HI_RATE 900000000 #define VERY_HI_RATE 900000000

2
arch/arm/plat-omap/debug-devices.c
View file

@ -16,7 +16,7 @@
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/gpio.h> #include <mach/gpio.h>

2
arch/arm/plat-omap/debug-leds.c
View file

@ -18,7 +18,7 @@
#include <asm/system.h> #include <asm/system.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <mach/fpga.h> #include <plat/fpga.h>
#include <mach/gpio.h> #include <mach/gpio.h>

16
arch/arm/plat-omap/devices.c
View file

@ -19,15 +19,15 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
#include <mach/tc.h> #include <plat/tc.h>
#include <mach/control.h> #include <plat/control.h>
#include <mach/board.h> #include <plat/board.h>
#include <mach/mmc.h> #include <plat/mmc.h>
#include <mach/mux.h> #include <plat/mux.h>
#include <mach/gpio.h> #include <mach/gpio.h>
#include <mach/menelaus.h> #include <plat/menelaus.h>
#include <mach/mcbsp.h> #include <plat/mcbsp.h>
#include <mach/dsp_common.h> #include <plat/dsp_common.h>
#if defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE) #if defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE)

4
arch/arm/plat-omap/dma.c
View file

@ -32,9 +32,9 @@
#include <asm/system.h> #include <asm/system.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <mach/dma.h> #include <plat/dma.h>
#include <mach/tc.h> #include <plat/tc.h>
#undef DEBUG #undef DEBUG

Some files were not shown because too many files have changed in this diff Show more