From: Yakir Yang <ykk@rock-chips.com>
To: Liam Girdwood <lgirdwood@gmail.com>,
djkurtz@chromium.org, dianders@chromium.org,
linux-rockchip@lists.infradead.org
Cc: David Airlie <airlied@linux.ie>,
Philipp Zabel <p.zabel@pengutronix.de>,
Russell King <rmk+kernel@arm.linux.org.uk>,
Yakir Yang <ykk@rock-chips.com>,
Andy Yan <andy.yan@rock-chips.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Fabio Estevam <fabio.estevam@freescale.com>,
dri-devel@lists.freedesktop.org, Mark Brown <broonie@kernel.org>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.de>,
Lars-Peter Clausen <lars@metafoo.de>,
Brian Austin <brian.austin@cirrus.com>,
Bard Liao <bardliao@realtek.com>,
Oder Chiou <oder_chiou@realtek.com>,
Max Filippov <jcmvbkbc@gmail.com>, Axel Lin <axel.lin@ingics.com>,
Arnd Bergmann <arnd@arndb.de>, Jyri Sarha <jsarha@ti.com>,
Sean Cross <xobs@kosagi.com>, Ben Zhang <benzh@chromium.org>,
linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org,
mmind00@googlemail.com, marcheu@chromium.org,
mark.yao@rock-chips.com
Subject: [PATCH v4 12/15] drm: bridge/dw_hdmi: creat dw-hdmi-audio platform device
Date: Sat, 28 Feb 2015 21:57:09 -0500 [thread overview]
Message-ID: <1425178629-2588-1-git-send-email-ykk@rock-chips.com> (raw)
In-Reply-To: <1425175834-24661-1-git-send-email-ykk@rock-chips.com>
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 v4: None
Changes in v3:
- Remove audio_config & get_connect_status callback functions
and add write/read/mod register callback functions
Changes in v2:
- Update the audio control interfaces
drivers/gpu/drm/bridge/dw_hdmi.c | 29 +++++++++++++++++++++++++++++
include/drm/bridge/dw_hdmi.h | 15 +++++++++++++++
2 files changed, 44 insertions(+)
diff --git a/drivers/gpu/drm/bridge/dw_hdmi.c b/drivers/gpu/drm/bridge/dw_hdmi.c
index 54185e2..2ffd3e7 100644
--- a/drivers/gpu/drm/bridge/dw_hdmi.c
+++ b/drivers/gpu/drm/bridge/dw_hdmi.c
@@ -125,6 +125,8 @@ 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;
@@ -512,6 +514,12 @@ static void hdmi_clk_regenerator_update_pixel_clock(struct dw_hdmi *hdmi)
hdmi_set_clk_regenerator(hdmi, hdmi->hdmi_data.video_mode.mpixelclock);
}
+static void hdmi_set_sample_rate(struct dw_hdmi *hdmi, unsigned int sample_rate)
+{
+ hdmi->sample_rate = sample_rate;
+ hdmi_set_clk_regenerator(hdmi, hdmi->hdmi_data.video_mode.mpixelclock);
+}
+
/*
* this submodule is responsible for the video data synchronization.
* for example, for RGB 4:4:4 input, the data map is defined as
@@ -1801,6 +1809,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;
@@ -1920,6 +1930,25 @@ 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.mod = hdmi_modb;
+ audio.read = hdmi_readb;
+ audio.write = hdmi_writeb;
+ audio.enable = dw_hdmi_audio_enable;
+ audio.disable = dw_hdmi_audio_disable;
+ audio.set_sample_rate = hdmi_set_sample_rate;
+
+ 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:
diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h
index e8cfe1c..23ca491 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,
@@ -44,6 +46,19 @@ struct dw_hdmi_sym_term {
u16 term; /*transmission termination value*/
};
+struct dw_hdmi_audio_data {
+ int irq;
+ struct dw_hdmi *dw;
+
+ u8 (*read)(struct dw_hdmi *hdmi, int offset);
+ void (*write)(struct dw_hdmi *hdmi, u8 val, int offset);
+ void (*mod)(struct dw_hdmi *hdmi, u8 data, u8 mask, unsigned reg);
+
+ void (*enable)(struct dw_hdmi *hdmi);
+ void (*disable)(struct dw_hdmi *hdmi);
+ void (*set_sample_rate)(struct dw_hdmi *hdmi, unsigned int rate);
+};
+
struct dw_hdmi_plat_data {
enum dw_hdmi_devtype dev_type;
const struct dw_hdmi_mpll_config *mpll_cfg;
--
2.1.2
next prev parent reply other threads:[~2015-03-01 2:59 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-01 2:10 [PATCH v4 0/15] Those patches is used for dw_hdmi audio support Yakir Yang
2015-03-01 2:18 ` [PATCH v4 01/15] drm: bridge/dw_hdmi: add irq control to suspend/resume Yakir Yang
2015-03-01 2:28 ` [PATCH v4 02/15] drm: bridge/dw_hdmi: wrap irq control in fucntions Yakir Yang
2015-03-12 10:24 ` Philipp Zabel
2015-03-12 14:31 ` yakir
2015-03-12 14:41 ` Philipp Zabel
2015-03-01 2:32 ` [PATCH v4 03/15] drm: rockchip/dw_hdmi_rockchip: add resume/suspend support Yakir Yang
2015-03-12 10:24 ` Philipp Zabel
2015-03-12 14:32 ` yakir
2015-03-01 2:35 ` [PATCH v4 04/15] drm: bridge/dw_hdmi: add identification registers parse and record Yakir Yang
2015-03-12 10:29 ` Philipp Zabel
2015-03-01 2:38 ` [PATCH v4 05/15] drm: bridge/dw_hdmi: combine hdmi_set_clock_regenerator_n() and hdmi_regenerate_cts() Yakir Yang
2015-03-01 2:40 ` [PATCH v4 06/15] drm: bridge/dw_hdmi: adjust n/cts setting order Yakir Yang
2015-03-01 2:43 ` [PATCH v4 07/15] drm: bridge/dw_hdmi: set ncts_atomic_write & cts_manual Yakir Yang
2015-03-01 2:45 ` [PATCH v4 08/15] drm: bridge/dw_hdmi: add audio support for more display resolutions Yakir Yang
2015-03-01 2:47 ` [PATCH v4 09/15] drm: bridge/dw_hdmi: enable audio support for No-CEA " Yakir Yang
2015-03-01 2:49 ` [PATCH v4 10/15] drm: bridge/dw_hdmi: add audio sample channel status setting Yakir Yang
2015-03-01 2:52 ` [PATCH v4 11/15] drm: bridge/dw_hdmi: add enable/disable to dw_hdmi_audio callbacks Yakir Yang
2015-03-01 2:57 ` Yakir Yang [this message]
2015-03-01 2:59 ` [PATCH v4 13/15] ASoC: codec/dw-hdmi-audio: add codec driver for dw hdmi audio Yakir Yang
2015-03-02 9:15 ` Paul Bolle
2015-03-02 11:31 ` Yakir Yang
2015-03-26 18:11 ` Mark Brown
2015-03-01 3:04 ` [PATCH v4 14/15] ASoC: rockchip/rockchip-hdmi-audio: add sound driver for " Yakir Yang
2015-03-02 9:07 ` Paul Bolle
2015-03-02 11:32 ` Yakir Yang
2015-03-26 18:16 ` Mark Brown
2015-03-27 1:16 ` yakir
2015-03-27 1:19 ` Mark Brown
2015-03-01 3:07 ` [PATCH v4 15/15] dt-bindings: Add documentation for Rockchip dw-hdmi-audio Yakir Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1425178629-2588-1-git-send-email-ykk@rock-chips.com \
--to=ykk@rock-chips.com \
--cc=airlied@linux.ie \
--cc=alsa-devel@alsa-project.org \
--cc=andy.yan@rock-chips.com \
--cc=arnd@arndb.de \
--cc=axel.lin@ingics.com \
--cc=bardliao@realtek.com \
--cc=benzh@chromium.org \
--cc=brian.austin@cirrus.com \
--cc=broonie@kernel.org \
--cc=dianders@chromium.org \
--cc=djkurtz@chromium.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=fabio.estevam@freescale.com \
--cc=gregkh@linuxfoundation.org \
--cc=jcmvbkbc@gmail.com \
--cc=jsarha@ti.com \
--cc=lars@metafoo.de \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=marcheu@chromium.org \
--cc=mark.yao@rock-chips.com \
--cc=mmind00@googlemail.com \
--cc=oder_chiou@realtek.com \
--cc=p.zabel@pengutronix.de \
--cc=perex@perex.cz \
--cc=rmk+kernel@arm.linux.org.uk \
--cc=tiwai@suse.de \
--cc=xobs@kosagi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®