Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

ARM: pxa: move header file out of I2C realm

include/linux/i2c is to be deprecated. Move this platform_data to the
proper platform_data dir.

Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Wolfram Sang 7 years ago
parent
cb74dc3ba2
commit
f15fc9b122
38 changed files with 37 additions and 37 deletions
Split View Show Diff Stats
  1. 1 1
      arch/arm/mach-mmp/mmp2.h
  2. 1 1
      arch/arm/mach-mmp/pxa168.h
  3. 1 1
      arch/arm/mach-mmp/pxa910.h
  4. 1 1
      arch/arm/mach-pxa/balloon3.c
  5. 1 1
      arch/arm/mach-pxa/cm-x300.c
  6. 1 1
      arch/arm/mach-pxa/colibri-evalboard.c
  7. 1 1
      arch/arm/mach-pxa/colibri-pxa270-income.c
  8. 1 1
      arch/arm/mach-pxa/corgi.c
  9. 1 1
      arch/arm/mach-pxa/csb726.c
  10. 1 1
      arch/arm/mach-pxa/devices.c
  11. 1 1
      arch/arm/mach-pxa/em-x270.c
  12. 1 1
      arch/arm/mach-pxa/ezx.c
  13. 1 1
      arch/arm/mach-pxa/hx4700.c
  14. 1 1
      arch/arm/mach-pxa/littleton.c
  15. 1 1
      arch/arm/mach-pxa/magician.c
  16. 1 1
      arch/arm/mach-pxa/mainstone.c
  17. 1 1
      arch/arm/mach-pxa/mioa701.c
  18. 1 1
      arch/arm/mach-pxa/mxm8x10.c
  19. 1 1
      arch/arm/mach-pxa/palm27x.c
  20. 1 1
      arch/arm/mach-pxa/pcm990-baseboard.c
  21. 1 1
      arch/arm/mach-pxa/poodle.c
  22. 1 1
      arch/arm/mach-pxa/pxa27x.c
  23. 1 1
      arch/arm/mach-pxa/pxa3xx.c
  24. 1 1
      arch/arm/mach-pxa/raumfeld.c
  25. 1 1
      arch/arm/mach-pxa/saar.c
  26. 1 1
      arch/arm/mach-pxa/spitz.c
  27. 1 1
      arch/arm/mach-pxa/stargate2.c
  28. 1 1
      arch/arm/mach-pxa/tosa.c
  29. 1 1
      arch/arm/mach-pxa/trizeps4.c
  30. 1 1
      arch/arm/mach-pxa/viper.c
  31. 1 1
      arch/arm/mach-pxa/vpac270.c
  32. 1 1
      arch/arm/mach-pxa/xcep.c
  33. 1 1
      arch/arm/mach-pxa/z2.c
  34. 1 1
      arch/arm/mach-pxa/zeus.c
  35. 1 1
      arch/arm/mach-pxa/zylonite_pxa300.c
  36. 1 1
      drivers/i2c/busses/i2c-pxa-pci.c
  37. 1 1
      drivers/i2c/busses/i2c-pxa.c
  38. 0 0
      include/linux/platform_data/i2c-pxa.h

+ 1 - 1
arch/arm/mach-mmp/mmp2.h
View File 

@@ -10,7 +10,7 @@ extern void __init mmp2_init_irq(void);
 
 extern void mmp2_clear_pmic_int(void);
 
 
 #include <linux/i2c.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <linux/platform_data/dma-mmp_tdma.h>
 
 
 #include "devices.h"

+ 1 - 1
arch/arm/mach-mmp/pxa168.h
View File 

@@ -11,7 +11,7 @@ extern void pxa168_restart(enum reboot_mode, const char *);
 
 extern void pxa168_clear_keypad_wakeup(void);
 
 
 #include <linux/i2c.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <linux/platform_data/mtd-nand-pxa3xx.h>
 
 #include <video/pxa168fb.h>
 
 #include <linux/platform_data/keypad-pxa27x.h>

+ 1 - 1
arch/arm/mach-mmp/pxa910.h
View File 

@@ -7,7 +7,7 @@ extern void __init icu_init_irq(void);
 
 extern void __init pxa910_init_irq(void);
 
 
 #include <linux/i2c.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <linux/platform_data/mtd-nand-pxa3xx.h>
 
 #include <video/mmp_disp.h>

+ 1 - 1
arch/arm/mach-pxa/balloon3.c
View File 

@@ -28,7 +28,7 @@
 
 #include <linux/mtd/partitions.h>
 
 #include <linux/types.h>
 
 #include <linux/platform_data/pcf857x.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <linux/mtd/rawnand.h>
 
 #include <linux/mtd/physmap.h>
 
 #include <linux/regulator/max1586.h>

+ 1 - 1
arch/arm/mach-pxa/cm-x300.c
View File 

@@ -31,7 +31,7 @@
 
 
 #include <linux/i2c.h>
 
 #include <linux/platform_data/pca953x.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 
 #include <linux/mfd/da903x.h>
 
 #include <linux/regulator/machine.h>

+ 1 - 1
arch/arm/mach-pxa/colibri-evalboard.c
View File 

@@ -19,7 +19,7 @@
 
 #include <mach/hardware.h>
 
 #include <asm/mach/arch.h>
 
 #include <linux/i2c.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <asm/io.h>
 
 
 #include "pxa27x.h"

+ 1 - 1
arch/arm/mach-pxa/colibri-pxa270-income.c
View File 

@@ -23,7 +23,7 @@
 
 #include <linux/platform_device.h>
 
 #include <linux/pwm.h>
 
 #include <linux/pwm_backlight.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 
 #include <asm/irq.h>
 
 #include <asm/mach-types.h>

+ 1 - 1
arch/arm/mach-pxa/corgi.c
View File 

@@ -26,7 +26,7 @@
 
 #include <linux/gpio.h>
 
 #include <linux/backlight.h>
 
 #include <linux/i2c.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <linux/io.h>
 
 #include <linux/regulator/machine.h>
 
 #include <linux/spi/spi.h>

+ 1 - 1
arch/arm/mach-pxa/csb726.c
View File 

@@ -17,7 +17,7 @@
 
 #include <linux/mtd/partitions.h>
 
 #include <linux/sm501.h>
 
 #include <linux/smsc911x.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 
 #include <asm/mach-types.h>
 
 #include <asm/mach/arch.h>

+ 1 - 1
arch/arm/mach-pxa/devices.c
View File 

@@ -5,7 +5,7 @@
 
 #include <linux/platform_device.h>
 
 #include <linux/dma-mapping.h>
 
 #include <linux/spi/pxa2xx_spi.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 
 #include "udc.h"
 
 #include <linux/platform_data/usb-pxa3xx-ulpi.h>

+ 1 - 1
arch/arm/mach-pxa/em-x270.c
View File 

@@ -32,7 +32,7 @@
 
 #include <linux/apm-emulation.h>
 
 #include <linux/i2c.h>
 
 #include <linux/platform_data/pca953x.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <linux/regulator/userspace-consumer.h>
 
 
 #include <asm/mach-types.h>

+ 1 - 1
arch/arm/mach-pxa/ezx.c
View File 

@@ -23,7 +23,7 @@
 
 #include <linux/gpio.h>
 
 #include <linux/gpio_keys.h>
 
 #include <linux/leds-lp3944.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 
 #include <asm/setup.h>
 
 #include <asm/mach-types.h>

+ 1 - 1
arch/arm/mach-pxa/hx4700.c
View File 

@@ -38,7 +38,7 @@
 
 #include <linux/spi/spi.h>
 
 #include <linux/spi/pxa2xx_spi.h>
 
 #include <linux/usb/gpio_vbus.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 
 #include <mach/hardware.h>
 
 #include <asm/mach-types.h>

+ 1 - 1
arch/arm/mach-pxa/littleton.c
View File 

@@ -28,7 +28,7 @@
 
 #include <linux/leds.h>
 
 #include <linux/mfd/da903x.h>
 
 #include <linux/platform_data/max732x.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 
 #include <asm/types.h>
 
 #include <asm/setup.h>

+ 1 - 1
arch/arm/mach-pxa/magician.c
View File 

@@ -31,7 +31,7 @@
 
 #include <linux/regulator/gpio-regulator.h>
 
 #include <linux/regulator/machine.h>
 
 #include <linux/usb/gpio_vbus.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 
 #include <mach/hardware.h>
 
 #include <asm/mach-types.h>

+ 1 - 1
arch/arm/mach-pxa/mainstone.c
View File 

@@ -29,7 +29,7 @@
 
 #include <linux/pwm.h>
 
 #include <linux/pwm_backlight.h>
 
 #include <linux/smc91x.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <linux/slab.h>
 
 #include <linux/leds.h>

+ 1 - 1
arch/arm/mach-pxa/mioa701.c
View File 

@@ -42,7 +42,7 @@
 
 #include <linux/regulator/fixed.h>
 
 #include <linux/regulator/max1586.h>
 
 #include <linux/slab.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 
 #include <asm/mach-types.h>
 
 #include <asm/mach/arch.h>

+ 1 - 1
arch/arm/mach-pxa/mxm8x10.c
View File 

@@ -22,7 +22,7 @@
 
 #include <linux/serial_8250.h>
 
 #include <linux/dm9000.h>
 
 #include <linux/gpio.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 
 #include <linux/platform_data/mtd-nand-pxa3xx.h>

+ 1 - 1
arch/arm/mach-pxa/palm27x.c
View File 

@@ -22,7 +22,7 @@
 
 #include <linux/power_supply.h>
 
 #include <linux/usb/gpio_vbus.h>
 
 #include <linux/regulator/max1586.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 
 #include <asm/mach-types.h>
 
 #include <asm/mach/arch.h>

+ 1 - 1
arch/arm/mach-pxa/pcm990-baseboard.c
View File 

@@ -23,7 +23,7 @@
 
 #include <linux/irq.h>
 
 #include <linux/platform_device.h>
 
 #include <linux/i2c.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <linux/pwm.h>
 
 #include <linux/pwm_backlight.h>

+ 1 - 1
arch/arm/mach-pxa/poodle.c
View File 

@@ -24,7 +24,7 @@
 
 #include <linux/mtd/physmap.h>
 
 #include <linux/gpio.h>
 
 #include <linux/i2c.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <linux/regulator/machine.h>
 
 #include <linux/spi/spi.h>
 
 #include <linux/spi/ads7846.h>

+ 1 - 1
arch/arm/mach-pxa/pxa27x.c
View File 

@@ -22,7 +22,7 @@
 
 #include <linux/syscore_ops.h>
 
 #include <linux/io.h>
 
 #include <linux/irq.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 
 #include <asm/mach/map.h>
 
 #include <mach/hardware.h>

+ 1 - 1
arch/arm/mach-pxa/pxa3xx.c
View File 

@@ -23,7 +23,7 @@
 
 #include <linux/io.h>
 
 #include <linux/of.h>
 
 #include <linux/syscore_ops.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 
 #include <asm/mach/map.h>
 
 #include <asm/suspend.h>

+ 1 - 1
arch/arm/mach-pxa/raumfeld.c
View File 

@@ -32,7 +32,7 @@
 
 #include <linux/pwm.h>
 
 #include <linux/pwm_backlight.h>
 
 #include <linux/i2c.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <linux/spi/spi.h>
 
 #include <linux/spi/spi_gpio.h>
 
 #include <linux/lis3lv02d.h>

+ 1 - 1
arch/arm/mach-pxa/saar.c
View File 

@@ -20,7 +20,7 @@
 
 #include <linux/delay.h>
 
 #include <linux/fb.h>
 
 #include <linux/i2c.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <linux/smc91x.h>
 
 #include <linux/mfd/da903x.h>
 
 #include <linux/mtd/mtd.h>

+ 1 - 1
arch/arm/mach-pxa/spitz.c
View File 

@@ -20,7 +20,7 @@
 
 #include <linux/gpio.h>
 
 #include <linux/leds.h>
 
 #include <linux/i2c.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <linux/platform_data/pca953x.h>
 
 #include <linux/spi/spi.h>
 
 #include <linux/spi/ads7846.h>

+ 1 - 1
arch/arm/mach-pxa/stargate2.c
View File 

@@ -25,7 +25,7 @@
 
 #include <linux/mtd/plat-ram.h>
 
 #include <linux/mtd/partitions.h>
 
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <linux/platform_data/pcf857x.h>
 
 #include <linux/platform_data/at24.h>
 
 #include <linux/smc91x.h>

+ 1 - 1
arch/arm/mach-pxa/tosa.c
View File 

@@ -35,7 +35,7 @@
 
 #include <linux/spi/spi.h>
 
 #include <linux/spi/pxa2xx_spi.h>
 
 #include <linux/input/matrix_keypad.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <linux/usb/gpio_vbus.h>
 
 #include <linux/reboot.h>
 
 #include <linux/memblock.h>

+ 1 - 1
arch/arm/mach-pxa/trizeps4.c
View File 

@@ -28,7 +28,7 @@
 
 #include <linux/mtd/physmap.h>
 
 #include <linux/mtd/partitions.h>
 
 #include <linux/regulator/machine.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 
 #include <asm/types.h>
 
 #include <asm/setup.h>

+ 1 - 1
arch/arm/mach-pxa/viper.c
View File 

@@ -37,7 +37,7 @@
 
 #include <linux/jiffies.h>
 
 #include <linux/i2c-gpio.h>
 
 #include <linux/gpio/machine.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <linux/serial_8250.h>
 
 #include <linux/smc91x.h>
 
 #include <linux/pwm.h>

+ 1 - 1
arch/arm/mach-pxa/vpac270.c
View File 

@@ -27,7 +27,7 @@
 
 #include <linux/ata_platform.h>
 
 #include <linux/regulator/machine.h>
 
 #include <linux/regulator/max1586.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 
 #include <asm/mach-types.h>
 
 #include <asm/mach/arch.h>

+ 1 - 1
arch/arm/mach-pxa/xcep.c
View File 

@@ -16,7 +16,7 @@
 
 
 #include <linux/platform_device.h>
 
 #include <linux/i2c.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <linux/smc91x.h>
 
 #include <linux/mtd/mtd.h>
 
 #include <linux/mtd/partitions.h>

+ 1 - 1
arch/arm/mach-pxa/z2.c
View File 

@@ -30,7 +30,7 @@
 
 #include <linux/gpio_keys.h>
 
 #include <linux/delay.h>
 
 #include <linux/regulator/machine.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 
 #include <asm/mach-types.h>
 
 #include <asm/mach/arch.h>

+ 1 - 1
arch/arm/mach-pxa/zeus.c
View File 

@@ -26,7 +26,7 @@
 
 #include <linux/mtd/partitions.h>
 
 #include <linux/mtd/physmap.h>
 
 #include <linux/i2c.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <linux/platform_data/pca953x.h>
 
 #include <linux/apm-emulation.h>
 
 #include <linux/can/platform/mcp251x.h>

+ 1 - 1
arch/arm/mach-pxa/zylonite_pxa300.c
View File 

@@ -17,7 +17,7 @@
 
 #include <linux/kernel.h>
 
 #include <linux/init.h>
 
 #include <linux/i2c.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <linux/platform_data/pca953x.h>
 
 #include <linux/gpio.h>

+ 1 - 1
drivers/i2c/busses/i2c-pxa-pci.c
View File 

@@ -10,7 +10,7 @@
 
 #include <linux/init.h>
 
 #include <linux/pci.h>
 
 #include <linux/platform_device.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 #include <linux/of.h>
 
 #include <linux/of_device.h>
 
 #include <linux/of_address.h>

+ 1 - 1
drivers/i2c/busses/i2c-pxa.c
View File 

@@ -36,7 +36,7 @@
 
 #include <linux/clk.h>
 
 #include <linux/slab.h>
 
 #include <linux/io.h>
 
-#include <linux/i2c/pxa-i2c.h>
 
+#include <linux/platform_data/i2c-pxa.h>
 
 
 #include <asm/irq.h>

+ 0 - 0
include/linux/i2c/pxa-i2c.h → include/linux/platform_data/i2c-pxa.h
View File