ARM: DaVinci: fixup include paths after asm/arch --> mach change

Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>

arch/arm/mach-davinci/board-evm.c

@@ -33,6 +33,7 @@
 #include <asm/mach/flash.h>
 
 #include <mach/common.h>
+#include <mach/board.h>
 
 /* other misc. init functions */
 void __init davinci_psc_init(void);

arch/arm/mach-davinci/common.c

@@ -20,17 +20,17 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 
-#include <asm/hardware.h>
 #include <asm/system.h>
 #include <asm/pgtable.h>
 #include <asm/mach/map.h>
 #include <asm/setup.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/serial.h>
-#include <asm/arch/mux.h>
+#include <mach/hardware.h>
+#include <mach/board.h>
+#include <mach/serial.h>
+#include <mach/mux.h>
 
-#include <asm/arch/clock.h>
+#include <mach/clock.h>
 
 #define NO_LENGTH_CHECK 0xffffffff
 

arch/arm/mach-davinci/devices.c

@@ -15,11 +15,12 @@
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 
-#include <asm/hardware.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
 #include <asm/mach/map.h>
 
+#include <mach/hardware.h>
+
 #if 	defined(CONFIG_I2C_DAVINCI) || defined(CONFIG_I2C_DAVINCI_MODULE)
 
 static struct resource i2c_resources[] = {

arch/arm/mach-davinci/dma.c

@@ -30,12 +30,12 @@
 #include <linux/platform_device.h>
 #include <linux/spinlock.h>
 #include <asm/io.h>
-#include <asm/arch/memory.h>
+#include <mach/memory.h>
 #include <linux/kernel.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/irqs.h>
+#include <mach/hardware.h>
+#include <mach/irqs.h>
 
-#include <asm/arch/edma.h>
+#include <mach/edma.h>
 
 static spinlock_t dma_chan_lock;
 static struct device_driver edma_driver;

arch/arm/mach-davinci/i2c-client.c

@@ -27,9 +27,9 @@
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/clk.h>
+#include <linux/semaphore.h>
 
-#include <asm/semaphore.h>
-#include <asm/arch/i2c-client.h>
+#include <mach/i2c-client.h>
 
 static DEFINE_MUTEX(expander_lock);
 static struct i2c_client *client_handle;

arch/arm/mach-davinci/i2c-emac.c

@@ -17,7 +17,7 @@
 #include <linux/string.h>
 #include <linux/errno.h>
 
-#include <asm/arch/i2c-client.h>
+#include <mach/i2c-client.h>
 
 /* Get Ethernet address from kernel boot params */
 static unsigned char cpmac_eth_string[20] = "deadbeef";

arch/arm/mach-davinci/include/mach/board.h

 /*
- *  linux/include/asm-arm/arch-davinci/board.h
- *
  *  Information structures for board-specific data
  *
  *  Derived from OMAP board.h:

arch/arm/mach-davinci/include/mach/edma.h

 /*
- *  linux/include/asm-arm/arch-davinci/edma.h
- *
  *  BRIEF MODULE DESCRIPTION
  *      TI DAVINCI dma definitions
  *

arch/arm/mach-davinci/include/mach/mcbsp.h

@@ -30,8 +30,8 @@
 #ifndef __ASM_ARCH_DAVINCI_MCBSP_H
 #define __ASM_ARCH_DAVINCI_MCBSP_H
 
-#include <asm/hardware.h>
-#include <asm/arch/irqs.h>
+#include <mach/hardware.h>
+#include <mach/irqs.h>
 
 #define DAVINCI_MCBSP1_BASE	 DAVINCI_MCBSP_BASE
 #define DAVINCI_DMA_MCBSP1_RX 3

arch/arm/mach-davinci/mcbsp.c

@@ -27,10 +27,10 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 
-#include <asm/arch/memory.h>
-#include <asm/arch/edma.h>
-#include <asm/arch/irqs.h>
-#include <asm/arch/mcbsp.h>
+#include <mach/memory.h>
+#include <mach/edma.h>
+#include <mach/irqs.h>
+#include <mach/mcbsp.h>
 
 struct clk *mbspclk = NULL;
 

arch/arm/mach-davinci/serial.c

@@ -32,6 +32,7 @@
 #include <mach/hardware.h>
 #include <mach/serial.h>
 #include <mach/irqs.h>
+#include <mach/board.h>
 
 #define UART_DAVINCI_PWREMU 0x0c
 

drivers/i2c/chips/gpio_expander_davinci.c

@@ -16,7 +16,7 @@
 #include <linux/errno.h>
 #include <linux/mutex.h>
 
-#include <asm/arch/i2c-client.h>
+#include <mach/i2c-client.h>
 
 static DEFINE_MUTEX(expander_lock);
 

drivers/mmc/host/davinci_mmc.c

@@ -40,12 +40,13 @@
 #include <linux/irq.h>
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
-#include <asm/hardware.h>
-#include <asm/arch/irqs.h>
-#include <asm/arch/hardware.h>
+
+#include <mach/hardware.h>
+#include <mach/irqs.h>
+#include <mach/hardware.h>
 
 #include "davinci_mmc.h"
-#include <asm/arch/edma.h>
+#include <mach/edma.h>
 
 extern void davinci_clean_channel(int ch_no);
 

drivers/mtd/nand/davinci_nand.c

@@ -46,9 +46,9 @@
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/nand.h>
-#include <asm/arch/mux.h>
+#include <mach/hardware.h>
+#include <mach/nand.h>
+#include <mach/mux.h>
 
 #include <asm/mach/flash.h>
 

drivers/net/davinci_emac.c

@@ -58,15 +58,15 @@
 #include <linux/dma-mapping.h>
 #include <linux/clk.h>
 #include <linux/platform_device.h>
+#include <linux/semaphore.h>
 #include <asm/irq.h>
 #include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include <asm/semaphore.h>
 #include <asm/page.h>
-#include <asm/arch/memory.h>
-#include <asm/arch/cpu.h>
-#include <asm/arch/hardware.h>
+#include <mach/memory.h>
+#include <mach/cpu.h>
+#include <mach/hardware.h>
 
 #include "davinci_emac_phy.h"
 

drivers/rtc/rtc-davinci-evm.c

@@ -30,7 +30,7 @@
 #include <linux/platform_device.h>
 
 #include <asm/mach-types.h>
-#include <asm/arch/i2c-client.h>
+#include <mach/i2c-client.h>
 
 
 /* REVISIT

include/video/davincifb.h

@@ -13,7 +13,7 @@
 #ifndef _DAVINCIFB_H_
 #define _DAVINCIFB_H_
 
-#include <asm/arch/io.h>
+#include <mach/io.h>
 
 /* Base registers */
 #define	VPBE_REG_BASE				IO_ADDRESS(0x01c72780)

sound/oss/davinci-audio-aic33.c

@@ -30,11 +30,11 @@
 #include <sound/davincisound.h>
 
 #include <asm/uaccess.h>
-#include <asm/hardware.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
 
-#include <asm/arch/mcbsp.h>
+#include <mach/hardware.h>
+#include <mach/mcbsp.h>
 #include "davinci-aic33.h"
 
 #include "davinci-audio.h"

sound/oss/davinci-audio-dma-intfc.c

@@ -50,16 +50,16 @@
 #include <linux/dma-mapping.h>
 #include <linux/completion.h>
 #include <linux/delay.h>
+#include <linux/semaphore.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
-#include <asm/hardware.h>
-#include <asm/semaphore.h>
 #include <asm/delay.h>
 
-#include <asm/arch/mcbsp.h>
-#include <asm/arch/edma.h>
-#include <asm/arch/memory.h>
+#include <mach/hardware.h>
+#include <mach/mcbsp.h>
+#include <mach/edma.h>
+#include <mach/memory.h>
 
 #include "davinci-audio-dma-intfc.h"
 #include "davinci-audio.h"

sound/oss/davinci-audio.c

@@ -47,11 +47,12 @@
 #include <linux/delay.h>
 #include <linux/platform_device.h>
 #include <linux/completion.h>
+#include <linux/semaphore.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
-#include <asm/hardware.h>
-#include <asm/semaphore.h>
+
+#include <mach/hardware.h>
 
 #include "davinci-audio-dma-intfc.h"
 #include "davinci-audio.h"

sound/oss/davinci-audio.h

@@ -24,7 +24,7 @@
 #define __DAVINCI_AUDIO_H
 
 /* Requires dma.h */
-#include <asm/arch/dma.h>
+#include <mach/dma.h>
 
 /*
  * Buffer Management