ARM: OMAP1: Move flash.h from plat to mach
authorTony Lindgren <tony@atomide.com>
Thu, 20 Sep 2012 18:41:37 +0000 (11:41 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 20 Sep 2012 22:02:47 +0000 (15:02 -0700)
This is only used by omap1.

Signed-off-by: Tony Lindgren <tony@atomide.com>
14 files changed:
arch/arm/mach-omap1/board-fsample.c
arch/arm/mach-omap1/board-h2.c
arch/arm/mach-omap1/board-h3.c
arch/arm/mach-omap1/board-innovator.c
arch/arm/mach-omap1/board-osk.c
arch/arm/mach-omap1/board-palmte.c
arch/arm/mach-omap1/board-palmtt.c
arch/arm/mach-omap1/board-palmz71.c
arch/arm/mach-omap1/board-perseus2.c
arch/arm/mach-omap1/board-sx1.c
arch/arm/mach-omap1/board-voiceblue.c
arch/arm/mach-omap1/flash.c
arch/arm/mach-omap1/include/mach/flash.h [new file with mode: 0644]
arch/arm/plat-omap/include/plat/flash.h [deleted file]

index 63aa634ce29ff17ec34f88a09c2376680a424ffd..4b6de70c47a686576795c1a59db319590a53efb8 100644 (file)
@@ -29,7 +29,7 @@
 
 #include <plat/tc.h>
 #include <mach/mux.h>
-#include <plat/flash.h>
+#include <mach/flash.h>
 #include <plat/fpga.h>
 #include <linux/platform_data/keypad-omap.h>
 
index 093297e50ec7655fc316ef6494143dd1fcbb830c..ec2ebd38c2d3271da1521dca41b61608f3e57ca1 100644 (file)
@@ -42,7 +42,7 @@
 #include <plat/tc.h>
 #include <plat/irda.h>
 #include <linux/platform_data/keypad-omap.h>
-#include <plat/flash.h>
+#include <mach/flash.h>
 
 #include <mach/hardware.h>
 #include <mach/usb.h>
index adc0373299eca5462299491b98ea5394dd965c3b..06d11b1ee9c6889482cc355203810c3dd80d0093 100644 (file)
@@ -43,7 +43,7 @@
 #include <plat/tc.h>
 #include <linux/platform_data/keypad-omap.h>
 #include <plat/dma.h>
-#include <plat/flash.h>
+#include <mach/flash.h>
 
 #include <mach/hardware.h>
 #include <mach/irqs.h>
index 04a67230cc944ad9e3492dd7da708b77f1f62189..db5f7d2976e7286af4d89e52d2c3d7ba02d5a4c0 100644 (file)
@@ -32,7 +32,7 @@
 #include <asm/mach/map.h>
 
 #include <mach/mux.h>
-#include <plat/flash.h>
+#include <mach/flash.h>
 #include <plat/fpga.h>
 #include <plat/tc.h>
 #include <linux/platform_data/keypad-omap.h>
index 3ef0bba65b61489971d374521532c2d23d7678d7..2f1f9b967576d4a9a0a07f9035a41b7666058087 100644 (file)
@@ -46,7 +46,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <plat/flash.h>
+#include <mach/flash.h>
 #include <mach/mux.h>
 #include <plat/tc.h>
 
index b633b386240ea640162d29fa3d767896d010a66b..43abbd4344b50269ce9ac79a805dc7dc3e078fd6 100644 (file)
@@ -34,7 +34,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <plat/flash.h>
+#include <mach/flash.h>
 #include <mach/mux.h>
 #include <plat/tc.h>
 #include <plat/dma.h>
index 518b94dbeae140f85fe8595114fd62df34a9ff3f..0c83634dc150d5b931d64248828f84d66faa6280 100644 (file)
@@ -34,7 +34,7 @@
 #include <asm/mach/map.h>
 
 #include <plat/led.h>
-#include <plat/flash.h>
+#include <mach/flash.h>
 #include <mach/mux.h>
 #include <plat/dma.h>
 #include <plat/tc.h>
index f4a615d61f695ad6f4ee764f96d710b953c6eb45..38935d83f08d7a79f875073ee57b97285c9f2e49 100644 (file)
@@ -36,7 +36,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <plat/flash.h>
+#include <mach/flash.h>
 #include <mach/mux.h>
 #include <plat/dma.h>
 #include <plat/tc.h>
index cc38e36b3764540890b76ac58fa9f3c2df6dfb6c..198b05417bfcd49a6c9194e182743b3e5ebf7464 100644 (file)
@@ -31,7 +31,7 @@
 #include <plat/tc.h>
 #include <mach/mux.h>
 #include <plat/fpga.h>
-#include <plat/flash.h>
+#include <mach/flash.h>
 
 #include <mach/hardware.h>
 
index aef2a428883b2348814906f060af306c61ff2de0..eab9b3b5c38e1bb5092b5342d3822fc70b8f3f8a 100644 (file)
@@ -34,7 +34,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <plat/flash.h>
+#include <mach/flash.h>
 #include <mach/mux.h>
 #include <plat/dma.h>
 #include <plat/irda.h>
index 64289ea8902b5e798252a86b39adcbc7bfec5e2d..ad75e3411d462c0fc62e5012a4b4801b397a6962 100644 (file)
@@ -32,7 +32,7 @@
 #include <asm/mach/map.h>
 
 #include <mach/board-voiceblue.h>
-#include <plat/flash.h>
+#include <mach/flash.h>
 #include <mach/mux.h>
 #include <plat/tc.h>
 
index 401eb3c080c2f325de709d805aac2fc9f260c9f2..73ae6169aa4a01829654f0c92f1958d1629cb432 100644 (file)
@@ -11,7 +11,7 @@
 #include <linux/mtd/map.h>
 
 #include <plat/tc.h>
-#include <plat/flash.h>
+#include <mach/flash.h>
 
 #include <mach/hardware.h>
 
diff --git a/arch/arm/mach-omap1/include/mach/flash.h b/arch/arm/mach-omap1/include/mach/flash.h
new file mode 100644 (file)
index 0000000..0d88499
--- /dev/null
@@ -0,0 +1,17 @@
+/*
+ * Flash support for OMAP1
+ *
+ * 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_FLASH_H
+#define __OMAP_FLASH_H
+
+#include <linux/mtd/map.h>
+
+struct platform_device;
+extern void omap1_set_vpp(struct platform_device *pdev, int enable);
+
+#endif
diff --git a/arch/arm/plat-omap/include/plat/flash.h b/arch/arm/plat-omap/include/plat/flash.h
deleted file mode 100644 (file)
index 0d88499..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Flash support for OMAP1
- *
- * 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_FLASH_H
-#define __OMAP_FLASH_H
-
-#include <linux/mtd/map.h>
-
-struct platform_device;
-extern void omap1_set_vpp(struct platform_device *pdev, int enable);
-
-#endif