ASoC: hdmi-codec: callback function will be called with private data

Current hdmi-codec driver is assuming that it will be registered
from HDMI driver. Because of this assumption, each callback function
has struct device pointer which is parent device (= HDMI).
Then, it can use dev_get_drvdata() to get private data.

OTOH, on some SoC/HDMI case, SoC has VIDEO/SOUND and HDMI IPs.
This case, it needs SoC VIDEO, SoC SOUND and HDMI video, HDMI codec
driver. In DesignWare HDMI IP case, SoC VIDEO (= DRM/KMS) driver tries
to bind DesignWare HDMI video driver, and HDMI codec driver
(= hdmi-codec). This case, above "parent device" of HDMI codec driver
is DRM/KMS driver and its "device" already has private data.

And, from DT and ASoC CPU/Codec/Card binding point of view, HDMI codec
(= hdmi-codec) needs to have "parent device" (= DRM/KMS), otherwise,
it never detect sound card.

Because of these reasons, some driver can't use dev_get_drvdata() to
get private data on hdmi-codec driver. This patch add new void pointer
on hdmi_codec_pdata for private data, and callback function will be
called with it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

1 files changed, 8 insertions, 5 deletions

diff --git a/include/sound/hdmi-codec.h b/include/sound/hdmi-codec.h
index fc3a481ad91e..530c57bdefa0 100644
--- a/include/sound/hdmi-codec.h
+++ b/include/sound/hdmi-codec.h
@@ -53,18 +53,19 @@ struct hdmi_codec_params {
         int channels;
 };
 
+struct hdmi_codec_pdata;
 struct hdmi_codec_ops {
         /*
          * Called when ASoC starts an audio stream setup.
          * Optional
          */
-        int (*audio_startup)(struct device *dev);
+        int (*audio_startup)(struct device *dev, void *data);
 
         /*
          * Configures HDMI-encoder for audio stream.
          * Mandatory
          */
-        int (*hw_params)(struct device *dev,
+        int (*hw_params)(struct device *dev, void *data,
                          struct hdmi_codec_daifmt *fmt,
                          struct hdmi_codec_params *hparms);
 
@@ -72,19 +73,20 @@ struct hdmi_codec_ops {
          * Shuts down the audio stream.
          * Mandatory
          */
-        void (*audio_shutdown)(struct device *dev);
+        void (*audio_shutdown)(struct device *dev, void *data);
 
         /*
          * Mute/unmute HDMI audio stream.
          * Optional
          */
-        int (*digital_mute)(struct device *dev, bool enable);
+        int (*digital_mute)(struct device *dev, void *data, bool enable);
 
         /*
          * Provides EDID-Like-Data from connected HDMI device.
          * Optional
          */
-        int (*get_eld)(struct device *dev, uint8_t *buf, size_t len);
+        int (*get_eld)(struct device *dev, void *data,
+                       uint8_t *buf, size_t len);
 };
 
 /* HDMI codec initalization data */
@@ -93,6 +95,7 @@ struct hdmi_codec_pdata {
         uint i2s:1;
         uint spdif:1;
         int max_i2s_channels;
+        void *data;
 };
 
 #define HDMI_CODEC_DRV_NAME "hdmi-audio-codec"