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: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Link: https://patch.msgid.link/20250909121954.225833-9-srinivas.kandagatla@oss.qualcomm.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/wcd-common.h b/sound/soc/codecs/wcd-common.h
index 611f06cdec550d66a428f06ce781841d9f581e45..d94e8879a1d77f0c68901e0e19549f6414a2c839 100644 (file)
--- a/sound/soc/codecs/wcd-common.h
+++ b/sound/soc/codecs/wcd-common.h
@@ -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;

diff --git a/sound/soc/codecs/wcd937x-sdw.c b/sound/soc/codecs/wcd937x-sdw.c
index e7cc699bd8bcf1260ebcce705436decf786820bb..8f28191635277e79a9474d4c5513c7495f2328a9 100644 (file)
--- a/sound/soc/codecs/wcd937x-sdw.c
+++ b/sound/soc/codecs/wcd937x-sdw.c
@@ -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)),

diff --git a/sound/soc/codecs/wcd937x.c b/sound/soc/codecs/wcd937x.c
index ffe6508fd84c45c15abc06604d5bafefb880035b..4c040e3862f481e1d2e4355570c3d8f9b47e7f21 100644 (file)
--- a/sound/soc/codecs/wcd937x.c
+++ b/sound/soc/codecs/wcd937x.c
@@ -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;

diff --git a/sound/soc/codecs/wcd937x.h b/sound/soc/codecs/wcd937x.h
index 0f96b7108a7ebe7a7adfb78a91650058b8d4a1d4..3d0ba3cc0ee614cad5f55d19c1b6bbb814808fd2 100644 (file)
--- a/sound/soc/codecs/wcd937x.h
+++ b/sound/soc/codecs/wcd937x.h
@@ -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;

diff --git a/sound/soc/codecs/wcd938x-sdw.c b/sound/soc/codecs/wcd938x-sdw.c
index 8bcd8396f3750a4677464787befaeac92bf256bf..1dc13b6fabfa6e54e84cceed0982ff3f6a8b42eb 100644 (file)
--- a/sound/soc/codecs/wcd938x-sdw.c
+++ b/sound/soc/codecs/wcd938x-sdw.c
@@ -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)),

diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c
index c8b6e543986d333a36eb9f5dcc95149442954bc2..e495f98972f1a230042fdd6dc81e991cf3138008 100644 (file)
--- a/sound/soc/codecs/wcd938x.c
+++ b/sound/soc/codecs/wcd938x.c
@@ -394,7 +394,7 @@ static int wcd938x_io_init(struct wcd938x_priv *wcd938x)
 
 }
 
-static int wcd938x_sdw_connect_port(const struct wcd938x_sdw_ch_info *ch_info,
+static int wcd938x_sdw_connect_port(const struct wcd_sdw_ch_info *ch_info,
                                    struct sdw_port_config *port_config,
                                    u8 enable)
 {

diff --git a/sound/soc/codecs/wcd938x.h b/sound/soc/codecs/wcd938x.h
index 54ee56b7fbd6ab7782d950d19ef866444020d321..c18610466d7d8376be3bed96eb825a2f934c18d5 100644 (file)
--- a/sound/soc/codecs/wcd938x.h
+++ b/sound/soc/codecs/wcd938x.h
@@ -587,17 +587,6 @@
 
 #define WCD938X_MAX_SWR_CH_IDS 15
 
-struct wcd938x_sdw_ch_info {
-       int port_num;
-       unsigned int ch_mask;
-};
-
-#define WCD_SDW_CH(id, pn, cmask)      \
-       [id] = {                        \
-               .port_num = pn,         \
-               .ch_mask = cmask,       \
-       }
-
 enum wcd938x_tx_sdw_ports {
        WCD938X_ADC_1_2_PORT = 1,
        WCD938X_ADC_3_4_PORT,
@@ -649,7 +638,7 @@ struct wcd938x_sdw_priv {
        struct sdw_stream_config sconfig;
        struct sdw_stream_runtime *sruntime;
        struct sdw_port_config port_config[WCD938X_MAX_SWR_PORTS];
-       const struct wcd938x_sdw_ch_info *ch_info;
+       const struct wcd_sdw_ch_info *ch_info;
        bool port_enable[WCD938X_MAX_SWR_CH_IDS];
        int active_ports;
        bool is_tx;

diff --git a/sound/soc/codecs/wcd939x-sdw.c b/sound/soc/codecs/wcd939x-sdw.c
index 477d6cf27d32c349aee6ed211c4c44eefa77de97..97a829e3ce4f5179b5790c0d233906eb8afcf555 100644 (file)
--- a/sound/soc/codecs/wcd939x-sdw.c
+++ b/sound/soc/codecs/wcd939x-sdw.c
@@ -20,10 +20,11 @@
 #include <sound/soc.h>
 #include <sound/soc-dapm.h>
 #include "wcd939x.h"
+#include "wcd-common.h"
 
 #define SWRS_SCP_HOST_CLK_DIV2_CTL_BANK(m) (0xE0 + 0x10 * (m))
 
-static const struct wcd939x_sdw_ch_info wcd939x_sdw_rx_ch_info[] = {
+static const struct wcd_sdw_ch_info wcd939x_sdw_rx_ch_info[] = {
        WCD_SDW_CH(WCD939X_HPH_L, WCD939X_HPH_PORT, BIT(0)),
        WCD_SDW_CH(WCD939X_HPH_R, WCD939X_HPH_PORT, BIT(1)),
        WCD_SDW_CH(WCD939X_CLSH, WCD939X_CLSH_PORT, BIT(0)),
@@ -36,7 +37,7 @@ static const struct wcd939x_sdw_ch_info wcd939x_sdw_rx_ch_info[] = {
        WCD_SDW_CH(WCD939X_HIFI_PCM_R, WCD939X_HIFI_PCM_PORT, BIT(1)),
 };
 
-static const struct wcd939x_sdw_ch_info wcd939x_sdw_tx_ch_info[] = {
+static const struct wcd_sdw_ch_info wcd939x_sdw_tx_ch_info[] = {
        WCD_SDW_CH(WCD939X_ADC1, WCD939X_ADC_1_4_PORT, BIT(0)),
        WCD_SDW_CH(WCD939X_ADC2, WCD939X_ADC_1_4_PORT, BIT(1)),
        WCD_SDW_CH(WCD939X_ADC3, WCD939X_ADC_1_4_PORT, BIT(2)),

diff --git a/sound/soc/codecs/wcd939x.c b/sound/soc/codecs/wcd939x.c
index 59c920c50c00f86266705a12bd92923ba64e6a92..a414cd99b9466a57d18b0a48cc3bab900c178d70 100644 (file)
--- a/sound/soc/codecs/wcd939x.c
+++ b/sound/soc/codecs/wcd939x.c
@@ -413,7 +413,7 @@ static int wcd939x_io_init(struct snd_soc_component *component)
        return 0;
 }
 
-static int wcd939x_sdw_connect_port(const struct wcd939x_sdw_ch_info *ch_info,
+static int wcd939x_sdw_connect_port(const struct wcd_sdw_ch_info *ch_info,
                                    struct sdw_port_config *port_config,
                                    u8 enable)
 {

diff --git a/sound/soc/codecs/wcd939x.h b/sound/soc/codecs/wcd939x.h
index e70445b1a4bc8ad6313a06ed4c754418ce37fa72..ca6353222ea01ed9137044bb6fa41b61cd39094b 100644 (file)
--- a/sound/soc/codecs/wcd939x.h
+++ b/sound/soc/codecs/wcd939x.h
@@ -844,17 +844,6 @@
 
 #define WCD939X_MAX_SWR_CH_IDS         (15)
 
-struct wcd939x_sdw_ch_info {
-       int port_num;
-       unsigned int ch_mask;
-};
-
-#define WCD_SDW_CH(id, pn, cmask)      \
-       [id] = {                        \
-               .port_num = pn,         \
-               .ch_mask = cmask,       \
-       }
-
 enum wcd939x_tx_sdw_ports {
        WCD939X_ADC_1_4_PORT = 1,
        WCD939X_ADC_DMIC_1_2_PORT,
@@ -909,7 +898,7 @@ struct wcd939x_sdw_priv {
        struct sdw_stream_config sconfig;
        struct sdw_stream_runtime *sruntime;
        struct sdw_port_config port_config[WCD939X_MAX_SWR_PORTS];
-       const struct wcd939x_sdw_ch_info *ch_info;
+       const struct wcd_sdw_ch_info *ch_info;
        bool port_enable[WCD939X_MAX_SWR_CH_IDS];
        int active_ports;
        bool is_tx;