ASoC: hdmi-codec: Update to modern DAI terminology

As part of retiring the old defines used to specify DAI formats update the
hdmi_codec driver to use the modern names, including the variables in the
struct hdmi_codec_daifmt exported to the DRM drivers.

In updating this I did note that the only use of this information in DRM
drivers is to reject clock provider settings, thinking about what this
hardware is doing I rather suspect that there might not be any hardware
out there which needs the configuration so it may be worth considering
just having hdmi-codec support only clock consumer.

Signed-off-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20220602103029.3498791-1-broonie@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c
index 65549fbfdc8709bf3c313c9bd01b4240be04bb0f..be9736f67542c3ed6a4762dfcb76027579e5a104 100644 (file)
--- a/drivers/gpu/drm/bridge/sii902x.c
+++ b/drivers/gpu/drm/bridge/sii902x.c
@@ -549,8 +549,9 @@ static int sii902x_audio_hw_params(struct device *dev, void *data,
        unsigned long mclk_rate;
        int i, ret;
 
-       if (daifmt->bit_clk_master || daifmt->frame_clk_master) {
-               dev_dbg(dev, "%s: I2S master mode not supported\n", __func__);
+       if (daifmt->bit_clk_provider || daifmt->frame_clk_provider) {
+               dev_dbg(dev, "%s: I2S clock provider mode not supported\n",
+                       __func__);
                return -EINVAL;
        }
 

diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c
index f50b47ac11a82ec88af0aa77de2b7dc4e1104082..a2f0860b20bb9a9993731953d74a3835ea567552 100644 (file)
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c
@@ -45,7 +45,7 @@ static int dw_hdmi_i2s_hw_params(struct device *dev, void *data,
        u8 inputclkfs = 0;
 
        /* it cares I2S only */
-       if (fmt->bit_clk_master | fmt->frame_clk_master) {
+       if (fmt->bit_clk_provider | fmt->frame_clk_provider) {
                dev_err(dev, "unsupported clock settings\n");
                return -EINVAL;
        }

diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index 7655142a4651cadc40d25e5fb6f719aa28dec516..10b0036f8a2e2d49f10daa2843018e3edf8c6e8a 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -1594,12 +1594,12 @@ static int hdmi_audio_hw_params(struct device *dev, void *data,
        struct hdmi_context *hdata = dev_get_drvdata(dev);
 
        if (daifmt->fmt != HDMI_I2S || daifmt->bit_clk_inv ||
-           daifmt->frame_clk_inv || daifmt->bit_clk_master ||
-           daifmt->frame_clk_master) {
+           daifmt->frame_clk_inv || daifmt->bit_clk_provider ||
+           daifmt->frame_clk_provider) {
                dev_err(dev, "%s: Bad flags %d %d %d %d\n", __func__,
                        daifmt->bit_clk_inv, daifmt->frame_clk_inv,
-                       daifmt->bit_clk_master,
-                       daifmt->frame_clk_master);
+                       daifmt->bit_clk_provider,
+                       daifmt->frame_clk_provider);
                return -EINVAL;
        }
 

diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
index b7ec6c374fbda29784b4622b505fc97a39f06d62..c4fadaecbb2d6784ba94a77297c582431ed68b62 100644 (file)
--- a/drivers/gpu/drm/i2c/tda998x_drv.c
+++ b/drivers/gpu/drm/i2c/tda998x_drv.c
@@ -1095,11 +1095,11 @@ static int tda998x_audio_hw_params(struct device *dev, void *data,
 
        if (!spdif &&
            (daifmt->bit_clk_inv || daifmt->frame_clk_inv ||
-            daifmt->bit_clk_master || daifmt->frame_clk_master)) {
+            daifmt->bit_clk_provider || daifmt->frame_clk_provider)) {
                dev_err(dev, "%s: Bad flags %d %d %d %d\n", __func__,
                        daifmt->bit_clk_inv, daifmt->frame_clk_inv,
-                       daifmt->bit_clk_master,
-                       daifmt->frame_clk_master);
+                       daifmt->bit_clk_provider,
+                       daifmt->frame_clk_provider);
                return -EINVAL;
        }
 

diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c
index b3fbee7eac114960869d90c52061d15f8de337be..65c76077e866a9d70670024386944aff5c0dedf7 100644 (file)
--- a/drivers/gpu/drm/sti/sti_hdmi.c
+++ b/drivers/gpu/drm/sti/sti_hdmi.c
@@ -1175,12 +1175,12 @@ static int hdmi_audio_hw_params(struct device *dev,
        DRM_DEBUG_DRIVER("\n");
 
        if ((daifmt->fmt != HDMI_I2S) || daifmt->bit_clk_inv ||
-           daifmt->frame_clk_inv || daifmt->bit_clk_master ||
-           daifmt->frame_clk_master) {
+           daifmt->frame_clk_inv || daifmt->bit_clk_provider ||
+           daifmt->frame_clk_provider) {
                dev_err(dev, "%s: Bad flags %d %d %d %d\n", __func__,
                        daifmt->bit_clk_inv, daifmt->frame_clk_inv,
-                       daifmt->bit_clk_master,
-                       daifmt->frame_clk_master);
+                       daifmt->bit_clk_provider,
+                       daifmt->frame_clk_provider);
                return -EINVAL;
        }
 

diff --git a/include/sound/hdmi-codec.h b/include/sound/hdmi-codec.h
index 4fc733c8c570e3fa74fb17916996dbb64341283d..48ad33aba393bb49416a0f4a5089ab24a00f5056 100644 (file)
--- a/include/sound/hdmi-codec.h
+++ b/include/sound/hdmi-codec.h
@@ -32,8 +32,8 @@ struct hdmi_codec_daifmt {
        } fmt;
        unsigned int bit_clk_inv:1;
        unsigned int frame_clk_inv:1;
-       unsigned int bit_clk_master:1;
-       unsigned int frame_clk_master:1;
+       unsigned int bit_clk_provider:1;
+       unsigned int frame_clk_provider:1;
        /* bit_fmt could be standard PCM format or
         * IEC958 encoded format. ALSA IEC958 plugin will pass
         * IEC958_SUBFRAME format to the underneath driver.

diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c
index b773466619b235a931f318b09ffe2e29174631b1..7d1e351f863a4b7818ec68f1f06ae8c6d78337ab 100644 (file)
--- a/sound/soc/codecs/hdmi-codec.c
+++ b/sound/soc/codecs/hdmi-codec.c
@@ -606,18 +606,18 @@ static int hdmi_codec_i2s_set_fmt(struct snd_soc_dai *dai,
        /* Reset daifmt */
        memset(cf, 0, sizeof(*cf));
 
-       switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
-       case SND_SOC_DAIFMT_CBM_CFM:
-               cf->bit_clk_master = 1;
-               cf->frame_clk_master = 1;
+       switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
+       case SND_SOC_DAIFMT_CBP_CFP:
+               cf->bit_clk_provider = 1;
+               cf->frame_clk_provider = 1;
                break;
-       case SND_SOC_DAIFMT_CBS_CFM:
-               cf->frame_clk_master = 1;
+       case SND_SOC_DAIFMT_CBC_CFP:
+               cf->frame_clk_provider = 1;
                break;
-       case SND_SOC_DAIFMT_CBM_CFS:
-               cf->bit_clk_master = 1;
+       case SND_SOC_DAIFMT_CBP_CFC:
+               cf->bit_clk_provider = 1;
                break;
-       case SND_SOC_DAIFMT_CBS_CFS:
+       case SND_SOC_DAIFMT_CBC_CFC:
                break;
        default:
                return -EINVAL;