Update the rk3066a HDMI documents with a #sound-dai-cells property. Include the code for sound in the HDMI driver. Add a simple-sound-card compatible node to rk3066a.dtsi, because I2S0 and HDMI TX are connected internally. And as last enable rk3066a HDMI sound in the rk3066a-mk808.dts file.
make ARCH=arm CROSS_COMPILE=/usr/bin/arm-linux-gnueabi- -j4 cp ./arch/arm/boot/zImage ../zImage-dtb cat ./arch/arm/boot/dts/rk3066a-mk808.dtb >> ../zImage-dtb ../tools/rkcrc -k ../zImage-dtb ../mk808.img sudo ../tools/rkflashtool w 0x4000 0x8000 < ../mk808.img sudo ../tools/rkflashtool b
Changed v6: remove patches that are applied to linux-next add platform_device_unregister() restyle
Changed v5: removed unused variable fill frame structure
Johan Jonker (4): dt-bindings: display: add #sound-dai-cells property to rockchip rk3066 hdmi ARM: dts: rockchip: rk3066a: add #sound-dai-cells to hdmi node ARM: dts: rockchip: add hdmi-sound node to rk3066a.dtsi ARM: dts: rockchip: enable hdmi_sound and i2s0 for rk3066a-mk808
Zheng Yang (1): drm: rockchip: add sound support to rk3066 hdmi driver
.../display/rockchip/rockchip,rk3066-hdmi.yaml | 4 + arch/arm/boot/dts/rk3066a-mk808.dts | 8 + arch/arm/boot/dts/rk3066a.dtsi | 17 ++ drivers/gpu/drm/rockchip/Kconfig | 2 + drivers/gpu/drm/rockchip/rk3066_hdmi.c | 277 ++++++++++++++++++++- 5 files changed, 307 insertions(+), 1 deletion(-)
'#sound-dai-cells' is required to properly interpret the list of DAI specified in the 'sound-dai' property. Add it to rockchip,rk3066-hdmi.yaml to document that the rk3066 HDMI TX also can be used to transmit some audio.
Signed-off-by: Johan Jonker jbx6244@gmail.com --- .../devicetree/bindings/display/rockchip/rockchip,rk3066-hdmi.yaml | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/Documentation/devicetree/bindings/display/rockchip/rockchip,rk3066-hdmi.yaml b/Documentation/devicetree/bindings/display/rockchip/rockchip,rk3066-hdmi.yaml index 4110d003c..585a8d3b9 100644 --- a/Documentation/devicetree/bindings/display/rockchip/rockchip,rk3066-hdmi.yaml +++ b/Documentation/devicetree/bindings/display/rockchip/rockchip,rk3066-hdmi.yaml @@ -42,6 +42,9 @@ properties: description: This soc uses GRF regs to switch the HDMI TX input between vop0 and vop1.
+ "#sound-dai-cells": + const: 0 + ports: type: object
@@ -101,6 +104,7 @@ examples: pinctrl-names = "default"; power-domains = <&power RK3066_PD_VIO>; rockchip,grf = <&grf>; + #sound-dai-cells = <0>;
ports { #address-cells = <1>;
On Sun, 06 Dec 2020 14:33:51 +0100, Johan Jonker wrote:
'#sound-dai-cells' is required to properly interpret the list of DAI specified in the 'sound-dai' property. Add it to rockchip,rk3066-hdmi.yaml to document that the rk3066 HDMI TX also can be used to transmit some audio.
Signed-off-by: Johan Jonker jbx6244@gmail.com
.../devicetree/bindings/display/rockchip/rockchip,rk3066-hdmi.yaml | 4 ++++ 1 file changed, 4 insertions(+)
Reviewed-by: Rob Herring robh@kernel.org
From: Zheng Yang zhengyang@rock-chips.com
Add sound support to the rk3066 HDMI driver.
The I2S input of the HDMI TX allows transmission of DVD-Audio and decoded Dolby Digital to A/V Receivers and high-end displays. The interface supports 2 to 8 channels audio up to 192 kHz. The HDMI TX supports variable word length of 16bits to 32bits for I2S audio inputs.(This driver 24bit max) There are three I2S input modes supported.(This driver HDMI_I2S only) On RK3066/PX2 the HDMI TX audio source is connected to I2S_8CH.
Signed-off-by: Zheng Yang zhengyang@rock-chips.com Signed-off-by: Johan Jonker jbx6244@gmail.com --- drivers/gpu/drm/rockchip/Kconfig | 2 + drivers/gpu/drm/rockchip/rk3066_hdmi.c | 277 ++++++++++++++++++++++++++++++++- 2 files changed, 278 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig index 310aa1546..4c20445dc 100644 --- a/drivers/gpu/drm/rockchip/Kconfig +++ b/drivers/gpu/drm/rockchip/Kconfig @@ -11,6 +11,8 @@ config DRM_ROCKCHIP select DRM_DW_MIPI_DSI if ROCKCHIP_DW_MIPI_DSI select DRM_RGB if ROCKCHIP_RGB select SND_SOC_HDMI_CODEC if ROCKCHIP_CDN_DP && SND_SOC + select SND_SOC_HDMI_CODEC if ROCKCHIP_RK3066_HDMI && SND_SOC + select SND_SOC_ROCKCHIP_I2S if ROCKCHIP_RK3066_HDMI && SND_SOC help Choose this option if you have a Rockchip soc chipset. This driver provides kernel mode setting and buffer diff --git a/drivers/gpu/drm/rockchip/rk3066_hdmi.c b/drivers/gpu/drm/rockchip/rk3066_hdmi.c index 1c546c3a8..2f8654023 100644 --- a/drivers/gpu/drm/rockchip/rk3066_hdmi.c +++ b/drivers/gpu/drm/rockchip/rk3066_hdmi.c @@ -13,6 +13,8 @@ #include <linux/platform_device.h> #include <linux/regmap.h>
+#include <sound/hdmi-codec.h> + #include "rk3066_hdmi.h"
#include "rockchip_drm_drv.h" @@ -20,9 +22,16 @@
#define DEFAULT_PLLA_RATE 30000000
+struct audio_info { + int channels; + int sample_rate; + int sample_width; +}; + struct hdmi_data_info { int vic; /* The CEA Video ID (VIC) of the current drm display mode. */ bool sink_is_hdmi; + bool sink_has_audio; unsigned int enc_out_format; unsigned int colorimetry; }; @@ -54,12 +63,19 @@ struct rk3066_hdmi {
unsigned int tmdsclk;
+ struct platform_device *audio_pdev; + struct audio_info audio; + bool audio_enable; + struct hdmi_data_info hdmi_data; struct drm_display_mode previous_mode; };
#define to_rk3066_hdmi(x) container_of(x, struct rk3066_hdmi, x)
+static int +rk3066_hdmi_config_audio(struct rk3066_hdmi *hdmi, struct audio_info *audio); + static inline u8 hdmi_readb(struct rk3066_hdmi *hdmi, u16 offset) { return readl_relaxed(hdmi->regs + offset); @@ -205,6 +221,23 @@ static int rk3066_hdmi_config_avi(struct rk3066_hdmi *hdmi, HDMI_INFOFRAME_AVI, 0, 0, 0); }
+static int rk3066_hdmi_config_aai(struct rk3066_hdmi *hdmi, + struct audio_info *audio) +{ + union hdmi_infoframe frame; + int rc; + + rc = hdmi_audio_infoframe_init(&frame.audio); + + frame.audio.coding_type = HDMI_AUDIO_CODING_TYPE_STREAM; + frame.audio.sample_frequency = HDMI_AUDIO_SAMPLE_FREQUENCY_STREAM; + frame.audio.sample_size = HDMI_AUDIO_SAMPLE_SIZE_STREAM; + frame.audio.channels = hdmi->audio.channels; + + return rk3066_hdmi_upload_frame(hdmi, rc, &frame, + HDMI_INFOFRAME_AAI, 0, 0, 0); +} + static int rk3066_hdmi_config_video_timing(struct rk3066_hdmi *hdmi, struct drm_display_mode *mode) { @@ -353,6 +386,7 @@ static int rk3066_hdmi_setup(struct rk3066_hdmi *hdmi, hdmi_modb(hdmi, HDMI_HDCP_CTRL, HDMI_VIDEO_MODE_MASK, HDMI_VIDEO_MODE_HDMI); rk3066_hdmi_config_avi(hdmi, mode); + rk3066_hdmi_config_audio(hdmi, &hdmi->audio); } else { hdmi_modb(hdmi, HDMI_HDCP_CTRL, HDMI_VIDEO_MODE_MASK, 0); } @@ -369,9 +403,20 @@ static int rk3066_hdmi_setup(struct rk3066_hdmi *hdmi, */ rk3066_hdmi_i2c_init(hdmi);
- /* Unmute video output. */ + /* Unmute video and audio output. */ hdmi_modb(hdmi, HDMI_VIDEO_CTRL2, HDMI_VIDEO_AUDIO_DISABLE_MASK, HDMI_AUDIO_DISABLE); + if (hdmi->audio_enable) { + hdmi_modb(hdmi, HDMI_VIDEO_CTRL2, HDMI_AUDIO_DISABLE, 0); + /* Reset audio capture logic. */ + hdmi_modb(hdmi, HDMI_VIDEO_CTRL2, + HDMI_AUDIO_CP_LOGIC_RESET_MASK, + HDMI_AUDIO_CP_LOGIC_RESET); + usleep_range(900, 1000); + hdmi_modb(hdmi, HDMI_VIDEO_CTRL2, + HDMI_AUDIO_CP_LOGIC_RESET_MASK, 0); + } + return 0; }
@@ -473,9 +518,13 @@ static int rk3066_hdmi_connector_get_modes(struct drm_connector *connector) edid = drm_get_edid(connector, hdmi->ddc); if (edid) { hdmi->hdmi_data.sink_is_hdmi = drm_detect_hdmi_monitor(edid); + hdmi->hdmi_data.sink_has_audio = drm_detect_monitor_audio(edid); drm_connector_update_edid_property(connector, edid); ret = drm_add_edid_modes(connector, edid); kfree(edid); + } else { + hdmi->hdmi_data.sink_is_hdmi = true; + hdmi->hdmi_data.sink_has_audio = true; }
return ret; @@ -536,6 +585,228 @@ struct drm_connector_helper_funcs rk3066_hdmi_connector_helper_funcs = { };
static int +rk3066_hdmi_config_audio(struct rk3066_hdmi *hdmi, struct audio_info *audio) +{ + u32 rate, channel, word_length, N, CTS; + u64 tmp; + + if (audio->channels < 3) + channel = HDMI_AUDIO_I2S_CHANNEL_1_2; + else if (audio->channels < 5) + channel = HDMI_AUDIO_I2S_CHANNEL_3_4; + else if (audio->channels < 7) + channel = HDMI_AUDIO_I2S_CHANNEL_5_6; + else + channel = HDMI_AUDIO_I2S_CHANNEL_7_8; + + switch (audio->sample_rate) { + case 32000: + rate = HDMI_AUDIO_SAMPLE_FRE_32000; + N = N_32K; + break; + case 44100: + rate = HDMI_AUDIO_SAMPLE_FRE_44100; + N = N_441K; + break; + case 48000: + rate = HDMI_AUDIO_SAMPLE_FRE_48000; + N = N_48K; + break; + case 88200: + rate = HDMI_AUDIO_SAMPLE_FRE_88200; + N = N_882K; + break; + case 96000: + rate = HDMI_AUDIO_SAMPLE_FRE_96000; + N = N_96K; + break; + case 176400: + rate = HDMI_AUDIO_SAMPLE_FRE_176400; + N = N_1764K; + break; + case 192000: + rate = HDMI_AUDIO_SAMPLE_FRE_192000; + N = N_192K; + break; + default: + DRM_DEV_ERROR(hdmi->dev, "no support for sample rate %d\n", + audio->sample_rate); + return -ENOENT; + } + + switch (audio->sample_width) { + case 16: + word_length = 0x02; + break; + case 20: + word_length = 0x0a; + break; + case 24: + word_length = 0x0b; + break; + default: + DRM_DEV_ERROR(hdmi->dev, "no support for word length %d\n", + audio->sample_width); + return -ENOENT; + } + + tmp = (u64)hdmi->tmdsclk * N; + do_div(tmp, 128 * audio->sample_rate); + CTS = tmp; + + /* Set_audio source I2S. */ + hdmi_writeb(hdmi, HDMI_AUDIO_CTRL1, 0x00); + hdmi_writeb(hdmi, HDMI_AUDIO_CTRL2, 0x40); + hdmi_writeb(hdmi, HDMI_I2S_AUDIO_CTRL, + HDMI_AUDIO_I2S_FORMAT_STANDARD | channel); + hdmi_writeb(hdmi, HDMI_I2S_SWAP, 0x00); + hdmi_modb(hdmi, HDMI_AV_CTRL1, HDMI_AUDIO_SAMPLE_FRE_MASK, rate); + hdmi_writeb(hdmi, HDMI_AUDIO_SRC_NUM_AND_LENGTH, word_length); + + /* Set N value. */ + hdmi_modb(hdmi, HDMI_LR_SWAP_N3, + HDMI_AUDIO_N_19_16_MASK, (N >> 16) & 0x0F); + hdmi_writeb(hdmi, HDMI_N2, (N >> 8) & 0xFF); + hdmi_writeb(hdmi, HDMI_N1, N & 0xFF); + + /* Set CTS value. */ + hdmi_writeb(hdmi, HDMI_CTS_EXT1, CTS & 0xff); + hdmi_writeb(hdmi, HDMI_CTS_EXT2, (CTS >> 8) & 0xff); + hdmi_writeb(hdmi, HDMI_CTS_EXT3, (CTS >> 16) & 0xff); + + if (audio->channels > 2) + hdmi_modb(hdmi, HDMI_LR_SWAP_N3, + HDMI_AUDIO_LR_SWAP_MASK, + HDMI_AUDIO_LR_SWAP_SUBPACKET1); + rate = (~(rate >> 4)) & 0x0f; + hdmi_writeb(hdmi, HDMI_AUDIO_STA_BIT_CTRL1, rate); + hdmi_writeb(hdmi, HDMI_AUDIO_STA_BIT_CTRL2, 0); + + return rk3066_hdmi_config_aai(hdmi, audio); +} + +static int rk3066_hdmi_audio_hw_params(struct device *dev, void *d, + struct hdmi_codec_daifmt *daifmt, + struct hdmi_codec_params *params) +{ + struct rk3066_hdmi *hdmi = dev_get_drvdata(dev); + + if (!hdmi->hdmi_data.sink_has_audio) { + DRM_DEV_ERROR(hdmi->dev, "no audio support\n"); + return -ENODEV; + } + + if (!hdmi->encoder.crtc) + return -ENODEV; + + switch (daifmt->fmt) { + case HDMI_I2S: + break; + default: + DRM_DEV_ERROR(dev, "invalid format %d\n", daifmt->fmt); + return -EINVAL; + } + + hdmi->audio.channels = params->channels; + hdmi->audio.sample_rate = params->sample_rate; + hdmi->audio.sample_width = params->sample_width; + + return rk3066_hdmi_config_audio(hdmi, &hdmi->audio); +} + +static void rk3066_hdmi_audio_shutdown(struct device *dev, void *d) +{ + /* do nothing */ +} + +static int +rk3066_hdmi_audio_mute_stream(struct device *dev, void *d, + bool mute, int direction) +{ + struct rk3066_hdmi *hdmi = dev_get_drvdata(dev); + + if (!hdmi->hdmi_data.sink_has_audio) { + DRM_DEV_ERROR(hdmi->dev, "no audio support\n"); + return -ENODEV; + } + + hdmi->audio_enable = !mute; + + if (mute) + hdmi_modb(hdmi, HDMI_VIDEO_CTRL2, + HDMI_AUDIO_DISABLE, HDMI_AUDIO_DISABLE); + else + hdmi_modb(hdmi, HDMI_VIDEO_CTRL2, HDMI_AUDIO_DISABLE, 0); + + /* + * Under power mode E we need to reset the audio capture logic to + * make the audio setting update. + */ + if (rk3066_hdmi_get_power_mode(hdmi) == HDMI_SYS_POWER_MODE_E) { + hdmi_modb(hdmi, HDMI_VIDEO_CTRL2, + HDMI_AUDIO_CP_LOGIC_RESET_MASK, + HDMI_AUDIO_CP_LOGIC_RESET); + usleep_range(900, 1000); + hdmi_modb(hdmi, HDMI_VIDEO_CTRL2, + HDMI_AUDIO_CP_LOGIC_RESET_MASK, 0); + } + + return 0; +} + +static int rk3066_hdmi_audio_get_eld(struct device *dev, void *d, + u8 *buf, size_t len) +{ + struct rk3066_hdmi *hdmi = dev_get_drvdata(dev); + struct drm_mode_config *config = &hdmi->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 (&hdmi->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 = rk3066_hdmi_audio_hw_params, + .audio_shutdown = rk3066_hdmi_audio_shutdown, + .mute_stream = rk3066_hdmi_audio_mute_stream, + .get_eld = rk3066_hdmi_audio_get_eld, + .no_capture_mute = 1, +}; + +static int rk3066_hdmi_audio_codec_init(struct rk3066_hdmi *hdmi, + struct device *dev) +{ + struct hdmi_codec_pdata codec_data = { + .i2s = 1, + .ops = &audio_codec_ops, + .max_i2s_channels = 8, + }; + + hdmi->audio.channels = 2; + hdmi->audio.sample_rate = 48000; + hdmi->audio.sample_width = 16; + hdmi->audio_enable = false; + hdmi->audio_pdev = + platform_device_register_data(dev, + HDMI_CODEC_DRV_NAME, + PLATFORM_DEVID_NONE, + &codec_data, + sizeof(codec_data)); + + return PTR_ERR_OR_ZERO(hdmi->audio_pdev); +} + +static int rk3066_hdmi_register(struct drm_device *drm, struct rk3066_hdmi *hdmi) { struct drm_encoder *encoder = &hdmi->encoder; @@ -567,6 +838,8 @@ rk3066_hdmi_register(struct drm_device *drm, struct rk3066_hdmi *hdmi)
drm_connector_attach_encoder(&hdmi->connector, encoder);
+ rk3066_hdmi_audio_codec_init(hdmi, dev); + return 0; }
@@ -815,6 +1088,7 @@ static int rk3066_hdmi_bind(struct device *dev, struct device *master, return 0;
err_cleanup_hdmi: + platform_device_unregister(hdmi->audio_pdev); hdmi->connector.funcs->destroy(&hdmi->connector); hdmi->encoder.funcs->destroy(&hdmi->encoder); err_disable_i2c: @@ -830,6 +1104,7 @@ static void rk3066_hdmi_unbind(struct device *dev, struct device *master, { struct rk3066_hdmi *hdmi = dev_get_drvdata(dev);
+ platform_device_unregister(hdmi->audio_pdev); hdmi->connector.funcs->destroy(&hdmi->connector); hdmi->encoder.funcs->destroy(&hdmi->encoder);
ping
On 12/6/20 2:33 PM, Johan Jonker wrote:
From: Zheng Yang zhengyang@rock-chips.com
Add sound support to the rk3066 HDMI driver.
The I2S input of the HDMI TX allows transmission of DVD-Audio and decoded Dolby Digital to A/V Receivers and high-end displays. The interface supports 2 to 8 channels audio up to 192 kHz. The HDMI TX supports variable word length of 16bits to 32bits for I2S audio inputs.(This driver 24bit max) There are three I2S input modes supported.(This driver HDMI_I2S only) On RK3066/PX2 the HDMI TX audio source is connected to I2S_8CH.
Signed-off-by: Zheng Yang zhengyang@rock-chips.com Signed-off-by: Johan Jonker jbx6244@gmail.com
drivers/gpu/drm/rockchip/Kconfig | 2 + drivers/gpu/drm/rockchip/rk3066_hdmi.c | 277 ++++++++++++++++++++++++++++++++- 2 files changed, 278 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig index 310aa1546..4c20445dc 100644 --- a/drivers/gpu/drm/rockchip/Kconfig +++ b/drivers/gpu/drm/rockchip/Kconfig @@ -11,6 +11,8 @@ config DRM_ROCKCHIP select DRM_DW_MIPI_DSI if ROCKCHIP_DW_MIPI_DSI select DRM_RGB if ROCKCHIP_RGB select SND_SOC_HDMI_CODEC if ROCKCHIP_CDN_DP && SND_SOC
- select SND_SOC_HDMI_CODEC if ROCKCHIP_RK3066_HDMI && SND_SOC
- select SND_SOC_ROCKCHIP_I2S if ROCKCHIP_RK3066_HDMI && SND_SOC help Choose this option if you have a Rockchip soc chipset. This driver provides kernel mode setting and buffer
diff --git a/drivers/gpu/drm/rockchip/rk3066_hdmi.c b/drivers/gpu/drm/rockchip/rk3066_hdmi.c index 1c546c3a8..2f8654023 100644 --- a/drivers/gpu/drm/rockchip/rk3066_hdmi.c +++ b/drivers/gpu/drm/rockchip/rk3066_hdmi.c @@ -13,6 +13,8 @@ #include <linux/platform_device.h> #include <linux/regmap.h>
+#include <sound/hdmi-codec.h>
#include "rk3066_hdmi.h"
#include "rockchip_drm_drv.h" @@ -20,9 +22,16 @@
#define DEFAULT_PLLA_RATE 30000000
+struct audio_info {
- int channels;
- int sample_rate;
- int sample_width;
+};
struct hdmi_data_info { int vic; /* The CEA Video ID (VIC) of the current drm display mode. */ bool sink_is_hdmi;
- bool sink_has_audio; unsigned int enc_out_format; unsigned int colorimetry;
}; @@ -54,12 +63,19 @@ struct rk3066_hdmi {
unsigned int tmdsclk;
- struct platform_device *audio_pdev;
- struct audio_info audio;
- bool audio_enable;
- struct hdmi_data_info hdmi_data; struct drm_display_mode previous_mode;
};
#define to_rk3066_hdmi(x) container_of(x, struct rk3066_hdmi, x)
+static int +rk3066_hdmi_config_audio(struct rk3066_hdmi *hdmi, struct audio_info *audio);
static inline u8 hdmi_readb(struct rk3066_hdmi *hdmi, u16 offset) { return readl_relaxed(hdmi->regs + offset); @@ -205,6 +221,23 @@ static int rk3066_hdmi_config_avi(struct rk3066_hdmi *hdmi, HDMI_INFOFRAME_AVI, 0, 0, 0); }
+static int rk3066_hdmi_config_aai(struct rk3066_hdmi *hdmi,
struct audio_info *audio)+{
- union hdmi_infoframe frame;
- int rc;
- rc = hdmi_audio_infoframe_init(&frame.audio);
- frame.audio.coding_type = HDMI_AUDIO_CODING_TYPE_STREAM;
- frame.audio.sample_frequency = HDMI_AUDIO_SAMPLE_FREQUENCY_STREAM;
- frame.audio.sample_size = HDMI_AUDIO_SAMPLE_SIZE_STREAM;
- frame.audio.channels = hdmi->audio.channels;
- return rk3066_hdmi_upload_frame(hdmi, rc, &frame,
HDMI_INFOFRAME_AAI, 0, 0, 0);+}
static int rk3066_hdmi_config_video_timing(struct rk3066_hdmi *hdmi, struct drm_display_mode *mode) { @@ -353,6 +386,7 @@ static int rk3066_hdmi_setup(struct rk3066_hdmi *hdmi, hdmi_modb(hdmi, HDMI_HDCP_CTRL, HDMI_VIDEO_MODE_MASK, HDMI_VIDEO_MODE_HDMI); rk3066_hdmi_config_avi(hdmi, mode);
rk3066_hdmi_config_audio(hdmi, &hdmi->audio);@@ -369,9 +403,20 @@ static int rk3066_hdmi_setup(struct rk3066_hdmi *hdmi, */ rk3066_hdmi_i2c_init(hdmi);
- /* Unmute video output. */
- /* Unmute video and audio output. */ hdmi_modb(hdmi, HDMI_VIDEO_CTRL2, HDMI_VIDEO_AUDIO_DISABLE_MASK, HDMI_AUDIO_DISABLE);
- if (hdmi->audio_enable) {
hdmi_modb(hdmi, HDMI_VIDEO_CTRL2, HDMI_AUDIO_DISABLE, 0);/* Reset audio capture logic. */hdmi_modb(hdmi, HDMI_VIDEO_CTRL2,HDMI_AUDIO_CP_LOGIC_RESET_MASK,HDMI_AUDIO_CP_LOGIC_RESET);usleep_range(900, 1000);hdmi_modb(hdmi, HDMI_VIDEO_CTRL2,HDMI_AUDIO_CP_LOGIC_RESET_MASK, 0);- }
- return 0;
}
@@ -473,9 +518,13 @@ static int rk3066_hdmi_connector_get_modes(struct drm_connector *connector) edid = drm_get_edid(connector, hdmi->ddc); if (edid) { hdmi->hdmi_data.sink_is_hdmi = drm_detect_hdmi_monitor(edid);
hdmi->hdmi_data.sink_has_audio = drm_detect_monitor_audio(edid);drm_connector_update_edid_property(connector, edid); ret = drm_add_edid_modes(connector, edid); kfree(edid);
} else {
hdmi->hdmi_data.sink_is_hdmi = true;hdmi->hdmi_data.sink_has_audio = true;}
return ret;
@@ -536,6 +585,228 @@ struct drm_connector_helper_funcs rk3066_hdmi_connector_helper_funcs = { };
static int +rk3066_hdmi_config_audio(struct rk3066_hdmi *hdmi, struct audio_info *audio) +{
- u32 rate, channel, word_length, N, CTS;
- u64 tmp;
- if (audio->channels < 3)
channel = HDMI_AUDIO_I2S_CHANNEL_1_2;- else if (audio->channels < 5)
channel = HDMI_AUDIO_I2S_CHANNEL_3_4;- else if (audio->channels < 7)
channel = HDMI_AUDIO_I2S_CHANNEL_5_6;- else
channel = HDMI_AUDIO_I2S_CHANNEL_7_8;- switch (audio->sample_rate) {
- case 32000:
rate = HDMI_AUDIO_SAMPLE_FRE_32000;N = N_32K;break;- case 44100:
rate = HDMI_AUDIO_SAMPLE_FRE_44100;N = N_441K;break;- case 48000:
rate = HDMI_AUDIO_SAMPLE_FRE_48000;N = N_48K;break;- case 88200:
rate = HDMI_AUDIO_SAMPLE_FRE_88200;N = N_882K;break;- case 96000:
rate = HDMI_AUDIO_SAMPLE_FRE_96000;N = N_96K;break;- case 176400:
rate = HDMI_AUDIO_SAMPLE_FRE_176400;N = N_1764K;break;- case 192000:
rate = HDMI_AUDIO_SAMPLE_FRE_192000;N = N_192K;break;- default:
DRM_DEV_ERROR(hdmi->dev, "no support for sample rate %d\n",audio->sample_rate);return -ENOENT;- }
- switch (audio->sample_width) {
- case 16:
word_length = 0x02;break;- case 20:
word_length = 0x0a;break;- case 24:
word_length = 0x0b;break;- default:
DRM_DEV_ERROR(hdmi->dev, "no support for word length %d\n",audio->sample_width);return -ENOENT;- }
- tmp = (u64)hdmi->tmdsclk * N;
- do_div(tmp, 128 * audio->sample_rate);
- CTS = tmp;
- /* Set_audio source I2S. */
- hdmi_writeb(hdmi, HDMI_AUDIO_CTRL1, 0x00);
- hdmi_writeb(hdmi, HDMI_AUDIO_CTRL2, 0x40);
- hdmi_writeb(hdmi, HDMI_I2S_AUDIO_CTRL,
HDMI_AUDIO_I2S_FORMAT_STANDARD | channel);- hdmi_writeb(hdmi, HDMI_I2S_SWAP, 0x00);
- hdmi_modb(hdmi, HDMI_AV_CTRL1, HDMI_AUDIO_SAMPLE_FRE_MASK, rate);
- hdmi_writeb(hdmi, HDMI_AUDIO_SRC_NUM_AND_LENGTH, word_length);
- /* Set N value. */
- hdmi_modb(hdmi, HDMI_LR_SWAP_N3,
HDMI_AUDIO_N_19_16_MASK, (N >> 16) & 0x0F);- hdmi_writeb(hdmi, HDMI_N2, (N >> 8) & 0xFF);
- hdmi_writeb(hdmi, HDMI_N1, N & 0xFF);
- /* Set CTS value. */
- hdmi_writeb(hdmi, HDMI_CTS_EXT1, CTS & 0xff);
- hdmi_writeb(hdmi, HDMI_CTS_EXT2, (CTS >> 8) & 0xff);
- hdmi_writeb(hdmi, HDMI_CTS_EXT3, (CTS >> 16) & 0xff);
- if (audio->channels > 2)
hdmi_modb(hdmi, HDMI_LR_SWAP_N3,HDMI_AUDIO_LR_SWAP_MASK,HDMI_AUDIO_LR_SWAP_SUBPACKET1);- rate = (~(rate >> 4)) & 0x0f;
- hdmi_writeb(hdmi, HDMI_AUDIO_STA_BIT_CTRL1, rate);
- hdmi_writeb(hdmi, HDMI_AUDIO_STA_BIT_CTRL2, 0);
- return rk3066_hdmi_config_aai(hdmi, audio);
+}
+static int rk3066_hdmi_audio_hw_params(struct device *dev, void *d,
struct hdmi_codec_daifmt *daifmt,struct hdmi_codec_params *params)+{
- struct rk3066_hdmi *hdmi = dev_get_drvdata(dev);
- if (!hdmi->hdmi_data.sink_has_audio) {
DRM_DEV_ERROR(hdmi->dev, "no audio support\n");return -ENODEV;- }
- if (!hdmi->encoder.crtc)
return -ENODEV;- switch (daifmt->fmt) {
- case HDMI_I2S:
break;- default:
DRM_DEV_ERROR(dev, "invalid format %d\n", daifmt->fmt);return -EINVAL;- }
- hdmi->audio.channels = params->channels;
- hdmi->audio.sample_rate = params->sample_rate;
- hdmi->audio.sample_width = params->sample_width;
- return rk3066_hdmi_config_audio(hdmi, &hdmi->audio);
+}
+static void rk3066_hdmi_audio_shutdown(struct device *dev, void *d) +{
- /* do nothing */
+}
+static int +rk3066_hdmi_audio_mute_stream(struct device *dev, void *d,
bool mute, int direction)+{
- struct rk3066_hdmi *hdmi = dev_get_drvdata(dev);
- if (!hdmi->hdmi_data.sink_has_audio) {
DRM_DEV_ERROR(hdmi->dev, "no audio support\n");return -ENODEV;- }
- hdmi->audio_enable = !mute;
- if (mute)
hdmi_modb(hdmi, HDMI_VIDEO_CTRL2,HDMI_AUDIO_DISABLE, HDMI_AUDIO_DISABLE);- else
hdmi_modb(hdmi, HDMI_VIDEO_CTRL2, HDMI_AUDIO_DISABLE, 0);- /*
* Under power mode E we need to reset the audio capture logic to* make the audio setting update.*/- if (rk3066_hdmi_get_power_mode(hdmi) == HDMI_SYS_POWER_MODE_E) {
hdmi_modb(hdmi, HDMI_VIDEO_CTRL2,HDMI_AUDIO_CP_LOGIC_RESET_MASK,HDMI_AUDIO_CP_LOGIC_RESET);usleep_range(900, 1000);hdmi_modb(hdmi, HDMI_VIDEO_CTRL2,HDMI_AUDIO_CP_LOGIC_RESET_MASK, 0);- }
- return 0;
+}
+static int rk3066_hdmi_audio_get_eld(struct device *dev, void *d,
u8 *buf, size_t len)+{
- struct rk3066_hdmi *hdmi = dev_get_drvdata(dev);
- struct drm_mode_config *config = &hdmi->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 (&hdmi->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 = rk3066_hdmi_audio_hw_params,
- .audio_shutdown = rk3066_hdmi_audio_shutdown,
- .mute_stream = rk3066_hdmi_audio_mute_stream,
- .get_eld = rk3066_hdmi_audio_get_eld,
- .no_capture_mute = 1,
+};
+static int rk3066_hdmi_audio_codec_init(struct rk3066_hdmi *hdmi,
struct device *dev)+{
- struct hdmi_codec_pdata codec_data = {
.i2s = 1,.ops = &audio_codec_ops,.max_i2s_channels = 8,- };
- hdmi->audio.channels = 2;
- hdmi->audio.sample_rate = 48000;
- hdmi->audio.sample_width = 16;
- hdmi->audio_enable = false;
- hdmi->audio_pdev =
platform_device_register_data(dev,HDMI_CODEC_DRV_NAME,PLATFORM_DEVID_NONE,&codec_data,sizeof(codec_data));- return PTR_ERR_OR_ZERO(hdmi->audio_pdev);
+}
+static int rk3066_hdmi_register(struct drm_device *drm, struct rk3066_hdmi *hdmi) { struct drm_encoder *encoder = &hdmi->encoder; @@ -567,6 +838,8 @@ rk3066_hdmi_register(struct drm_device *drm, struct rk3066_hdmi *hdmi)
drm_connector_attach_encoder(&hdmi->connector, encoder);
- rk3066_hdmi_audio_codec_init(hdmi, dev);
- return 0;
}
@@ -815,6 +1088,7 @@ static int rk3066_hdmi_bind(struct device *dev, struct device *master, return 0;
err_cleanup_hdmi:
- platform_device_unregister(hdmi->audio_pdev); hdmi->connector.funcs->destroy(&hdmi->connector); hdmi->encoder.funcs->destroy(&hdmi->encoder);
err_disable_i2c: @@ -830,6 +1104,7 @@ static void rk3066_hdmi_unbind(struct device *dev, struct device *master, { struct rk3066_hdmi *hdmi = dev_get_drvdata(dev);
- platform_device_unregister(hdmi->audio_pdev); hdmi->connector.funcs->destroy(&hdmi->connector); hdmi->encoder.funcs->destroy(&hdmi->encoder);
'#sound-dai-cells' is required to properly interpret the list of DAI specified in the 'sound-dai' property, so add them to the 'hdmi' node for 'rk3066a.dtsi'.
Signed-off-by: Johan Jonker jbx6244@gmail.com --- arch/arm/boot/dts/rk3066a.dtsi | 1 + 1 file changed, 1 insertion(+)
diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi index 252750c97..67fcb0dc9 100644 --- a/arch/arm/boot/dts/rk3066a.dtsi +++ b/arch/arm/boot/dts/rk3066a.dtsi @@ -124,6 +124,7 @@ pinctrl-0 = <&hdmii2c_xfer>, <&hdmi_hpd>; power-domains = <&power RK3066_PD_VIO>; rockchip,grf = <&grf>; + #sound-dai-cells = <0>; status = "disabled";
ports {
Add hdmi-sound node to rk3066a.dtsi, so that it can be reused by boards with HDMI support.
Signed-off-by: Johan Jonker jbx6244@gmail.com --- arch/arm/boot/dts/rk3066a.dtsi | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi index 67fcb0dc9..f91ce3054 100644 --- a/arch/arm/boot/dts/rk3066a.dtsi +++ b/arch/arm/boot/dts/rk3066a.dtsi @@ -49,6 +49,22 @@ ports = <&vop0_out>, <&vop1_out>; };
+ hdmi_sound: hdmi-sound { + compatible = "simple-audio-card"; + simple-audio-card,name = "HDMI"; + simple-audio-card,format = "i2s"; + simple-audio-card,mclk-fs = <256>; + status = "disabled"; + + simple-audio-card,codec { + sound-dai = <&hdmi>; + }; + + simple-audio-card,cpu { + sound-dai = <&i2s0>; + }; + }; + sram: sram@10080000 { compatible = "mmio-sram"; reg = <0x10080000 0x10000>;
Make some noise with mk808. Enable the hdmi_sound node and add i2s0 as sound source for hdmi.
Signed-off-by: Johan Jonker jbx6244@gmail.com --- arch/arm/boot/dts/rk3066a-mk808.dts | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/arch/arm/boot/dts/rk3066a-mk808.dts b/arch/arm/boot/dts/rk3066a-mk808.dts index eed9e60cf..5fe74c097 100644 --- a/arch/arm/boot/dts/rk3066a-mk808.dts +++ b/arch/arm/boot/dts/rk3066a-mk808.dts @@ -116,6 +116,14 @@ }; };
+&hdmi_sound { + status = "okay"; +}; + +&i2s0 { + status = "okay"; +}; + &mmc0 { bus-width = <4>; cap-mmc-highspeed;
dri-devel@lists.freedesktop.org
-
Johan Jonker -
Rob Herring