ASoC: codec: Change name for enum defined for callback between wcd and bolero

Add enum names defined for callback between wcd and bolero in
separate file and include that file in order to have same enum
across wcd and bolero.

Change-Id: I808c2ad3de37655c1ba2b8e096def60703ced7f2
Signed-off-by: Vatsal Bucha <vbucha@codeaurora.org>
Cette révision appartient à :
Vatsal Bucha
2020-08-24 10:06:05 +05:30
révisé par Gerrit - the friendly Code Review server
Parent a387074fd0
révision 625753df87
12 fichiers modifiés avec 110 ajouts et 167 suppressions

Voir le fichier

@@ -60,15 +60,6 @@ enum {
SWR_VISENSE_PORT,
};
enum {
BOLERO_WSA_EVT_TX_CH_HOLD_CLEAR = 1,
BOLERO_WSA_EVT_PA_OFF_PRE_SSR,
BOLERO_WSA_EVT_SSR_DOWN,
BOLERO_WSA_EVT_SSR_UP,
BOLERO_WSA_EVT_PA_ON_POST_FSCLK,
BOLERO_WSA_EVT_PA_ON_POST_FSCLK_ADIE_LB,
};
struct wsa_ctrl_platform_data {
void *handle;
int (*update_wsa_event)(void *handle, u16 event, u32 data);

Voir le fichier

@@ -29,6 +29,7 @@
#include <asoc/msm-cdc-supply.h>
#include "wsa883x.h"
#include "internal.h"
#include "asoc/bolero-slave-internal.h"
#define T1_TEMP -10
#define T2_TEMP 150
@@ -1436,7 +1437,7 @@ static int wsa883x_event_notify(struct notifier_block *nb,
return -EINVAL;
switch (event) {
case BOLERO_WSA_EVT_PA_OFF_PRE_SSR:
case BOLERO_SLV_EVT_PA_OFF_PRE_SSR:
if (test_bit(SPKR_STATUS, &wsa883x->status_mask))
snd_soc_component_update_bits(wsa883x->component,
WSA883X_PA_FSM_CTL,
@@ -1444,14 +1445,14 @@ static int wsa883x_event_notify(struct notifier_block *nb,
wsa883x_swr_down(wsa883x);
break;
case BOLERO_WSA_EVT_SSR_UP:
case BOLERO_SLV_EVT_SSR_UP:
wsa883x_swr_up(wsa883x);
/* Add delay to allow enumerate */
usleep_range(20000, 20010);
wsa883x_swr_reset(wsa883x);
break;
case BOLERO_WSA_EVT_PA_ON_POST_FSCLK:
case BOLERO_SLV_EVT_PA_ON_POST_FSCLK:
if (test_bit(SPKR_STATUS, &wsa883x->status_mask)) {
snd_soc_component_update_bits(wsa883x->component,
WSA883X_PDM_WD_CTL,
@@ -1470,7 +1471,7 @@ static int wsa883x_event_notify(struct notifier_block *nb,
usleep_range(5000, 5050);
}
break;
case BOLERO_WSA_EVT_PA_ON_POST_FSCLK_ADIE_LB:
case BOLERO_SLV_EVT_PA_ON_POST_FSCLK_ADIE_LB:
if (test_bit(SPKR_STATUS, &wsa883x->status_mask))
set_bit(SPKR_ADIE_LB, &wsa883x->status_mask);
break;