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

Commit 4c0174c5 authored by Dong Aisheng's avatar Dong Aisheng Committed by Shawn Guo
Browse files

ARM: mx28evk: add platform data for saif 



This is for supporting saif record function.

Signed-off-by: default avatarDong Aisheng <b29396@freescale.com>
Acked-by: default avatarMarek Vasut <marek.vasut@gmail.com>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Wolfram Sang <w.sang@pengutronix.de>
Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Liam Girdwood <lrg@ti.com>
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent 4e1b4eca

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

+2 −1
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ struct platform_device *__init mx28_add_mxsfb( 
		const struct mxsfb_platform_data *pdata);



extern const struct mxs_saif_data mx28_saif_data[] __initconst;

#define mx28_add_saif(id)              mxs_add_saif(&mx28_saif_data[id])

#define mx28_add_saif(id, pdata) \

	mxs_add_saif(&mx28_saif_data[id], pdata)



struct platform_device *__init mx28_add_rtc_stmp3xxx(void);

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

+3 −2
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ const struct mxs_saif_data mx28_saif_data[] __initconst = { 
};

#endif



struct platform_device *__init mxs_add_saif(const struct mxs_saif_data *data)

struct platform_device *__init mxs_add_saif(const struct mxs_saif_data *data,

				const struct mxs_saif_platform_data *pdata)

{

	struct resource res[] = {

		{
@@ -56,5 +57,5 @@ struct platform_device *__init mxs_add_saif(const struct mxs_saif_data *data) 
	};



	return mxs_add_platform_device("mxs-saif", data->id, res,

					ARRAY_SIZE(res), NULL, 0);

				ARRAY_SIZE(res), pdata, sizeof(*pdata));

}

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

+3 −1
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ struct platform_device *__init mxs_add_mxs_pwm( 
		resource_size_t iobase, int id);



/* saif */

#include <sound/saif.h>

struct mxs_saif_data {

	int id;

	resource_size_t iobase;
@@ -103,4 +104,5 @@ struct mxs_saif_data { 
};



struct platform_device *__init mxs_add_saif(

		const struct mxs_saif_data *data);
 
		const struct mxs_saif_data *data,

		const struct mxs_saif_platform_data *pdata);

arch/arm/mach-mxs/mach-mx28evk.c

+16 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 


#include <mach/common.h>

#include <mach/iomux-mx28.h>

#include <mach/digctl.h>



#include "devices-mx28.h"
@@ -421,6 +422,18 @@ static struct gpio mx28evk_lcd_gpios[] = { 
	{ MX28EVK_BL_ENABLE, GPIOF_OUT_INIT_HIGH, "bl-enable" },

};



static const struct mxs_saif_platform_data

			mx28evk_mxs_saif_pdata[] __initconst = {

	/* working on EXTMSTR0 mode (saif0 master, saif1 slave) */

	{

		.master_mode = 1,

		.master_id = 0,

	}, {

		.master_mode = 0,

		.master_id = 0,

	},

};



static void __init mx28evk_init(void)

{

	int ret;
@@ -454,8 +467,9 @@ static void __init mx28evk_init(void) 
	else

		mx28_add_mxsfb(&mx28evk_mxsfb_pdata);



	mx28_add_saif(0);

	mx28_add_saif(1);

	mxs_saif_clkmux_select(MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR0);

	mx28_add_saif(0, &mx28evk_mxs_saif_pdata[0]);

	mx28_add_saif(1, &mx28evk_mxs_saif_pdata[1]);



	mx28_add_mxs_i2c(0);

	i2c_register_board_info(0, mxs_i2c0_board_info,