Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d5876ce1242b78987e6243ba3cb23bb61d44d4a9

Authored by Peter Ujfalusi
Committed by Liam Girdwood
1 parent 3e202345ab
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

ASoC: tpa6130a2: Simplify power state management 

Use simpler way to avoid setting the same power state
for the amplifier.
Simplifies the check introduced by patch:
ASoC: tpa6130a2: Fix unbalanced regulator disables

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Cc: Jarkko Nikula <jhnikula@gmail.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>

Showing 1 changed file with 6 additions and 4 deletions Side-by-side Diff

sound/soc/codecs/tpa6130a2.c
Diff comments   View file @ d5876ce
... ... @@ -41,7 +41,7 @@
41 41 unsigned char regs[TPA6130A2_CACHEREGNUM];
42 42 struct regulator *supply;
43 43 int power_gpio;
44   - unsigned char power_state;
  44 + u8 power_state:1;
45 45 enum tpa_model id;
46 46 };
47 47  
... ... @@ -116,7 +116,7 @@
116 116 return ret;
117 117 }
118 118  
119   -static int tpa6130a2_power(int power)
  119 +static int tpa6130a2_power(u8 power)
120 120 {
121 121 struct tpa6130a2_data *data;
122 122 u8 val;
123 123  
... ... @@ -126,8 +126,10 @@
126 126 data = i2c_get_clientdata(tpa6130a2_client);
127 127  
128 128 mutex_lock(&data->mutex);
129   - if (power && !data->power_state) {
  129 + if (power == data->power_state)
  130 + goto exit;
130 131  
  132 + if (power) {
131 133 ret = regulator_enable(data->supply);
132 134 if (ret != 0) {
133 135 dev_err(&tpa6130a2_client->dev,
... ... @@ -154,7 +156,7 @@
154 156 val = tpa6130a2_read(TPA6130A2_REG_CONTROL);
155 157 val &= ~TPA6130A2_SWS;
156 158 tpa6130a2_i2c_write(TPA6130A2_REG_CONTROL, val);
157   - } else if (!power && data->power_state) {
  159 + } else {
158 160 /* set SWS */
159 161 val = tpa6130a2_read(TPA6130A2_REG_CONTROL);
160 162 val |= TPA6130A2_SWS;