ASoC: codecs: wcd939x: Move max port number defines to enum

Instead of having separate define to indicate number of TX and RX
Soundwire ports, move it to the enums defining actual port
indices/values.  This makes it more obvious why such value was chosen as
number of TX/RX ports.
Note: the enums start from 1, thus number of ports equals to the last
vaue in the enum.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://patch.msgid.link/20240725-asoc-wsa88xx-port-arrays-v1-7-80a03f440c72@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/wcd939x.h b/sound/soc/codecs/wcd939x.h
index 1571c2120cfcb521e2232719444a9a86971e9ad6..3204fb10b58d7d72000e94715f68ce17cf841060 100644 (file)
--- a/sound/soc/codecs/wcd939x.h
+++ b/sound/soc/codecs/wcd939x.h
@@ -842,9 +842,6 @@
 #define WCD939X_DSD_HPHR_CFG5                             (0x35a6)
 #define WCD939X_MAX_REGISTER                              (WCD939X_DSD_HPHR_CFG5)
 
-#define WCD939X_MAX_SWR_PORTS          (6)
-#define WCD939X_MAX_RX_SWR_PORTS       (6)
-#define WCD939X_MAX_TX_SWR_PORTS       (4)
 #define WCD939X_MAX_SWR_CH_IDS         (15)
 
 struct wcd939x_sdw_ch_info {
@@ -863,6 +860,7 @@ enum wcd939x_tx_sdw_ports {
        WCD939X_ADC_DMIC_1_2_PORT,
        WCD939X_DMIC_0_3_MBHC_PORT,
        WCD939X_DMIC_3_7_PORT,
+       WCD939X_MAX_TX_SWR_PORTS = WCD939X_DMIC_3_7_PORT,
 };
 
 enum wcd939x_tx_sdw_channels {
@@ -888,6 +886,8 @@ enum wcd939x_rx_sdw_ports {
        WCD939X_LO_PORT,
        WCD939X_DSD_PORT,
        WCD939X_HIFI_PCM_PORT,
+       WCD939X_MAX_RX_SWR_PORTS = WCD939X_HIFI_PCM_PORT,
+       WCD939X_MAX_SWR_PORTS = WCD939X_MAX_RX_SWR_PORTS,
 };
 
 enum wcd939x_rx_sdw_channels {