Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

ASoC: tpa6130a2: Remove model_id from platform data

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>
  • Loading branch information...
commit 0722d055ac2236da4e319d22a99c9f7e82dbdd5d 1 parent 0744100
Peter Ujfalusi authored broonie committed
1  arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -900,7 +900,6 @@ static struct twl4030_platform_data rx51_twldata __initdata = {
900 900 };
901 901
902 902 static struct tpa6130a2_platform_data rx51_tpa6130a2_data __initdata_or_module = {
903   - .id = TPA6130A2,
904 903 .power_gpio = 98,
905 904 };
906 905
6 include/sound/tpa6130a2-plat.h
@@ -23,13 +23,7 @@
23 23 #ifndef TPA6130A2_PLAT_H
24 24 #define TPA6130A2_PLAT_H
25 25
26   -enum tpa_model {
27   - TPA6130A2,
28   - TPA6140A2,
29   -};
30   -
31 26 struct tpa6130a2_platform_data {
32   - enum tpa_model id;
33 27 int power_gpio;
34 28 };
35 29
5 sound/soc/codecs/tpa6130a2.c
@@ -33,6 +33,11 @@
33 33
34 34 #include "tpa6130a2.h"
35 35
  36 +enum tpa_model {
  37 + TPA6130A2,
  38 + TPA6140A2,
  39 +};
  40 +
36 41 static struct i2c_client *tpa6130a2_client;
37 42
38 43 /* This struct is used to save the context */

0 comments on commit 0722d05

Please sign in to comment.
Something went wrong with that request. Please try again.