ASoC: Intel: sof_sdw: rename SOF_RT711_JDSRC to SOF_JACK_JDSRC

Jack Detection source can be applied to all jacks, not only rt711.
No function changes.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20230602202225.249209-9-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
index 8405c32314481f41455415da07955e2987f44274..d925e300539483ddffe2f86a2328ef16b281ca02 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw.c
+++ b/sound/soc/intel/boards/sof_sdw.c
@@ -24,9 +24,9 @@ MODULE_PARM_DESC(quirk, "Board-specific quirk override");
 
 static void log_quirks(struct device *dev)
 {
-       if (SOF_RT711_JDSRC(sof_sdw_quirk))
+       if (SOF_JACK_JDSRC(sof_sdw_quirk))
                dev_dbg(dev, "quirk realtek,jack-detect-source %ld\n",
-                       SOF_RT711_JDSRC(sof_sdw_quirk));
+                       SOF_JACK_JDSRC(sof_sdw_quirk));
        if (sof_sdw_quirk & SOF_SDW_FOUR_SPK)
                dev_dbg(dev, "quirk SOF_SDW_FOUR_SPK enabled\n");
        if (sof_sdw_quirk & SOF_SDW_TGL_HDMI)

diff --git a/sound/soc/intel/boards/sof_sdw_common.h b/sound/soc/intel/boards/sof_sdw_common.h
index 65b3f6eee92438e64903ca555220efd34ae23fd0..9640fd6dbd12605097c2c90b38f86142bd5fc415 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_common.h
+++ b/sound/soc/intel/boards/sof_sdw_common.h
@@ -41,7 +41,7 @@ enum {
        SOF_I2S_SSP5 = BIT(5),
 };
 
-#define SOF_RT711_JDSRC(quirk)         ((quirk) & GENMASK(3, 0))
+#define SOF_JACK_JDSRC(quirk)          ((quirk) & GENMASK(3, 0))
 #define SOF_SDW_FOUR_SPK               BIT(4)
 #define SOF_SDW_TGL_HDMI               BIT(5)
 #define SOF_SDW_PCH_DMIC               BIT(6)

diff --git a/sound/soc/intel/boards/sof_sdw_rt711.c b/sound/soc/intel/boards/sof_sdw_rt711.c
index 8291967f23f30f0ccac487fb2b6b3db32704c133..2b05e2a707dec127194e9775553915c6efa543f3 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_rt711.c
+++ b/sound/soc/intel/boards/sof_sdw_rt711.c
@@ -27,9 +27,9 @@ static int rt711_add_codec_device_props(struct device *sdw_dev)
        struct fwnode_handle *fwnode;
        int ret;
 
-       if (!SOF_RT711_JDSRC(sof_sdw_quirk))
+       if (!SOF_JACK_JDSRC(sof_sdw_quirk))
                return 0;
-       props[0] = PROPERTY_ENTRY_U32("realtek,jd-src", SOF_RT711_JDSRC(sof_sdw_quirk));
+       props[0] = PROPERTY_ENTRY_U32("realtek,jd-src", SOF_JACK_JDSRC(sof_sdw_quirk));
 
        fwnode = fwnode_create_software_node(props, NULL);
        if (IS_ERR(fwnode))

diff --git a/sound/soc/intel/boards/sof_sdw_rt711_sdca.c b/sound/soc/intel/boards/sof_sdw_rt711_sdca.c
index cf8b9793fe0e5b2b6510ed6957568f42c5113505..a9ae0aa5ce0a0d6ab5666c8be9ed6587b4e7fe26 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_rt711_sdca.c
+++ b/sound/soc/intel/boards/sof_sdw_rt711_sdca.c
@@ -27,10 +27,10 @@ static int rt711_sdca_add_codec_device_props(struct device *sdw_dev)
        struct fwnode_handle *fwnode;
        int ret;
 
-       if (!SOF_RT711_JDSRC(sof_sdw_quirk))
+       if (!SOF_JACK_JDSRC(sof_sdw_quirk))
                return 0;
 
-       props[0] = PROPERTY_ENTRY_U32("realtek,jd-src", SOF_RT711_JDSRC(sof_sdw_quirk));
+       props[0] = PROPERTY_ENTRY_U32("realtek,jd-src", SOF_JACK_JDSRC(sof_sdw_quirk));
 
        fwnode = fwnode_create_software_node(props, NULL);
        if (IS_ERR(fwnode))
@@ -143,7 +143,7 @@ int sof_sdw_rt711_sdca_exit(struct snd_soc_card *card, struct snd_soc_dai_link *
        if (!ctx->headset_codec_dev)
                return 0;
 
-       if (!SOF_RT711_JDSRC(sof_sdw_quirk))
+       if (!SOF_JACK_JDSRC(sof_sdw_quirk))
                return 0;
 
        device_remove_software_node(ctx->headset_codec_dev);