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

Commit 4ae6df5e authored by Peter Ujfalusi's avatar Peter Ujfalusi
Browse files

MFD: twl4030-audio: Rename platform data 



Allign the platform data names for twl4030 audio submodule:
twl4030_audio_data: for the core MFD driver
twl4030_codec_data: for ASoC codec driver
twl4030_vibra_data: for the input/ForceFeedback driver

To avoid breakage, change all depending drivers, files
to use the new types.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 57fe7251

arch/arm/mach-omap2/board-rx51-peripherals.c

+3 −3
Original line number Diff line number Diff line
@@ -741,11 +741,11 @@ static struct twl4030_power_data rx51_t2scripts_data __initdata = { 
	.resource_config = twl4030_rconfig,

};



struct twl4030_codec_vibra_data rx51_vibra_data __initdata = {

struct twl4030_vibra_data rx51_vibra_data __initdata = {

	.coexist	= 0,

};



struct twl4030_codec_data rx51_codec_data __initdata = {

struct twl4030_audio_data rx51_audio_data __initdata = {

	.audio_mclk	= 26000000,

	.vibra		= &rx51_vibra_data,

};
@@ -755,7 +755,7 @@ static struct twl4030_platform_data rx51_twldata __initdata = { 
	.gpio			= &rx51_gpio_data,

	.keypad			= &rx51_kp_data,

	.power			= &rx51_t2scripts_data,

	.codec			= &rx51_codec_data,

	.audio			= &rx51_audio_data,



	.vaux1			= &rx51_vaux1,

	.vaux2			= &rx51_vaux2,

arch/arm/mach-omap2/board-zoom-peripherals.c

+5 −5
Original line number Diff line number Diff line
@@ -274,12 +274,12 @@ static int __init omap_i2c_init(void) 
			TWL_COMMON_REGULATOR_VDAC | TWL_COMMON_REGULATOR_VPLL2);



	if (machine_is_omap_zoom2()) {

		struct twl4030_codec_audio_data *audio_data;

		audio_data = zoom_twldata.codec->audio;

		struct twl4030_codec_data *codec_data;

		codec_data = zoom_twldata.audio->codec;



		audio_data->ramp_delay_value = 3;	/* 161 ms */

		audio_data->hs_extmute = 1;

		audio_data->set_hs_extmute = zoom2_set_hs_extmute;

		codec_data->ramp_delay_value = 3;	/* 161 ms */

		codec_data->hs_extmute = 1;

		codec_data->set_hs_extmute = zoom2_set_hs_extmute;

	}

	omap_pmic_init(1, 2400, "twl5030", INT_34XX_SYS_NIRQ, &zoom_twldata);

	omap_register_i2c_bus(2, 400, NULL, 0);

arch/arm/mach-omap2/twl-common.c

+5 −5
Original line number Diff line number Diff line
@@ -80,11 +80,11 @@ static struct twl4030_madc_platform_data omap3_madc_pdata = { 
	.irq_line	= 1,

};



static struct twl4030_codec_audio_data omap3_audio;

static struct twl4030_codec_data omap3_codec;



static struct twl4030_codec_data omap3_codec_pdata = {

static struct twl4030_audio_data omap3_audio_pdata = {

	.audio_mclk = 26000000,

	.audio = &omap3_audio,

	.codec = &omap3_codec,

};



static struct regulator_consumer_supply omap3_vdda_dac_supplies[] = {
@@ -292,8 +292,8 @@ void __init omap3_pmic_get_config(struct twl4030_platform_data *pmic_data, 
	if (pdata_flags & TWL_COMMON_PDATA_MADC && !pmic_data->madc)

		pmic_data->madc = &omap3_madc_pdata;



	if (pdata_flags & TWL_COMMON_PDATA_AUDIO && !pmic_data->codec)

		pmic_data->codec = &omap3_codec_pdata;

	if (pdata_flags & TWL_COMMON_PDATA_AUDIO && !pmic_data->audio)

		pmic_data->audio = &omap3_audio_pdata;



	/* Common regulator configurations */

	if (regulators_flags & TWL_COMMON_REGULATOR_VDAC && !pmic_data->vdac)

drivers/input/misc/twl4030-vibra.c

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ static SIMPLE_DEV_PM_OPS(twl4030_vibra_pm_ops, 


static int __devinit twl4030_vibra_probe(struct platform_device *pdev)

{

	struct twl4030_codec_vibra_data *pdata = pdev->dev.platform_data;

	struct twl4030_vibra_data *pdata = pdev->dev.platform_data;

	struct vibra_info *info;

	int ret;

drivers/mfd/twl-core.c

+4 −4
Original line number Diff line number Diff line
@@ -815,20 +815,20 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features) 
			return PTR_ERR(child);

	}



	if (twl_has_codec() && pdata->codec && twl_class_is_4030()) {

	if (twl_has_codec() && pdata->audio && twl_class_is_4030()) {

		sub_chip_id = twl_map[TWL_MODULE_AUDIO_VOICE].sid;

		child = add_child(sub_chip_id, "twl4030-audio",

				pdata->codec, sizeof(*pdata->codec),

				pdata->audio, sizeof(*pdata->audio),

				false, 0, 0);

		if (IS_ERR(child))

			return PTR_ERR(child);

	}



	/* Phoenix codec driver is probed directly atm */

	if (twl_has_codec() && pdata->codec && twl_class_is_6030()) {

	if (twl_has_codec() && pdata->audio && twl_class_is_6030()) {

		sub_chip_id = twl_map[TWL_MODULE_AUDIO_VOICE].sid;

		child = add_child(sub_chip_id, "twl6040-codec",

				pdata->codec, sizeof(*pdata->codec),

				pdata->audio, sizeof(*pdata->audio),

				false, 0, 0);

		if (IS_ERR(child))

			return PTR_ERR(child);