mfd: twl6040: Remove support for legacy (pdata) mode (df04b624) · Commits · 戴 / test

drivers/mfd/twl6040.c

+13 −42

Original line number	Diff line number	Diff line
		@@ -44,17 +44,12 @@
		#define VIBRACTRL_MEMBER(reg) ((reg == TWL6040_REG_VIBCTLL) ? 0 : 1)
		#define TWL6040_NUM_SUPPLIES (2)

		static bool twl6040_has_vibra(struct twl6040_platform_data *pdata,
		struct device_node *node)
		static bool twl6040_has_vibra(struct device_node *node)
		{
		if (pdata && pdata->vibra)
		return true;

		#ifdef CONFIG_OF
		if (of_find_node_by_name(node, "vibra"))
		return true;
		#endif

		return false;
		}

		@@ -520,14 +515,13 @@ static struct regmap_irq_chip twl6040_irq_chip = {
		static int twl6040_probe(struct i2c_client *client,
		const struct i2c_device_id *id)
		{
		struct twl6040_platform_data *pdata = client->dev.platform_data;
		struct device_node *node = client->dev.of_node;
		struct twl6040 *twl6040;
		struct mfd_cell *cell = NULL;
		int irq, ret, children = 0;

		if (!pdata && !node) {
		dev_err(&client->dev, "Platform data is missing\n");
		if (!node) {
		dev_err(&client->dev, "of node is missing\n");
		return -EINVAL;
		}

		@@ -576,13 +570,10 @@ static int twl6040_probe(struct i2c_client *client,
		twl6040->rev = twl6040_reg_read(twl6040, TWL6040_REG_ASICREV);

		/* ERRATA: Automatic power-up is not possible in ES1.0 */
		if (twl6040_get_revid(twl6040) > TWL6040_REV_ES1_0) {
		if (pdata)
		twl6040->audpwron = pdata->audpwron_gpio;
		else
		if (twl6040_get_revid(twl6040) > TWL6040_REV_ES1_0)
		twl6040->audpwron = of_get_named_gpio(node,
		"ti,audpwron-gpio", 0);
		} else
		else
		twl6040->audpwron = -EINVAL;

		if (gpio_is_valid(twl6040->audpwron)) {
		@@ -625,8 +616,6 @@ static int twl6040_probe(struct i2c_client *client,
		/*
		* 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 = regmap_irq_get_virq(twl6040->irq_data, TWL6040_IRQ_PLUG);
		cell = &twl6040->cells[children];
		@@ -635,13 +624,10 @@ static int twl6040_probe(struct i2c_client *client,
		twl6040_codec_rsrc[0].end = irq;
		cell->resources = twl6040_codec_rsrc;
		cell->num_resources = ARRAY_SIZE(twl6040_codec_rsrc);
		if (pdata && pdata->codec) {
		cell->platform_data = pdata->codec;
		cell->pdata_size = sizeof(*pdata->codec);
		}
		children++;

		if (twl6040_has_vibra(pdata, node)) {
		/* Vibra input driver support */
		if (twl6040_has_vibra(node)) {
		irq = regmap_irq_get_virq(twl6040->irq_data, TWL6040_IRQ_VIB);

		cell = &twl6040->cells[children];
		@@ -650,28 +636,13 @@ static int twl6040_probe(struct i2c_client *client,
		twl6040_vibra_rsrc[0].end = irq;
		cell->resources = twl6040_vibra_rsrc;
		cell->num_resources = ARRAY_SIZE(twl6040_vibra_rsrc);

		if (pdata && pdata->vibra) {
		cell->platform_data = pdata->vibra;
		cell->pdata_size = sizeof(*pdata->vibra);
		}
		children++;
		}

		/*
		* Enable the GPO driver in the following cases:
		* DT booted kernel or legacy boot with valid gpo platform_data
		*/
		if (!pdata \|\| (pdata && pdata->gpo)) {
		/* GPO support */
		cell = &twl6040->cells[children];
		cell->name = "twl6040-gpo";

		if (pdata) {
		cell->platform_data = pdata->gpo;
		cell->pdata_size = sizeof(*pdata->gpo);
		}
		children++;
		}

		ret = mfd_add_devices(&client->dev, -1, twl6040->cells, children,
		NULL, 0, NULL);

include/linux/mfd/twl6040.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -185,6 +185,7 @@

		#define TWL6040_GPO_MAX 3

		/* TODO: All platform data struct can be removed */
		struct twl6040_codec_data {
		u16 hs_left_step;
		u16 hs_right_step;

Admin message