mirror of
https://github.com/armbian/build
synced 2025-09-24 19:47:06 +07:00
150ac0c2af
AR-1 - Adding support category for distributions AR-4 - Remove Allwinner legacy AR-5 - Drop Udoo family and move Udoo board into newly created imx6 family AR-9 - Rename sunxi-next to sunxi-legacy AR-10 - Rename sunxi-dev to sunxi-current AR-11 - Adding Radxa Rockpi S support AR-13 - Rename rockchip64-default to rockchip64-legacy AR-14 - Add rockchip64-current as mainline source AR-15 - Drop Rockchip 4.19.y NEXT, current become 5.3.y AR-16 - Rename RK3399 default to legacy AR-17 - Rename Odroid XU4 next and default to legacy 4.14.y, add DEV 5.4.y AR-18 - Add Odroid N2 current mainline AR-19 - Move Odroid C1 to meson family AR-20 - Rename mvebu64-default to mvebu64-legacy AR-21 - Rename mvebu-default to mvebu-legacy AR-22 - Rename mvebu-next to mvebu-current AR-23 - Drop meson64 default and next, current becomes former DEV 5.3.y AR-24 - Drop cubox family and move Cubox/Hummingboard boards under imx6 AR-26 - Adjust motd AR-27 - Enabling distribution release status AR-28 - Added new GCC compilers AR-29 - Implementing Ubuntu Eoan AR-30 - Add desktop packages per board or family AR-31 - Remove (Ubuntu/Debian) distribution name from image filename AR-32 - Move arch configs from configuration.sh to separate arm64 and armhf config files AR-33 - Revision numbers for beta builds changed to day_in_the_year AR-34 - Patches support linked patches AR-35 - Break meson64 family into gxbb and gxl AR-36 - Add Nanopineo2 Black AR-38 - Upgrade option from old branches to new one via armbian-config AR-41 - Show full timezone info AR-43 - Merge Odroid N2 to meson64 AR-44 - Enable FORCE_BOOTSCRIPT_UPDATE for all builds
74 lines
2.7 KiB
Diff
74 lines
2.7 KiB
Diff
From 689875c6e561f0f658de3d9f0b965c0daae7dbab Mon Sep 17 00:00:00 2001
|
|
From: Jerome Brunet <jbrunet@baylibre.com>
|
|
Date: Mon, 5 Aug 2019 15:41:02 +0200
|
|
Subject: [PATCH 8/8] drm/bridge: dw-hdmi-i2s: add .get_eld support
|
|
|
|
Provide the eld to the generic hdmi-codec driver.
|
|
This will let the driver enforce the maximum channel number and set the
|
|
channel allocation depending on the hdmi sink.
|
|
|
|
Cc: Jonas Karlman <jonas@kwiboo.se>
|
|
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
|
|
Reviewed-by: Jonas Karlman <jonas@kwiboo.se>
|
|
---
|
|
drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h | 1 +
|
|
drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 10 ++++++++++
|
|
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 1 +
|
|
3 files changed, 12 insertions(+)
|
|
|
|
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h
|
|
index 63b5756f463b..cb07dc0da5a7 100644
|
|
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h
|
|
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h
|
|
@@ -14,6 +14,7 @@ struct dw_hdmi_audio_data {
|
|
|
|
struct dw_hdmi_i2s_audio_data {
|
|
struct dw_hdmi *hdmi;
|
|
+ u8 *eld;
|
|
|
|
void (*write)(struct dw_hdmi *hdmi, u8 val, int offset);
|
|
u8 (*read)(struct dw_hdmi *hdmi, int offset);
|
|
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c
|
|
index b8ece9c1ba2c..14d499b344c0 100644
|
|
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c
|
|
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c
|
|
@@ -121,6 +121,15 @@ static void dw_hdmi_i2s_audio_shutdown(struct device *dev, void *data)
|
|
dw_hdmi_audio_disable(hdmi);
|
|
}
|
|
|
|
+static int dw_hdmi_i2s_get_eld(struct device *dev, void *data, uint8_t *buf,
|
|
+ size_t len)
|
|
+{
|
|
+ struct dw_hdmi_i2s_audio_data *audio = data;
|
|
+
|
|
+ memcpy(buf, audio->eld, min(sizeof(audio->eld), len));
|
|
+ return 0;
|
|
+}
|
|
+
|
|
static int dw_hdmi_i2s_get_dai_id(struct snd_soc_component *component,
|
|
struct device_node *endpoint)
|
|
{
|
|
@@ -144,6 +153,7 @@ static int dw_hdmi_i2s_get_dai_id(struct snd_soc_component *component,
|
|
static struct hdmi_codec_ops dw_hdmi_i2s_ops = {
|
|
.hw_params = dw_hdmi_i2s_hw_params,
|
|
.audio_shutdown = dw_hdmi_i2s_audio_shutdown,
|
|
+ .get_eld = dw_hdmi_i2s_get_eld,
|
|
.get_dai_id = dw_hdmi_i2s_get_dai_id,
|
|
};
|
|
|
|
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
|
|
index 7c53068e0177..a81063a06014 100644
|
|
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
|
|
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
|
|
@@ -2782,6 +2782,7 @@ __dw_hdmi_probe(struct platform_device *pdev,
|
|
struct dw_hdmi_i2s_audio_data audio;
|
|
|
|
audio.hdmi = hdmi;
|
|
+ audio.eld = hdmi->connector.eld;
|
|
audio.write = hdmi_writeb;
|
|
audio.read = hdmi_readb;
|
|
hdmi->enable_audio = dw_hdmi_i2s_audio_enable;
|
|
--
|
|
2.20.1
|
|
|