samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

audio-kernel: Fix compile error on wcd

Browse Source 
Fix compile error on wcd codec.

Change-Id: I65a3db216234ab798f8a85dd2401ac605b09f7f0
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
This commit is contained in:
Laxminath Kasam
2020-12-22 13:15:01 +05:30
parent 5423877317
commit 7962130af8
6 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
asoc/codecs/wcd937x/internal.h
View File

@@ -74,7 +74,7 @@ struct wcd937x_priv {
tx_port_mapping[MAX_PORT][MAX_CH_PER_PORT];
struct codec_port_info
rx_port_mapping[MAX_PORT][MAX_CH_PER_PORT];
struct port_params tx_port_params[SWR_UC_MAX][SWR_NUM_PORTS];
struct swr_port_params tx_port_params[SWR_UC_MAX][SWR_NUM_PORTS];
struct swr_dev_frame_config swr_tx_port_params[SWR_UC_MAX];
struct regulator_bulk_data *supplies;
struct notifier_block nblock;

7
asoc/codecs/wcd937x/wcd937x.c
View File

@@ -238,8 +238,9 @@ static int wcd937x_parse_port_params(struct device *dev,
{
u32 *dt_array, map_size, max_uc;
int ret = 0;
u32 offset1, lane_ctrl, cnt = 0;
struct port_params (*map)[SWR_UC_MAX][SWR_NUM_PORTS];
u32 cnt = 0;
u32 i, j;
struct swr_port_params (*map)[SWR_UC_MAX][SWR_NUM_PORTS];
struct swr_dev_frame_config (*map_uc)[SWR_UC_MAX];
struct wcd937x_priv *wcd937x = dev_get_drvdata(dev);
@@ -288,7 +289,7 @@ static int wcd937x_parse_port_params(struct device *dev,
(*map)[i][j].offset1 = dt_array[cnt];
(*map)[i][j].lane_ctrl = dt_array[cnt + 1];
}
(*map_uc)[i] = &(*map)[i][0];
(*map_uc)[i].pp = &(*map)[i][0];
}
kfree(dt_array);
return 0;

2
asoc/codecs/wcd938x/internal.h
View File

@@ -90,7 +90,7 @@ struct wcd938x_priv {
tx_port_mapping[MAX_PORT][MAX_CH_PER_PORT];
struct codec_port_info
rx_port_mapping[MAX_PORT][MAX_CH_PER_PORT];
struct port_params tx_port_params[SWR_UC_MAX][SWR_NUM_PORTS];
struct swr_port_params tx_port_params[SWR_UC_MAX][SWR_NUM_PORTS];
struct swr_dev_frame_config swr_tx_port_params[SWR_UC_MAX];
struct regulator_bulk_data *supplies;
struct notifier_block nblock;

7
asoc/codecs/wcd938x/wcd938x.c
View File

@@ -352,8 +352,9 @@ static int wcd938x_parse_port_params(struct device *dev,
{
u32 *dt_array, map_size, max_uc;
int ret = 0;
u32 offset1, lane_ctrl, cnt = 0;
struct port_params (*map)[SWR_UC_MAX][SWR_NUM_PORTS];
u32 cnt = 0;
u32 i, j;
struct swr_port_params (*map)[SWR_UC_MAX][SWR_NUM_PORTS];
struct swr_dev_frame_config (*map_uc)[SWR_UC_MAX];
struct wcd938x_priv *wcd938x = dev_get_drvdata(dev);
@@ -402,7 +403,7 @@ static int wcd938x_parse_port_params(struct device *dev,
(*map)[i][j].offset1 = dt_array[cnt];
(*map)[i][j].lane_ctrl = dt_array[cnt + 1];
}
(*map_uc)[i] = &(*map)[i][0];
(*map_uc)[i].pp = &(*map)[i][0];
}
kfree(dt_array);
return 0;

11
config/waipioauto.conf
View File

@@ -17,12 +17,13 @@ export CONFIG_SOUNDWIRE_MSTR_CTRL=m
export CONFIG_WCD9XXX_CODEC_CORE_V2=m
export CONFIG_MSM_CDC_PINCTRL=m
export CONFIG_SND_SOC_WSA883X=m
export CONFIG_SND_SOC_BOLERO=m
export CONFIG_SND_SOC_LPASS_CDC=m
export CONFIG_SND_SOC_WCD_IRQ=m
export CONFIG_WSA_MACRO=m
export CONFIG_VA_MACRO=m
export CONFIG_TX_MACRO=m
export CONFIG_RX_MACRO=m
export CONFIG_LPASS_CDC_WSA2_MACRO=m
export CONFIG_LPASS_CDC_WSA_MACRO=m
export CONFIG_LPASS_CDC_VA_MACRO=m
export CONFIG_LPASS_CDC_TX_MACRO=m
export CONFIG_LPASS_CDC_RX_MACRO=m
export CONFIG_SND_SOC_WCD9XXX_V2=m
export CONFIG_SND_SOC_WCD938X=m
export CONFIG_SND_SOC_WCD938X_SLAVE=m

11
config/waipioautoconf.h
View File

@@ -21,12 +21,13 @@
#define CONFIG_WCD9XXX_CODEC_CORE_V2 1
#define CONFIG_MSM_CDC_PINCTRL 1
#define CONFIG_SND_SOC_WSA883X 1
#define CONFIG_SND_SOC_BOLERO 1
#define CONFIG_SND_SOC_LPASS_CDC 1
#define CONFIG_SND_SOC_WCD_IRQ 1
#define CONFIG_WSA_MACRO 1
#define CONFIG_VA_MACRO 1
#define CONFIG_TX_MACRO 1
#define CONFIG_RX_MACRO 1
#define CONFIG_LPASS_CDC_WSA2_MACRO 1
#define CONFIG_LPASS_CDC_WSA_MACRO 1
#define CONFIG_LPASS_CDC_VA_MACRO 1
#define CONFIG_LPASS_CDC_TX_MACRO 1
#define CONFIG_LPASS_CDC_RX_MACRO 1
#define CONFIG_SND_SOC_WCD9XXX_V2 1
#define CONFIG_SND_SOC_WCD938X 1
#define CONFIG_SND_SOC_WCD938X_SLAVE 1