Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

i2c-nomadik: move header to <linux/platform_data/i2c-nomadik.h>

Browse source 
The header and driver are only used by arm/mach-u8500 (and potentially
arm/mach-nomadik), but the STA2X11 I/O Hub exports on PCIe a number of
devices, including i2c-nomadik.  This patch allows compilation of the
driver under x86.

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
Acked-by: Giancarlo Asnaghi <giancarlo.asnaghi@st.com>
Tested-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
This commit is contained in:
Alessandro Rubini 2012-06-11 22:56:26 +02:00 • committed by Wolfram Sang
parent 9f8a3e7fd5
commit af97bace2c
4 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/mach-ux500/board-mop500.c
View file

@ -15,6 +15,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/platform_data/i2c-nomadik.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/amba/bus.h> #include <linux/amba/bus.h>
#include <linux/amba/pl022.h> #include <linux/amba/pl022.h>
@ -39,7 +40,6 @@
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
#include <asm/hardware/gic.h> #include <asm/hardware/gic.h>
#include <plat/i2c.h>
#include <plat/ste_dma40.h> #include <plat/ste_dma40.h>
#include <plat/gpio-nomadik.h> #include <plat/gpio-nomadik.h>

2
arch/arm/mach-ux500/devices-common.h
View file

@ -12,7 +12,7 @@
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/sys_soc.h> #include <linux/sys_soc.h>
#include <linux/amba/bus.h> #include <linux/amba/bus.h>
#include <plat/i2c.h> #include <linux/platform_data/i2c-nomadik.h>
#include <mach/crypto-ux500.h> #include <mach/crypto-ux500.h>
struct spi_master_cntlr; struct spi_master_cntlr;

3
drivers/i2c/busses/i2c-nomadik.c
View file

@ -23,8 +23,7 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/platform_data/i2c-nomadik.h>
#include <plat/i2c.h>
#define DRIVER_NAME "nmk-i2c" #define DRIVER_NAME "nmk-i2c"

6
arch/arm/plat-nomadik/include/plat/i2c.h → include/linux/platform_data/i2c-nomadik.h
View file

@ -5,8 +5,8 @@
* it under the terms of the GNU General Public License version 2, as * it under the terms of the GNU General Public License version 2, as
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#ifndef __PLAT_I2C_H #ifndef __PDATA_I2C_NOMADIK_H
#define __PLAT_I2C_H #define __PDATA_I2C_NOMADIK_H
enum i2c_freq_mode { enum i2c_freq_mode {
I2C_FREQ_MODE_STANDARD, /* up to 100 Kb/s */ I2C_FREQ_MODE_STANDARD, /* up to 100 Kb/s */
@ -36,4 +36,4 @@ struct nmk_i2c_controller {
enum i2c_freq_mode sm; enum i2c_freq_mode sm;
}; };
#endif /* __PLAT_I2C_H */ #endif /* __PDATA_I2C_NOMADIK_H */