Unverified Commit 4652f02c authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Mark Brown
Browse files

ASoC: codecs: wcd-common: move WCD_SDW_CH to common 



sdw_ch_info and WCD_SDW_CH macro is duplicated across wcd937x, wcd938x,
wcd939x soundwire codec drivers. Move this to wcd common driver to
remove this code duplication.

Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Link: https://patch.msgid.link/20250909121954.225833-9-srinivas.kandagatla@oss.qualcomm.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4f16b635

sound/soc/codecs/wcd-common.h

+13 −0
Original line number Diff line number Diff line
@@ -14,6 +14,19 @@ enum sdw_slave_status; 


#define WCD_MAX_MICBIAS		4



struct wcd_sdw_ch_info {

	int port_num;

	unsigned int ch_mask;

	unsigned int master_ch_mask;

};



#define WCD_SDW_CH(id, pn, cmask)	\

	[id] = {			\

		.port_num = pn,		\

		.ch_mask = cmask,	\

		.master_ch_mask = cmask,	\

	}



struct wcd_common {

	struct device *dev;

	int max_bias;

sound/soc/codecs/wcd937x-sdw.c

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <sound/soc.h>

#include "wcd937x.h"



static struct wcd937x_sdw_ch_info wcd937x_sdw_rx_ch_info[] = {

static struct wcd_sdw_ch_info wcd937x_sdw_rx_ch_info[] = {

	WCD_SDW_CH(WCD937X_HPH_L, WCD937X_HPH_PORT, BIT(0)),

	WCD_SDW_CH(WCD937X_HPH_R, WCD937X_HPH_PORT, BIT(1)),

	WCD_SDW_CH(WCD937X_CLSH, WCD937X_CLSH_PORT, BIT(0)),
@@ -30,7 +30,7 @@ static struct wcd937x_sdw_ch_info wcd937x_sdw_rx_ch_info[] = { 
	WCD_SDW_CH(WCD937X_DSD_R, WCD937X_DSD_PORT, BIT(1)),

};



static struct wcd937x_sdw_ch_info wcd937x_sdw_tx_ch_info[] = {

static struct wcd_sdw_ch_info wcd937x_sdw_tx_ch_info[] = {

	WCD_SDW_CH(WCD937X_ADC1, WCD937X_ADC_1_PORT, BIT(0)),

	WCD_SDW_CH(WCD937X_ADC2, WCD937X_ADC_2_3_PORT, BIT(0)),

	WCD_SDW_CH(WCD937X_ADC3, WCD937X_ADC_2_3_PORT, BIT(0)),

sound/soc/codecs/wcd937x.c

+1 −1
Original line number Diff line number Diff line
@@ -1183,7 +1183,7 @@ static int wcd937x_codec_enable_micbias_pullup(struct snd_soc_dapm_widget *w, 
static int wcd937x_connect_port(struct wcd937x_sdw_priv *wcd, u8 port_idx, u8 ch_id, bool enable)

{

	struct sdw_port_config *port_config = &wcd->port_config[port_idx - 1];

	const struct wcd937x_sdw_ch_info *ch_info = &wcd->ch_info[ch_id];

	const struct wcd_sdw_ch_info *ch_info = &wcd->ch_info[ch_id];

	u8 port_num = ch_info->port_num;

	u8 ch_mask = ch_info->ch_mask;

	u8 mstr_port_num, mstr_ch_mask;

sound/soc/codecs/wcd937x.h

+2 −14
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 


#include <linux/soundwire/sdw.h>

#include <linux/soundwire/sdw_type.h>

#include "wcd-common.h"



#define WCD937X_BASE_ADDRESS			0x3000

#define WCD937X_ANA_BIAS			0x3001
@@ -507,26 +508,13 @@ enum wcd937x_rx_sdw_ports { 
	WCD937X_MAX_SWR_PORTS = WCD937X_DSD_PORT,

};



struct wcd937x_sdw_ch_info {

	int port_num;

	unsigned int ch_mask;

	unsigned int master_ch_mask;

};



#define WCD_SDW_CH(id, pn, cmask)	\

	[id] = {			\

		.port_num = pn,		\

		.ch_mask = cmask,	\

		.master_ch_mask = cmask,	\

	}



struct wcd937x_priv;

struct wcd937x_sdw_priv {

	struct sdw_slave *sdev;

	struct sdw_stream_config sconfig;

	struct sdw_stream_runtime *sruntime;

	struct sdw_port_config port_config[WCD937X_MAX_SWR_PORTS];

	struct wcd937x_sdw_ch_info *ch_info;

	struct wcd_sdw_ch_info *ch_info;

	bool port_enable[WCD937X_MAX_SWR_CH_IDS];

	unsigned int master_channel_map[SDW_MAX_PORTS];

	int active_ports;

sound/soc/codecs/wcd938x-sdw.c

+3 −2
Original line number Diff line number Diff line
@@ -18,10 +18,11 @@ 
#include <sound/soc.h>

#include <sound/soc-dapm.h>

#include "wcd938x.h"

#include "wcd-common.h"



#define SWRS_SCP_HOST_CLK_DIV2_CTL_BANK(m) (0xE0 + 0x10 * (m))



static const struct wcd938x_sdw_ch_info wcd938x_sdw_rx_ch_info[] = {

static const struct wcd_sdw_ch_info wcd938x_sdw_rx_ch_info[] = {

	WCD_SDW_CH(WCD938X_HPH_L, WCD938X_HPH_PORT, BIT(0)),

	WCD_SDW_CH(WCD938X_HPH_R, WCD938X_HPH_PORT, BIT(1)),

	WCD_SDW_CH(WCD938X_CLSH, WCD938X_CLSH_PORT, BIT(0)),
@@ -32,7 +33,7 @@ static const struct wcd938x_sdw_ch_info wcd938x_sdw_rx_ch_info[] = { 
	WCD_SDW_CH(WCD938X_DSD_R, WCD938X_DSD_PORT, BIT(1)),

};



static const struct wcd938x_sdw_ch_info wcd938x_sdw_tx_ch_info[] = {

static const struct wcd_sdw_ch_info wcd938x_sdw_tx_ch_info[] = {

	WCD_SDW_CH(WCD938X_ADC1, WCD938X_ADC_1_2_PORT, BIT(0)),

	WCD_SDW_CH(WCD938X_ADC2, WCD938X_ADC_1_2_PORT, BIT(1)),

	WCD_SDW_CH(WCD938X_ADC3, WCD938X_ADC_3_4_PORT, BIT(0)),