lkml.org 
[lkml]   [2015]   [Jan]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v2 09/12] drm: bridge/dw_hdmi: creat dw-hdmi-audio platform device
Date
creat dw-hdmi-audio device dynamically in probe function,
and transfer some interfaces to dw-hdmi-audio driver for
setting hdmi audio format & control hdmi audio clock.

Signed-off-by: Yakir Yang <ykk@rock-chips.com>
---
Changes in v2:
- Update the audio control interfaces

drivers/gpu/drm/bridge/dw_hdmi.c | 23 +++++++++++++++++++++++
include/drm/bridge/dw_hdmi.h | 13 +++++++++++++
2 files changed, 36 insertions(+)

diff --git a/drivers/gpu/drm/bridge/dw_hdmi.c b/drivers/gpu/drm/bridge/dw_hdmi.c
index 25c1678..75e3029 100644
--- a/drivers/gpu/drm/bridge/dw_hdmi.c
+++ b/drivers/gpu/drm/bridge/dw_hdmi.c
@@ -107,6 +107,7 @@ struct dw_hdmi {
struct drm_encoder *encoder;
struct drm_bridge *bridge;

+ struct platform_device *audio_pdev;
enum dw_hdmi_devtype dev_type;
struct device *dev;
struct clk *isfr_clk;
@@ -1703,6 +1704,8 @@ int dw_hdmi_bind(struct device *dev, struct device *master,
struct resource *iores, int irq,
const struct dw_hdmi_plat_data *plat_data)
{
+ struct platform_device_info pdevinfo;
+ struct dw_hdmi_audio_data audio;
struct drm_device *drm = data;
struct device_node *np = dev->of_node;
struct device_node *ddc_node;
@@ -1824,6 +1827,23 @@ int dw_hdmi_bind(struct device *dev, struct device *master,

dev_set_drvdata(dev, hdmi);

+ memset(&pdevinfo, 0, sizeof(pdevinfo));
+ pdevinfo.parent = dev;
+ pdevinfo.id = PLATFORM_DEVID_NONE;
+
+ audio.irq = irq;
+ audio.dw = hdmi;
+ audio.config_audio = hdmi_config_audio;
+ audio.enable_clk = hdmi_audio_clk_enable;
+ audio.disable_clk = hdmi_audio_clk_disable;
+ audio.get_connect_status = hdmi_get_connect_status;
+
+ pdevinfo.name = "dw-hdmi-audio";
+ pdevinfo.data = &audio;
+ pdevinfo.size_data = sizeof(audio);
+ pdevinfo.dma_mask = DMA_BIT_MASK(32);
+ hdmi->audio_pdev = platform_device_register_full(&pdevinfo);
+
return 0;

err_iahb:
@@ -1839,6 +1859,9 @@ void dw_hdmi_unbind(struct device *dev, struct device *master, void *data)
{
struct dw_hdmi *hdmi = dev_get_drvdata(dev);

+ if (!IS_ERR(hdmi->audio_pdev))
+ platform_device_unregister(hdmi->audio_pdev);
+
/* Disable all interrupts */
hdmi_writeb(hdmi, ~0, HDMI_IH_MUTE_PHY_STAT0);

diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h
index aafa447..2f29112 100644
--- a/include/drm/bridge/dw_hdmi.h
+++ b/include/drm/bridge/dw_hdmi.h
@@ -12,6 +12,8 @@

#include <drm/drmP.h>

+struct dw_hdmi;
+
enum {
DW_HDMI_RES_8,
DW_HDMI_RES_10,
@@ -74,6 +76,17 @@ struct hdmi_audio_fmt {
enum hdmi_audio_wordlength word_length;
};

+struct dw_hdmi_audio_data {
+ struct dw_hdmi *dw;
+
+ int irq;
+ bool (*get_connect_status)(struct dw_hdmi *hdmi);
+
+ void (*enable_clk)(struct dw_hdmi *hdmi);
+ void (*disable_clk)(struct dw_hdmi *hdmi);
+ void (*config_audio)(struct dw_hdmi *hdmi, struct hdmi_audio_fmt *aud);
+};
+
struct dw_hdmi_plat_data {
enum dw_hdmi_devtype dev_type;
const struct dw_hdmi_mpll_config *mpll_cfg;
--
2.1.2



\
 
 \ /
  Last update: 2015-01-30 12:41    [W:0.186 / U:4.932 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site