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

Commit a4579ad2 authored by Samuel Ortiz's avatar Samuel Ortiz
Browse files

mfd: Use mfd cell platform_data for twl4030 codec cells platform bits 



With the addition of a platform device mfd_cell pointer, MFD drivers
can go back to passing platform data back to their sub drivers.
This allows for an mfd_cell->mfd_data removal and thus keep the
sub drivers MFD agnostic. This is mostly needed for non MFD aware
sub drivers.

Cc: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Liam Girdwood <lrg@slimlogic.co.uk>
Cc: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 3d2bdf75

drivers/input/misc/twl4030-vibra.c

+1 −2
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <linux/workqueue.h>

#include <linux/i2c/twl.h>

#include <linux/mfd/twl4030-codec.h>

#include <linux/mfd/core.h>

#include <linux/input.h>

#include <linux/slab.h>
@@ -197,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 = mfd_get_data(pdev);

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

	struct vibra_info *info;

	int ret;

drivers/mfd/twl4030-codec.c

+4 −2
Original line number Diff line number Diff line
@@ -208,13 +208,15 @@ static int __devinit twl4030_codec_probe(struct platform_device *pdev) 
	if (pdata->audio) {

		cell = &codec->cells[childs];

		cell->name = "twl4030-codec";

		cell->mfd_data = pdata->audio;

		cell->platform_data = pdata->audio;

		cell->pdata_size = sizeof(*pdata->audio);

		childs++;

	}

	if (pdata->vibra) {

		cell = &codec->cells[childs];

		cell->name = "twl4030-vibra";

		cell->mfd_data = pdata->vibra;

		cell->platform_data = pdata->vibra;

		cell->pdata_size = sizeof(*pdata->vibra);

		childs++;

	}

sound/soc/codecs/twl4030.c

+2 −4
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <linux/pm.h>

#include <linux/i2c.h>

#include <linux/platform_device.h>

#include <linux/mfd/core.h>

#include <linux/i2c/twl.h>

#include <linux/slab.h>

#include <sound/core.h>
@@ -733,8 +732,7 @@ static int aif_event(struct snd_soc_dapm_widget *w, 


static void headset_ramp(struct snd_soc_codec *codec, int ramp)

{

	struct twl4030_codec_audio_data *pdata =

			mfd_get_data(to_platform_device(codec->dev));

	struct twl4030_codec_audio_data *pdata = codec->dev->platform_data;

	unsigned char hs_gain, hs_pop;

	struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);

	/* Base values for ramp delay calculation: 2^19 - 2^26 */
@@ -2299,7 +2297,7 @@ static struct snd_soc_codec_driver soc_codec_dev_twl4030 = { 


static int __devinit twl4030_codec_probe(struct platform_device *pdev)

{

	struct twl4030_codec_audio_data *pdata = mfd_get_data(pdev);

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



	if (!pdata) {

		dev_err(&pdev->dev, "platform_data is missing\n");