drm/i2c: tda998x: group audio functions together

Group the TDA998x audio functions together rather than split between
two different locations in the file, keeping like code together.

Tested-by: Jon Medhurst <tixy@linaro.org>
Acked-by: Jon Medhurst <tixy@linaro.org>
Tested-by: Jyri Sarha <jsarha@ti.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>

diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
index 44f3a4e..0f604d2 100644 (file)
--- a/drivers/gpu/drm/i2c/tda998x_drv.c
+++ b/drivers/gpu/drm/i2c/tda998x_drv.c
@@ -702,6 +702,8 @@ tda998x_write_avi(struct tda998x_priv *priv, struct drm_display_mode *mode)
        tda998x_write_if(priv, DIP_IF_FLAGS_IF2, REG_IF2_HB0, &frame);
 }
 
+/* Audio support */
+
 static void tda998x_audio_mute(struct tda998x_priv *priv, bool on)
 {
        if (on) {
@@ -820,6 +822,143 @@ tda998x_configure_audio(struct tda998x_priv *priv,
        return tda998x_write_aif(priv, &params->cea);
 }
 
+static int tda998x_audio_hw_params(struct device *dev, void *data,
+                                  struct hdmi_codec_daifmt *daifmt,
+                                  struct hdmi_codec_params *params)
+{
+       struct tda998x_priv *priv = dev_get_drvdata(dev);
+       int i, ret;
+       struct tda998x_audio_params audio = {
+               .sample_width = params->sample_width,
+               .sample_rate = params->sample_rate,
+               .cea = params->cea,
+       };
+
+       memcpy(audio.status, params->iec.status,
+              min(sizeof(audio.status), sizeof(params->iec.status)));
+
+       switch (daifmt->fmt) {
+       case HDMI_I2S:
+               if (daifmt->bit_clk_inv || daifmt->frame_clk_inv ||
+                   daifmt->bit_clk_master || daifmt->frame_clk_master) {
+                       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);
+                       return -EINVAL;
+               }
+               for (i = 0; i < ARRAY_SIZE(priv->audio_port); i++)
+                       if (priv->audio_port[i].format == AFMT_I2S)
+                               audio.config = priv->audio_port[i].config;
+               audio.format = AFMT_I2S;
+               break;
+       case HDMI_SPDIF:
+               for (i = 0; i < ARRAY_SIZE(priv->audio_port); i++)
+                       if (priv->audio_port[i].format == AFMT_SPDIF)
+                               audio.config = priv->audio_port[i].config;
+               audio.format = AFMT_SPDIF;
+               break;
+       default:
+               dev_err(dev, "%s: Invalid format %d\n", __func__, daifmt->fmt);
+               return -EINVAL;
+       }
+
+       if (audio.config == 0) {
+               dev_err(dev, "%s: No audio configutation found\n", __func__);
+               return -EINVAL;
+       }
+
+       mutex_lock(&priv->audio_mutex);
+       if (priv->supports_infoframes && priv->sink_has_audio)
+               ret = tda998x_configure_audio(priv, &audio);
+       else
+               ret = 0;
+
+       if (ret == 0)
+               priv->audio_params = audio;
+       mutex_unlock(&priv->audio_mutex);
+
+       return ret;
+}
+
+static void tda998x_audio_shutdown(struct device *dev, void *data)
+{
+       struct tda998x_priv *priv = dev_get_drvdata(dev);
+
+       mutex_lock(&priv->audio_mutex);
+
+       reg_write(priv, REG_ENA_AP, 0);
+
+       priv->audio_params.format = AFMT_UNUSED;
+
+       mutex_unlock(&priv->audio_mutex);
+}
+
+int tda998x_audio_digital_mute(struct device *dev, void *data, bool enable)
+{
+       struct tda998x_priv *priv = dev_get_drvdata(dev);
+
+       mutex_lock(&priv->audio_mutex);
+
+       tda998x_audio_mute(priv, enable);
+
+       mutex_unlock(&priv->audio_mutex);
+       return 0;
+}
+
+static int tda998x_audio_get_eld(struct device *dev, void *data,
+                                uint8_t *buf, size_t len)
+{
+       struct tda998x_priv *priv = dev_get_drvdata(dev);
+       struct drm_mode_config *config = &priv->encoder.dev->mode_config;
+       struct drm_connector *connector;
+       int ret = -ENODEV;
+
+       mutex_lock(&config->mutex);
+       list_for_each_entry(connector, &config->connector_list, head) {
+               if (&priv->encoder == connector->encoder) {
+                       memcpy(buf, connector->eld,
+                              min(sizeof(connector->eld), len));
+                       ret = 0;
+               }
+       }
+       mutex_unlock(&config->mutex);
+
+       return ret;
+}
+
+static const struct hdmi_codec_ops audio_codec_ops = {
+       .hw_params = tda998x_audio_hw_params,
+       .audio_shutdown = tda998x_audio_shutdown,
+       .digital_mute = tda998x_audio_digital_mute,
+       .get_eld = tda998x_audio_get_eld,
+};
+
+static int tda998x_audio_codec_init(struct tda998x_priv *priv,
+                                   struct device *dev)
+{
+       struct hdmi_codec_pdata codec_data = {
+               .ops = &audio_codec_ops,
+               .max_i2s_channels = 2,
+       };
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(priv->audio_port); i++) {
+               if (priv->audio_port[i].format == AFMT_I2S &&
+                   priv->audio_port[i].config != 0)
+                       codec_data.i2s = 1;
+               if (priv->audio_port[i].format == AFMT_SPDIF &&
+                   priv->audio_port[i].config != 0)
+                       codec_data.spdif = 1;
+       }
+
+       priv->audio_pdev = platform_device_register_data(
+               dev, HDMI_CODEC_DRV_NAME, PLATFORM_DEVID_AUTO,
+               &codec_data, sizeof(codec_data));
+
+       return PTR_ERR_OR_ZERO(priv->audio_pdev);
+}
+
 /* DRM connector functions */
 
 static int tda998x_connector_dpms(struct drm_connector *connector, int mode)
@@ -1284,143 +1423,6 @@ static void tda998x_destroy(struct tda998x_priv *priv)
        i2c_unregister_device(priv->cec);
 }
 
-static int tda998x_audio_hw_params(struct device *dev, void *data,
-                                  struct hdmi_codec_daifmt *daifmt,
-                                  struct hdmi_codec_params *params)
-{
-       struct tda998x_priv *priv = dev_get_drvdata(dev);
-       int i, ret;
-       struct tda998x_audio_params audio = {
-               .sample_width = params->sample_width,
-               .sample_rate = params->sample_rate,
-               .cea = params->cea,
-       };
-
-       memcpy(audio.status, params->iec.status,
-              min(sizeof(audio.status), sizeof(params->iec.status)));
-
-       switch (daifmt->fmt) {
-       case HDMI_I2S:
-               if (daifmt->bit_clk_inv || daifmt->frame_clk_inv ||
-                   daifmt->bit_clk_master || daifmt->frame_clk_master) {
-                       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);
-                       return -EINVAL;
-               }
-               for (i = 0; i < ARRAY_SIZE(priv->audio_port); i++)
-                       if (priv->audio_port[i].format == AFMT_I2S)
-                               audio.config = priv->audio_port[i].config;
-               audio.format = AFMT_I2S;
-               break;
-       case HDMI_SPDIF:
-               for (i = 0; i < ARRAY_SIZE(priv->audio_port); i++)
-                       if (priv->audio_port[i].format == AFMT_SPDIF)
-                               audio.config = priv->audio_port[i].config;
-               audio.format = AFMT_SPDIF;
-               break;
-       default:
-               dev_err(dev, "%s: Invalid format %d\n", __func__, daifmt->fmt);
-               return -EINVAL;
-       }
-
-       if (audio.config == 0) {
-               dev_err(dev, "%s: No audio configutation found\n", __func__);
-               return -EINVAL;
-       }
-
-       mutex_lock(&priv->audio_mutex);
-       if (priv->supports_infoframes && priv->sink_has_audio)
-               ret = tda998x_configure_audio(priv, &audio);
-       else
-               ret = 0;
-
-       if (ret == 0)
-               priv->audio_params = audio;
-       mutex_unlock(&priv->audio_mutex);
-
-       return ret;
-}
-
-static void tda998x_audio_shutdown(struct device *dev, void *data)
-{
-       struct tda998x_priv *priv = dev_get_drvdata(dev);
-
-       mutex_lock(&priv->audio_mutex);
-
-       reg_write(priv, REG_ENA_AP, 0);
-
-       priv->audio_params.format = AFMT_UNUSED;
-
-       mutex_unlock(&priv->audio_mutex);
-}
-
-int tda998x_audio_digital_mute(struct device *dev, void *data, bool enable)
-{
-       struct tda998x_priv *priv = dev_get_drvdata(dev);
-
-       mutex_lock(&priv->audio_mutex);
-
-       tda998x_audio_mute(priv, enable);
-
-       mutex_unlock(&priv->audio_mutex);
-       return 0;
-}
-
-static int tda998x_audio_get_eld(struct device *dev, void *data,
-                                uint8_t *buf, size_t len)
-{
-       struct tda998x_priv *priv = dev_get_drvdata(dev);
-       struct drm_mode_config *config = &priv->encoder.dev->mode_config;
-       struct drm_connector *connector;
-       int ret = -ENODEV;
-
-       mutex_lock(&config->mutex);
-       list_for_each_entry(connector, &config->connector_list, head) {
-               if (&priv->encoder == connector->encoder) {
-                       memcpy(buf, connector->eld,
-                              min(sizeof(connector->eld), len));
-                       ret = 0;
-               }
-       }
-       mutex_unlock(&config->mutex);
-
-       return ret;
-}
-
-static const struct hdmi_codec_ops audio_codec_ops = {
-       .hw_params = tda998x_audio_hw_params,
-       .audio_shutdown = tda998x_audio_shutdown,
-       .digital_mute = tda998x_audio_digital_mute,
-       .get_eld = tda998x_audio_get_eld,
-};
-
-static int tda998x_audio_codec_init(struct tda998x_priv *priv,
-                                   struct device *dev)
-{
-       struct hdmi_codec_pdata codec_data = {
-               .ops = &audio_codec_ops,
-               .max_i2s_channels = 2,
-       };
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(priv->audio_port); i++) {
-               if (priv->audio_port[i].format == AFMT_I2S &&
-                   priv->audio_port[i].config != 0)
-                       codec_data.i2s = 1;
-               if (priv->audio_port[i].format == AFMT_SPDIF &&
-                   priv->audio_port[i].config != 0)
-                       codec_data.spdif = 1;
-       }
-
-       priv->audio_pdev = platform_device_register_data(
-               dev, HDMI_CODEC_DRV_NAME, PLATFORM_DEVID_AUTO,
-               &codec_data, sizeof(codec_data));
-
-       return PTR_ERR_OR_ZERO(priv->audio_pdev);
-}
-
 /* I2C driver functions */
 
 static int tda998x_get_audio_ports(struct tda998x_priv *priv,