openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: mxs: fix naming of struct holding info for mxs-i2c devices 

For consistency mxs has to be repeated, one for the name space and
another one for the device name.

LAKML-Reference: 1300308028-8922-1-git-send-email-u.kleine-koenig@pengutronix.de
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Uwe Kleine-König 2011-01-11 10:22:14 +01:00 committed by Sascha Hauer
parent 492fc4f6f7
commit 01d8cf03db
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-mxs/devices-mx28.h
View File

@ -34,7 +34,7 @@ extern const struct mxs_flexcan_data mx28_flexcan_data[] __initconst;
#define mx28_add_flexcan0(pdata) mx28_add_flexcan(0, pdata) #define mx28_add_flexcan0(pdata) mx28_add_flexcan(0, pdata)
#define mx28_add_flexcan1(pdata) mx28_add_flexcan(1, pdata) #define mx28_add_flexcan1(pdata) mx28_add_flexcan(1, pdata)
extern const struct mxs_i2c_data mx28_mxs_i2c_data[] __initconst; extern const struct mxs_mxs_i2c_data mx28_mxs_i2c_data[] __initconst;
#define mx28_add_mxs_i2c(id) mxs_add_mxs_i2c(&mx28_mxs_i2c_data[id]) #define mx28_add_mxs_i2c(id) mxs_add_mxs_i2c(&mx28_mxs_i2c_data[id])
extern const struct mxs_mxs_mmc_data mx28_mxs_mmc_data[] __initconst; extern const struct mxs_mxs_mmc_data mx28_mxs_mmc_data[] __initconst;

5
arch/arm/mach-mxs/devices/platform-mxs-i2c.c
View File

@ -22,13 +22,14 @@
[_id] = mxs_i2c_data_entry_single(soc, _id) [_id] = mxs_i2c_data_entry_single(soc, _id)
#ifdef CONFIG_SOC_IMX28 #ifdef CONFIG_SOC_IMX28
const struct mxs_i2c_data mx28_mxs_i2c_data[] __initconst = { const struct mxs_mxs_i2c_data mx28_mxs_i2c_data[] __initconst = {
mxs_i2c_data_entry(MX28, 0), mxs_i2c_data_entry(MX28, 0),
mxs_i2c_data_entry(MX28, 1), mxs_i2c_data_entry(MX28, 1),
}; };
#endif #endif
struct platform_device *__init mxs_add_mxs_i2c(const struct mxs_i2c_data *data) struct platform_device *__init mxs_add_mxs_i2c(
const struct mxs_mxs_i2c_data *data)
{ {
struct resource res[] = { struct resource res[] = {
{ {

5
arch/arm/mach-mxs/include/mach/devices-common.h
View File

@ -65,13 +65,14 @@ struct platform_device *__init mxs_add_flexcan(
const struct flexcan_platform_data *pdata); const struct flexcan_platform_data *pdata);
/* i2c */ /* i2c */
struct mxs_i2c_data { struct mxs_mxs_i2c_data {
int id; int id;
resource_size_t iobase; resource_size_t iobase;
resource_size_t errirq; resource_size_t errirq;
resource_size_t dmairq; resource_size_t dmairq;
}; };
struct platform_device * __init mxs_add_mxs_i2c(const struct mxs_i2c_data *data); struct platform_device * __init mxs_add_mxs_i2c(
const struct mxs_mxs_i2c_data *data);
/* mmc */ /* mmc */
#include <mach/mmc.h> #include <mach/mmc.h>