[ARM] pxa: move mach/i2c.h to plat/i2c.h

Signed-off-by: Paul Shen <paul.shen@marvell.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
author: Eric Miao <eric.miao@marvell.com> 2009-04-13 03:03:11 -0400
committer: Eric Miao <eric.y.miao@gmail.com> 2009-06-04 22:32:01 -0400
commit: f0a83701399123b0e95cc4d949fcccf9941fd190 (patch)
tree: 4074ae13ab01dca8073288a9b9a0e048fc12a551
parent: f23d4911319fdebffd0529b31bb66d324ef287e6 (diff)
23 files changed, 22 insertions, 22 deletions
diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c
index a9f48b1cb54..a97f87a90d0 100644
--- a/arch/arm/mach-pxa/cm-x300.c
+++ b/arch/arm/mach-pxa/cm-x300.c
@@ -32,7 +32,7 @@
 #include <mach/pxafb.h>
 #include <mach/mmc.h>
 #include <mach/ohci.h>
-#include <mach/i2c.h>
+#include <plat/i2c.h>
 #include <mach/pxa3xx_nand.h>
 #include <asm/mach/map.h>
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c
index 930e364ccde..f04e5058328 100644
--- a/arch/arm/mach-pxa/corgi.c
+++ b/arch/arm/mach-pxa/corgi.c
@@ -42,7 +42,7 @@
 #include <asm/mach/irq.h>
 #include <mach/pxa25x.h>
-#include <mach/i2c.h>
+#include <plat/i2c.h>
 #include <mach/irda.h>
 #include <mach/mmc.h>
 #include <mach/udc.h>
diff --git a/arch/arm/mach-pxa/csb726.c b/arch/arm/mach-pxa/csb726.c
index 2b289f83a61..f95b32d9899 100644
--- a/arch/arm/mach-pxa/csb726.c
+++ b/arch/arm/mach-pxa/csb726.c
@@ -21,7 +21,7 @@
 #include <asm/mach/arch.h>
 #include <mach/csb726.h>
 #include <mach/mfp-pxa27x.h>
-#include <mach/i2c.h>
+#include <plat/i2c.h>
 #include <mach/mmc.h>
 #include <mach/ohci.h>
 #include <mach/pxa2xx-regs.h>
diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c
index 899418e18a2..d3c3b7b025a 100644
--- a/arch/arm/mach-pxa/devices.c
+++ b/arch/arm/mach-pxa/devices.c
@@ -8,7 +8,7 @@
 #include <mach/pxafb.h>
 #include <mach/mmc.h>
 #include <mach/irda.h>
-#include <mach/i2c.h>
+#include <plat/i2c.h>
 #include <mach/ohci.h>
 #include <mach/pxa27x_keypad.h>
 #include <mach/pxa2xx_spi.h>
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c
index bc0f73fbd4c..3503f523070 100644
--- a/arch/arm/mach-pxa/em-x270.c
+++ b/arch/arm/mach-pxa/em-x270.c
@@ -41,7 +41,7 @@
 #include <mach/ohci.h>
 #include <mach/mmc.h>
 #include <mach/pxa27x_keypad.h>
-#include <mach/i2c.h>
+#include <plat/i2c.h>
 #include <mach/camera.h>
 #include <mach/pxa2xx_spi.h>
diff --git a/arch/arm/mach-pxa/ezx.c b/arch/arm/mach-pxa/ezx.c
index 7db966dc29c..4ce63b4e15c 100644
--- a/arch/arm/mach-pxa/ezx.c
+++ b/arch/arm/mach-pxa/ezx.c
@@ -25,7 +25,7 @@
 #include <mach/pxa27x.h>
 #include <mach/pxafb.h>
 #include <mach/ohci.h>
-#include <mach/i2c.h>
+#include <plat/i2c.h>
 #include <mach/hardware.h>
 #include <mach/pxa27x_keypad.h>
diff --git a/arch/arm/mach-pxa/imote2.c b/arch/arm/mach-pxa/imote2.c
index 2121309b247..821e65a4097 100644
--- a/arch/arm/mach-pxa/imote2.c
+++ b/arch/arm/mach-pxa/imote2.c
@@ -29,7 +29,7 @@
 #include <asm/mach/flash.h>
 #include <mach/pxa27x.h>
-#include <mach/i2c.h>
+#include <plat/i2c.h>
 #include <mach/udc.h>
 #include <mach/mmc.h>
 #include <mach/pxa2xx_spi.h>
diff --git a/arch/arm/mach-pxa/littleton.c b/arch/arm/mach-pxa/littleton.c
index c872b9feb4d..ad5378b1af9 100644
--- a/arch/arm/mach-pxa/littleton.c
+++ b/arch/arm/mach-pxa/littleton.c
@@ -43,7 +43,7 @@
 #include <mach/pxafb.h>
 #include <mach/ssp.h>
 #include <mach/pxa2xx_spi.h>
-#include <mach/i2c.h>
+#include <plat/i2c.h>
 #include <mach/pxa27x_keypad.h>
 #include <mach/pxa3xx_nand.h>
 #include <mach/littleton.h>
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c
index c899bbd94dc..5a9df973935 100644
--- a/arch/arm/mach-pxa/magician.c
+++ b/arch/arm/mach-pxa/magician.c
@@ -36,7 +36,7 @@
 #include <mach/pxa27x.h>
 #include <mach/magician.h>
 #include <mach/pxafb.h>
-#include <mach/i2c.h>
+#include <plat/i2c.h>
 #include <mach/mmc.h>
 #include <mach/irda.h>
 #include <mach/ohci.h>
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c
index a6c8429e975..f4dabf0273c 100644
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
@@ -46,7 +46,7 @@
 #include <mach/mainstone.h>
 #include <mach/audio.h>
 #include <mach/pxafb.h>
-#include <mach/i2c.h>
+#include <plat/i2c.h>
 #include <mach/mmc.h>
 #include <mach/irda.h>
 #include <mach/ohci.h>
diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c
index ff8052ce0a0..804c25c4a06 100644
--- a/arch/arm/mach-pxa/mioa701.c
+++ b/arch/arm/mach-pxa/mioa701.c
@@ -48,7 +48,7 @@
 #include <mach/mmc.h>
 #include <mach/udc.h>
 #include <mach/pxa27x-udc.h>
-#include <mach/i2c.h>
+#include <plat/i2c.h>
 #include <mach/camera.h>
 #include <mach/audio.h>
 #include <media/soc_camera.h>
diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c
index 6c12b5a3132..095521e9ee2 100644
--- a/arch/arm/mach-pxa/pcm990-baseboard.c
+++ b/arch/arm/mach-pxa/pcm990-baseboard.c
@@ -28,7 +28,7 @@
 #include <media/soc_camera.h>
 #include <asm/gpio.h>
-#include <mach/i2c.h>
+#include <plat/i2c.h>
 #include <mach/camera.h>
 #include <asm/mach/map.h>
 #include <mach/pxa27x.h>
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c
index 036bbde4d22..74f4ce600ca 100644
--- a/arch/arm/mach-pxa/poodle.c
+++ b/arch/arm/mach-pxa/poodle.c
@@ -39,7 +39,7 @@
 #include <mach/pxa25x.h>
 #include <mach/mmc.h>
 #include <mach/udc.h>
-#include <mach/i2c.h>
+#include <plat/i2c.h>
 #include <mach/irda.h>
 #include <mach/poodle.h>
 #include <mach/pxafb.h>
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
index a425ec71e65..c54ad8b3343 100644
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@ -27,7 +27,7 @@
 #include <mach/ohci.h>
 #include <mach/pm.h>
 #include <mach/dma.h>
-#include <mach/i2c.h>
+#include <plat/i2c.h>
 #include "generic.h"
 #include "devices.h"
diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c
index b02d4544dc9..462503a2e79 100644
--- a/arch/arm/mach-pxa/pxa3xx.c
+++ b/arch/arm/mach-pxa/pxa3xx.c
@@ -30,7 +30,7 @@
 #include <mach/pm.h>
 #include <mach/dma.h>
 #include <mach/ssp.h>
-#include <mach/i2c.h>
+#include <plat/i2c.h>
 #include "generic.h"
 #include "devices.h"
diff --git a/arch/arm/mach-pxa/saar.c b/arch/arm/mach-pxa/saar.c
index ff823999143..8241a63ea58 100644
--- a/arch/arm/mach-pxa/saar.c
+++ b/arch/arm/mach-pxa/saar.c
@@ -27,7 +27,7 @@
 #include <asm/mach/arch.h>
 #include <mach/pxa930.h>
-#include <mach/i2c.h>
+#include <plat/i2c.h>
 #include <mach/pxafb.h>
 #include "devices.h"
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
index 5a45fe340a1..229f48577d5 100644
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@ -47,7 +47,7 @@
 #include <mach/pxa27x.h>
 #include <mach/pxa27x-udc.h>
 #include <mach/reset.h>
-#include <mach/i2c.h>
+#include <plat/i2c.h>
 #include <mach/irda.h>
 #include <mach/mmc.h>
 #include <mach/ohci.h>
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index a0bd46ef5d3..168267a5dfb 100644
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -40,7 +40,7 @@
 #include <mach/pxa25x.h>
 #include <mach/reset.h>
 #include <mach/irda.h>
-#include <mach/i2c.h>
+#include <plat/i2c.h>
 #include <mach/mmc.h>
 #include <mach/udc.h>
 #include <mach/tosa_bt.h>
diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c
index f79c9cb70ae..825f540176d 100644
--- a/arch/arm/mach-pxa/trizeps4.c
+++ b/arch/arm/mach-pxa/trizeps4.c
@@ -47,7 +47,7 @@
 #include <mach/mmc.h>
 #include <mach/irda.h>
 #include <mach/ohci.h>
-#include <mach/i2c.h>
+#include <plat/i2c.h>
 #include "generic.h"
 #include "devices.h"
diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c
index dd031cc4184..d33c232b686 100644
--- a/arch/arm/mach-pxa/viper.c
+++ b/arch/arm/mach-pxa/viper.c
@@ -45,7 +45,7 @@
 #include <mach/pxa25x.h>
 #include <mach/audio.h>
 #include <mach/pxafb.h>
-#include <mach/i2c.h>
+#include <plat/i2c.h>
 #include <mach/regs-uart.h>
 #include <mach/viper.h>
diff --git a/arch/arm/mach-pxa/zylonite_pxa300.c b/arch/arm/mach-pxa/zylonite_pxa300.c
index c256c57642c..cefd1c0a854 100644
--- a/arch/arm/mach-pxa/zylonite_pxa300.c
+++ b/arch/arm/mach-pxa/zylonite_pxa300.c
@@ -21,7 +21,7 @@
 #include <linux/gpio.h>
 #include <mach/pxa300.h>
-#include <mach/i2c.h>
+#include <plat/i2c.h>
 #include <mach/zylonite.h>
 #include "generic.h"
diff --git a/arch/arm/mach-pxa/include/mach/i2c.h b/arch/arm/plat-pxa/include/plat/i2c.h
index 1a9f65e6ec0..1a9f65e6ec0 100644
--- a/arch/arm/mach-pxa/include/mach/i2c.h
+++ b/arch/arm/plat-pxa/include/plat/i2c.h
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index e4ee8835b97..035a6c7e59d 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -36,7 +36,7 @@
 #include <asm/irq.h>
 #include <asm/io.h>
-#include <mach/i2c.h>
+#include <plat/i2c.h>
 /*
 * I2C register offsets will be shifted 0 or 1 bit left, depending on
author	Eric Miao <eric.miao@marvell.com>	2009-04-13 03:03:11 -0400
committer	Eric Miao <eric.y.miao@gmail.com>	2009-06-04 22:32:01 -0400
commit	f0a83701399123b0e95cc4d949fcccf9941fd190 (patch)
tree	4074ae13ab01dca8073288a9b9a0e048fc12a551
parent	f23d4911319fdebffd0529b31bb66d324ef287e6 (diff)

diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c index a9f48b1cb54..a97f87a90d0 100644 --- a/arch/arm/mach-pxa/cm-x300.c +++ b/arch/arm/mach-pxa/cm-x300.c
@@ -32,7 +32,7 @@
32	#include <mach/pxafb.h>	32	#include <mach/pxafb.h>
33	#include <mach/mmc.h>	33	#include <mach/mmc.h>
34	#include <mach/ohci.h>	34	#include <mach/ohci.h>
35	#include <mach/i2c.h>	35	#include <plat/i2c.h>
36	#include <mach/pxa3xx_nand.h>	36	#include <mach/pxa3xx_nand.h>
37		37
38	#include <asm/mach/map.h>	38	#include <asm/mach/map.h>


diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c index 930e364ccde..f04e5058328 100644 --- a/arch/arm/mach-pxa/corgi.c +++ b/arch/arm/mach-pxa/corgi.c
@@ -42,7 +42,7 @@
42	#include <asm/mach/irq.h>	42	#include <asm/mach/irq.h>
43		43
44	#include <mach/pxa25x.h>	44	#include <mach/pxa25x.h>
45	#include <mach/i2c.h>	45	#include <plat/i2c.h>
46	#include <mach/irda.h>	46	#include <mach/irda.h>
47	#include <mach/mmc.h>	47	#include <mach/mmc.h>
48	#include <mach/udc.h>	48	#include <mach/udc.h>


diff --git a/arch/arm/mach-pxa/csb726.c b/arch/arm/mach-pxa/csb726.c index 2b289f83a61..f95b32d9899 100644 --- a/arch/arm/mach-pxa/csb726.c +++ b/arch/arm/mach-pxa/csb726.c
@@ -21,7 +21,7 @@
21	#include <asm/mach/arch.h>	21	#include <asm/mach/arch.h>
22	#include <mach/csb726.h>	22	#include <mach/csb726.h>
23	#include <mach/mfp-pxa27x.h>	23	#include <mach/mfp-pxa27x.h>
24	#include <mach/i2c.h>	24	#include <plat/i2c.h>
25	#include <mach/mmc.h>	25	#include <mach/mmc.h>
26	#include <mach/ohci.h>	26	#include <mach/ohci.h>
27	#include <mach/pxa2xx-regs.h>	27	#include <mach/pxa2xx-regs.h>


diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c index 899418e18a2..d3c3b7b025a 100644 --- a/arch/arm/mach-pxa/devices.c +++ b/arch/arm/mach-pxa/devices.c
@@ -8,7 +8,7 @@
8	#include <mach/pxafb.h>	8	#include <mach/pxafb.h>
9	#include <mach/mmc.h>	9	#include <mach/mmc.h>
10	#include <mach/irda.h>	10	#include <mach/irda.h>
11	#include <mach/i2c.h>	11	#include <plat/i2c.h>
12	#include <mach/ohci.h>	12	#include <mach/ohci.h>
13	#include <mach/pxa27x_keypad.h>	13	#include <mach/pxa27x_keypad.h>
14	#include <mach/pxa2xx_spi.h>	14	#include <mach/pxa2xx_spi.h>


diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c index bc0f73fbd4c..3503f523070 100644 --- a/arch/arm/mach-pxa/em-x270.c +++ b/arch/arm/mach-pxa/em-x270.c
@@ -41,7 +41,7 @@
41	#include <mach/ohci.h>	41	#include <mach/ohci.h>
42	#include <mach/mmc.h>	42	#include <mach/mmc.h>
43	#include <mach/pxa27x_keypad.h>	43	#include <mach/pxa27x_keypad.h>
44	#include <mach/i2c.h>	44	#include <plat/i2c.h>
45	#include <mach/camera.h>	45	#include <mach/camera.h>
46	#include <mach/pxa2xx_spi.h>	46	#include <mach/pxa2xx_spi.h>
47		47


diff --git a/arch/arm/mach-pxa/ezx.c b/arch/arm/mach-pxa/ezx.c index 7db966dc29c..4ce63b4e15c 100644 --- a/arch/arm/mach-pxa/ezx.c +++ b/arch/arm/mach-pxa/ezx.c
@@ -25,7 +25,7 @@
25	#include <mach/pxa27x.h>	25	#include <mach/pxa27x.h>
26	#include <mach/pxafb.h>	26	#include <mach/pxafb.h>
27	#include <mach/ohci.h>	27	#include <mach/ohci.h>
28	#include <mach/i2c.h>	28	#include <plat/i2c.h>
29	#include <mach/hardware.h>	29	#include <mach/hardware.h>
30	#include <mach/pxa27x_keypad.h>	30	#include <mach/pxa27x_keypad.h>
31		31


diff --git a/arch/arm/mach-pxa/imote2.c b/arch/arm/mach-pxa/imote2.c index 2121309b247..821e65a4097 100644 --- a/arch/arm/mach-pxa/imote2.c +++ b/arch/arm/mach-pxa/imote2.c
@@ -29,7 +29,7 @@
29	#include <asm/mach/flash.h>	29	#include <asm/mach/flash.h>
30		30
31	#include <mach/pxa27x.h>	31	#include <mach/pxa27x.h>
32	#include <mach/i2c.h>	32	#include <plat/i2c.h>
33	#include <mach/udc.h>	33	#include <mach/udc.h>
34	#include <mach/mmc.h>	34	#include <mach/mmc.h>
35	#include <mach/pxa2xx_spi.h>	35	#include <mach/pxa2xx_spi.h>


diff --git a/arch/arm/mach-pxa/littleton.c b/arch/arm/mach-pxa/littleton.c index c872b9feb4d..ad5378b1af9 100644 --- a/arch/arm/mach-pxa/littleton.c +++ b/arch/arm/mach-pxa/littleton.c
@@ -43,7 +43,7 @@
43	#include <mach/pxafb.h>	43	#include <mach/pxafb.h>
44	#include <mach/ssp.h>	44	#include <mach/ssp.h>
45	#include <mach/pxa2xx_spi.h>	45	#include <mach/pxa2xx_spi.h>
46	#include <mach/i2c.h>	46	#include <plat/i2c.h>
47	#include <mach/pxa27x_keypad.h>	47	#include <mach/pxa27x_keypad.h>
48	#include <mach/pxa3xx_nand.h>	48	#include <mach/pxa3xx_nand.h>
49	#include <mach/littleton.h>	49	#include <mach/littleton.h>


diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c index c899bbd94dc..5a9df973935 100644 --- a/arch/arm/mach-pxa/magician.c +++ b/arch/arm/mach-pxa/magician.c
@@ -36,7 +36,7 @@
36	#include <mach/pxa27x.h>	36	#include <mach/pxa27x.h>
37	#include <mach/magician.h>	37	#include <mach/magician.h>
38	#include <mach/pxafb.h>	38	#include <mach/pxafb.h>
39	#include <mach/i2c.h>	39	#include <plat/i2c.h>
40	#include <mach/mmc.h>	40	#include <mach/mmc.h>
41	#include <mach/irda.h>	41	#include <mach/irda.h>
42	#include <mach/ohci.h>	42	#include <mach/ohci.h>


diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c index a6c8429e975..f4dabf0273c 100644 --- a/arch/arm/mach-pxa/mainstone.c +++ b/arch/arm/mach-pxa/mainstone.c
@@ -46,7 +46,7 @@
46	#include <mach/mainstone.h>	46	#include <mach/mainstone.h>
47	#include <mach/audio.h>	47	#include <mach/audio.h>
48	#include <mach/pxafb.h>	48	#include <mach/pxafb.h>
49	#include <mach/i2c.h>	49	#include <plat/i2c.h>
50	#include <mach/mmc.h>	50	#include <mach/mmc.h>
51	#include <mach/irda.h>	51	#include <mach/irda.h>
52	#include <mach/ohci.h>	52	#include <mach/ohci.h>


diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c index ff8052ce0a0..804c25c4a06 100644 --- a/arch/arm/mach-pxa/mioa701.c +++ b/arch/arm/mach-pxa/mioa701.c
@@ -48,7 +48,7 @@
48	#include <mach/mmc.h>	48	#include <mach/mmc.h>
49	#include <mach/udc.h>	49	#include <mach/udc.h>
50	#include <mach/pxa27x-udc.h>	50	#include <mach/pxa27x-udc.h>
51	#include <mach/i2c.h>	51	#include <plat/i2c.h>
52	#include <mach/camera.h>	52	#include <mach/camera.h>
53	#include <mach/audio.h>	53	#include <mach/audio.h>
54	#include <media/soc_camera.h>	54	#include <media/soc_camera.h>


diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c index 6c12b5a3132..095521e9ee2 100644 --- a/arch/arm/mach-pxa/pcm990-baseboard.c +++ b/arch/arm/mach-pxa/pcm990-baseboard.c
@@ -28,7 +28,7 @@
28	#include <media/soc_camera.h>	28	#include <media/soc_camera.h>
29		29
30	#include <asm/gpio.h>	30	#include <asm/gpio.h>
31	#include <mach/i2c.h>	31	#include <plat/i2c.h>
32	#include <mach/camera.h>	32	#include <mach/camera.h>
33	#include <asm/mach/map.h>	33	#include <asm/mach/map.h>
34	#include <mach/pxa27x.h>	34	#include <mach/pxa27x.h>


diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c index 036bbde4d22..74f4ce600ca 100644 --- a/arch/arm/mach-pxa/poodle.c +++ b/arch/arm/mach-pxa/poodle.c
@@ -39,7 +39,7 @@
39	#include <mach/pxa25x.h>	39	#include <mach/pxa25x.h>
40	#include <mach/mmc.h>	40	#include <mach/mmc.h>
41	#include <mach/udc.h>	41	#include <mach/udc.h>
42	#include <mach/i2c.h>	42	#include <plat/i2c.h>
43	#include <mach/irda.h>	43	#include <mach/irda.h>
44	#include <mach/poodle.h>	44	#include <mach/poodle.h>
45	#include <mach/pxafb.h>	45	#include <mach/pxafb.h>


diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index a425ec71e65..c54ad8b3343 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c
@@ -27,7 +27,7 @@
27	#include <mach/ohci.h>	27	#include <mach/ohci.h>
28	#include <mach/pm.h>	28	#include <mach/pm.h>
29	#include <mach/dma.h>	29	#include <mach/dma.h>
30	#include <mach/i2c.h>	30	#include <plat/i2c.h>
31		31
32	#include "generic.h"	32	#include "generic.h"
33	#include "devices.h"	33	#include "devices.h"


diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c index b02d4544dc9..462503a2e79 100644 --- a/arch/arm/mach-pxa/pxa3xx.c +++ b/arch/arm/mach-pxa/pxa3xx.c
@@ -30,7 +30,7 @@
30	#include <mach/pm.h>	30	#include <mach/pm.h>
31	#include <mach/dma.h>	31	#include <mach/dma.h>
32	#include <mach/ssp.h>	32	#include <mach/ssp.h>
33	#include <mach/i2c.h>	33	#include <plat/i2c.h>
34		34
35	#include "generic.h"	35	#include "generic.h"
36	#include "devices.h"	36	#include "devices.h"


diff --git a/arch/arm/mach-pxa/saar.c b/arch/arm/mach-pxa/saar.c index ff823999143..8241a63ea58 100644 --- a/arch/arm/mach-pxa/saar.c +++ b/arch/arm/mach-pxa/saar.c
@@ -27,7 +27,7 @@
27	#include <asm/mach/arch.h>	27	#include <asm/mach/arch.h>
28		28
29	#include <mach/pxa930.h>	29	#include <mach/pxa930.h>
30	#include <mach/i2c.h>	30	#include <plat/i2c.h>
31	#include <mach/pxafb.h>	31	#include <mach/pxafb.h>
32		32
33	#include "devices.h"	33	#include "devices.h"


diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index 5a45fe340a1..229f48577d5 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c
@@ -47,7 +47,7 @@
47	#include <mach/pxa27x.h>	47	#include <mach/pxa27x.h>
48	#include <mach/pxa27x-udc.h>	48	#include <mach/pxa27x-udc.h>
49	#include <mach/reset.h>	49	#include <mach/reset.h>
50	#include <mach/i2c.h>	50	#include <plat/i2c.h>
51	#include <mach/irda.h>	51	#include <mach/irda.h>
52	#include <mach/mmc.h>	52	#include <mach/mmc.h>
53	#include <mach/ohci.h>	53	#include <mach/ohci.h>


diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c index a0bd46ef5d3..168267a5dfb 100644 --- a/arch/arm/mach-pxa/tosa.c +++ b/arch/arm/mach-pxa/tosa.c
@@ -40,7 +40,7 @@
40	#include <mach/pxa25x.h>	40	#include <mach/pxa25x.h>
41	#include <mach/reset.h>	41	#include <mach/reset.h>
42	#include <mach/irda.h>	42	#include <mach/irda.h>
43	#include <mach/i2c.h>	43	#include <plat/i2c.h>
44	#include <mach/mmc.h>	44	#include <mach/mmc.h>
45	#include <mach/udc.h>	45	#include <mach/udc.h>
46	#include <mach/tosa_bt.h>	46	#include <mach/tosa_bt.h>


diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c index f79c9cb70ae..825f540176d 100644 --- a/arch/arm/mach-pxa/trizeps4.c +++ b/arch/arm/mach-pxa/trizeps4.c
@@ -47,7 +47,7 @@
47	#include <mach/mmc.h>	47	#include <mach/mmc.h>
48	#include <mach/irda.h>	48	#include <mach/irda.h>
49	#include <mach/ohci.h>	49	#include <mach/ohci.h>
50	#include <mach/i2c.h>	50	#include <plat/i2c.h>
51		51
52	#include "generic.h"	52	#include "generic.h"
53	#include "devices.h"	53	#include "devices.h"


diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c index dd031cc4184..d33c232b686 100644 --- a/arch/arm/mach-pxa/viper.c +++ b/arch/arm/mach-pxa/viper.c
@@ -45,7 +45,7 @@
45	#include <mach/pxa25x.h>	45	#include <mach/pxa25x.h>
46	#include <mach/audio.h>	46	#include <mach/audio.h>
47	#include <mach/pxafb.h>	47	#include <mach/pxafb.h>
48	#include <mach/i2c.h>	48	#include <plat/i2c.h>
49	#include <mach/regs-uart.h>	49	#include <mach/regs-uart.h>
50	#include <mach/viper.h>	50	#include <mach/viper.h>
51		51


diff --git a/arch/arm/mach-pxa/zylonite_pxa300.c b/arch/arm/mach-pxa/zylonite_pxa300.c index c256c57642c..cefd1c0a854 100644 --- a/arch/arm/mach-pxa/zylonite_pxa300.c +++ b/arch/arm/mach-pxa/zylonite_pxa300.c
@@ -21,7 +21,7 @@
21	#include <linux/gpio.h>	21	#include <linux/gpio.h>
22		22
23	#include <mach/pxa300.h>	23	#include <mach/pxa300.h>
24	#include <mach/i2c.h>	24	#include <plat/i2c.h>
25	#include <mach/zylonite.h>	25	#include <mach/zylonite.h>
26		26
27	#include "generic.h"	27	#include "generic.h"


diff --git a/arch/arm/mach-pxa/include/mach/i2c.h b/arch/arm/plat-pxa/include/plat/i2c.h index 1a9f65e6ec0..1a9f65e6ec0 100644 --- a/arch/arm/mach-pxa/include/mach/i2c.h +++ b/arch/arm/plat-pxa/include/plat/i2c.h


diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index e4ee8835b97..035a6c7e59d 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c
@@ -36,7 +36,7 @@
36		36
37	#include <asm/irq.h>	37	#include <asm/irq.h>
38	#include <asm/io.h>	38	#include <asm/io.h>
39	#include <mach/i2c.h>	39	#include <plat/i2c.h>
40		40
41	/*	41	/*
42	* I2C register offsets will be shifted 0 or 1 bit left, depending on	42	* I2C register offsets will be shifted 0 or 1 bit left, depending on