Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b459396e authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Ben Dooks
Browse files

ARM: pxa2xx: reorganize I2C files 



This patch moves the platform data definition from
arch/arm/plat-pxa/include/plat/i2c.h to include/linux/i2c/pxa-i2c.h so
it can be accessed from x86 the same way as on ARM.

This change should make no functional change to the PXA code. The move
is verified by building the following defconfigs:
  cm_x2xx_defconfig corgi_defconfig em_x270_defconfig ezx_defconfig
  imote2_defconfig pxa3xx_defconfig spitz_defconfig zeus_defconfig
  raumfeld_defconfig magician_defconfig mmp2_defconfig pxa168_defconfig
  pxa910_defconfig

Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarDirk Brandewie <dirk.brandewie@gmail.com>
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent d6668c7c

arch/arm/mach-mmp/include/mach/mmp2.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -11,8 +11,8 @@ extern void __init mmp2_init_irq(void); 
extern void mmp2_clear_pmic_int(void);

extern void mmp2_clear_pmic_int(void);





#include <linux/i2c.h>

#include <linux/i2c.h>

#include <linux/i2c/pxa-i2c.h>

#include <mach/devices.h>

#include <mach/devices.h>

#include <plat/i2c.h>





extern struct pxa_device_desc mmp2_device_uart1;

extern struct pxa_device_desc mmp2_device_uart1;

extern struct pxa_device_desc mmp2_device_uart2;

extern struct pxa_device_desc mmp2_device_uart2;

arch/arm/mach-mmp/include/mach/pxa168.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -8,8 +8,8 @@ extern void __init pxa168_init_irq(void); 
extern void pxa168_clear_keypad_wakeup(void);

extern void pxa168_clear_keypad_wakeup(void);





#include <linux/i2c.h>

#include <linux/i2c.h>

#include <linux/i2c/pxa-i2c.h>

#include <mach/devices.h>

#include <mach/devices.h>

#include <plat/i2c.h>

#include <plat/pxa3xx_nand.h>

#include <plat/pxa3xx_nand.h>

#include <video/pxa168fb.h>

#include <video/pxa168fb.h>

#include <plat/pxa27x_keypad.h>

#include <plat/pxa27x_keypad.h>

arch/arm/mach-mmp/include/mach/pxa910.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -7,8 +7,8 @@ extern struct sys_timer pxa910_timer; 
extern void __init pxa910_init_irq(void);

extern void __init pxa910_init_irq(void);





#include <linux/i2c.h>

#include <linux/i2c.h>

#include <linux/i2c/pxa-i2c.h>

#include <mach/devices.h>

#include <mach/devices.h>

#include <plat/i2c.h>

#include <plat/pxa3xx_nand.h>

#include <plat/pxa3xx_nand.h>





extern struct pxa_device_desc pxa910_device_uart1;

extern struct pxa_device_desc pxa910_device_uart1;

arch/arm/mach-pxa/balloon3.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/mtd/partitions.h>

#include <linux/mtd/partitions.h>

#include <linux/types.h>

#include <linux/types.h>

#include <linux/i2c/pcf857x.h>

#include <linux/i2c/pcf857x.h>

#include <linux/i2c/pxa-i2c.h>

#include <linux/mtd/nand.h>

#include <linux/mtd/nand.h>

#include <linux/mtd/physmap.h>

#include <linux/mtd/physmap.h>

#include <linux/regulator/max1586.h>

#include <linux/regulator/max1586.h>
@@ -51,8 +52,6 @@ 
#include <mach/irda.h>

#include <mach/irda.h>

#include <mach/ohci.h>

#include <mach/ohci.h>





#include <plat/i2c.h>



#include "generic.h"

#include "generic.h"

#include "devices.h"

#include "devices.h"

arch/arm/mach-pxa/cm-x300.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -29,6 +29,7 @@ 




#include <linux/i2c.h>

#include <linux/i2c.h>

#include <linux/i2c/pca953x.h>

#include <linux/i2c/pca953x.h>

#include <linux/i2c/pxa-i2c.h>





#include <linux/mfd/da903x.h>

#include <linux/mfd/da903x.h>

#include <linux/regulator/machine.h>

#include <linux/regulator/machine.h>
@@ -48,7 +49,6 @@ 
#include <mach/pxafb.h>

#include <mach/pxafb.h>

#include <mach/mmc.h>

#include <mach/mmc.h>

#include <mach/ohci.h>

#include <mach/ohci.h>

#include <plat/i2c.h>

#include <plat/pxa3xx_nand.h>

#include <plat/pxa3xx_nand.h>

#include <mach/audio.h>

#include <mach/audio.h>

#include <mach/pxa3xx-u2d.h>

#include <mach/pxa3xx-u2d.h>