Commit 1f01d60e authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Samuel Ortiz
Browse files

mfd: Register the twl6040 child for the ASoC codec unconditionally 



The main function of the twl6040 is to provide audio on OMAP4+ platforms.
Since the ASoC codec driver can work without the pdata we can register the
child to load the codec driver whenever the twl6040 MFD driver is loaded.

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

drivers/mfd/twl6040-core.c

+19 −20
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ static int __devinit twl6040_probe(struct i2c_client *client, 
	struct twl6040_platform_data *pdata = client->dev.platform_data;

	struct twl6040 *twl6040;

	struct mfd_cell *cell = NULL;

	int ret, children = 0;

	int irq, ret, children = 0;



	if (!pdata) {

		dev_err(&client->dev, "Platform data is missing\n");
@@ -589,22 +589,27 @@ static int __devinit twl6040_probe(struct i2c_client *client, 
	/* dual-access registers controlled by I2C only */

	twl6040_set_bits(twl6040, TWL6040_REG_ACCCTL, TWL6040_I2CSEL);



	if (pdata->codec) {

		int irq = twl6040->irq_base + TWL6040_IRQ_PLUG;



	/*

	 * The main functionality of twl6040 to provide audio on OMAP4+ systems.

	 * We can add the ASoC codec child whenever this driver has been loaded.

	 * The ASoC codec can work without pdata, pass the platform_data only if

	 * it has been provided.

	 */

	irq = twl6040->irq_base + TWL6040_IRQ_PLUG;

	cell = &twl6040->cells[children];

	cell->name = "twl6040-codec";

	twl6040_codec_rsrc[0].start = irq;

	twl6040_codec_rsrc[0].end = irq;

	cell->resources = twl6040_codec_rsrc;

	cell->num_resources = ARRAY_SIZE(twl6040_codec_rsrc);

	if (pdata->codec) {

		cell->platform_data = pdata->codec;

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

		children++;

	}

	children++;



	if (pdata->vibra) {

		int irq = twl6040->irq_base + TWL6040_IRQ_VIB;

		irq = twl6040->irq_base + TWL6040_IRQ_VIB;



		cell = &twl6040->cells[children];

		cell->name = "twl6040-vibra";
@@ -618,16 +623,10 @@ static int __devinit twl6040_probe(struct i2c_client *client, 
		children++;

	}



	if (children) {

		ret = mfd_add_devices(&client->dev, -1, twl6040->cells,

				      children, NULL, 0);

	ret = mfd_add_devices(&client->dev, -1, twl6040->cells, children,

			      NULL, 0);

	if (ret)

		goto mfd_err;

	} else {

		dev_err(&client->dev, "No platform data found for children\n");

		ret = -ENODEV;

		goto mfd_err;

	}



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE