ASoC: codecs: wcd937x: 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.

WCD937X_MAX_SWR_PORTS is used in one of structures in the header, so
entire enum must be moved to the top of the header file.

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-5-80a03f440c72@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/wcd937x.h b/sound/soc/codecs/wcd937x.h
index 37bff16e88ddd553f43d36bbb68915fdeafe69b6..35f3d48bd7dd72ff7bd82c1125268e7dc4d51b77 100644 (file)
--- a/sound/soc/codecs/wcd937x.h
+++ b/sound/soc/codecs/wcd937x.h
@@ -484,10 +484,25 @@
 
 #define WCD937X_MAX_MICBIAS                    3
 #define WCD937X_MAX_BULK_SUPPLY                        4
-#define WCD937X_MAX_TX_SWR_PORTS               4
-#define WCD937X_MAX_SWR_PORTS                  5
 #define WCD937X_MAX_SWR_CH_IDS                 15
 
+enum wcd937x_tx_sdw_ports {
+       WCD937X_ADC_1_PORT = 1,
+       WCD937X_ADC_2_3_PORT,
+       WCD937X_DMIC_0_3_MBHC_PORT,
+       WCD937X_DMIC_4_6_PORT,
+       WCD937X_MAX_TX_SWR_PORTS = WCD937X_DMIC_4_6_PORT,
+};
+
+enum wcd937x_rx_sdw_ports {
+       WCD937X_HPH_PORT = 1,
+       WCD937X_CLSH_PORT,
+       WCD937X_COMP_PORT,
+       WCD937X_LO_PORT,
+       WCD937X_DSD_PORT,
+       WCD937X_MAX_SWR_PORTS = WCD937X_DSD_PORT,
+};
+
 struct wcd937x_sdw_ch_info {
        int port_num;
        unsigned int ch_mask;
@@ -581,13 +596,6 @@ enum {
        WCD937X_NUM_IRQS,
 };
 
-enum wcd937x_tx_sdw_ports {
-       WCD937X_ADC_1_PORT = 1,
-       WCD937X_ADC_2_3_PORT,
-       WCD937X_DMIC_0_3_MBHC_PORT,
-       WCD937X_DMIC_4_6_PORT,
-};
-
 enum wcd937x_tx_sdw_channels {
        WCD937X_ADC1,
        WCD937X_ADC2,
@@ -602,14 +610,6 @@ enum wcd937x_tx_sdw_channels {
        WCD937X_DMIC6,
 };
 
-enum wcd937x_rx_sdw_ports {
-       WCD937X_HPH_PORT = 1,
-       WCD937X_CLSH_PORT,
-       WCD937X_COMP_PORT,
-       WCD937X_LO_PORT,
-       WCD937X_DSD_PORT,
-};
-
 enum wcd937x_rx_sdw_channels {
        WCD937X_HPH_L,
        WCD937X_HPH_R,