ASoC: tpa6130a2: Remove model_id from platform data (0722d055) · Commits · 戴 / test

The model_id is no longer needed within the platform_data for the TPA driver since the model of TPA specified with the device name (tpa6130a2/tpa6140a2). Also update rx51 (the only affected user) to use the device name rather than platform data. Signed-off-by:

Peter Ujfalusi <peter.ujfalusi@ti.com> Tested-by:

Jarkko Nikula <jarkko.nikula@bitmer.com> Acked-by:

Liam Girdwood <lrg@ti.com> Acked-by:

Tony Lindgren <tony@atomide.com> Signed-off-by:

Mark Brown <broonie@opensource.wolfsonmicro.com>

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -900,7 +900,6 @@ static struct twl4030_platform_data rx51_twldata __initdata = {
		};

		static struct tpa6130a2_platform_data rx51_tpa6130a2_data __initdata_or_module = {
		.id = TPA6130A2,
		.power_gpio = 98,
		};

include/sound/tpa6130a2-plat.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -23,13 +23,7 @@
		#ifndef TPA6130A2_PLAT_H
		#define TPA6130A2_PLAT_H

		enum tpa_model {
		TPA6130A2,
		TPA6140A2,
		};

		struct tpa6130a2_platform_data {
		enum tpa_model id;
		int power_gpio;
		};

sound/soc/codecs/tpa6130a2.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,11 @@

		#include "tpa6130a2.h"

		enum tpa_model {
		TPA6130A2,
		TPA6140A2,
		};

		static struct i2c_client *tpa6130a2_client;

		/* This struct is used to save the context */

Admin message