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

Commit 01d8cf03 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Sascha Hauer
Browse files

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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 492fc4f6

arch/arm/mach-mxs/devices-mx28.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;

arch/arm/mach-mxs/devices/platform-mxs-i2c.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -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[] = {

		{

		{

arch/arm/mach-mxs/include/mach/devices-common.h

+3 −2
Original line number Original line Diff line number Diff line
@@ -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>