mirror of
https://github.com/armbian/build.git
synced 2025-08-17 16:46:58 +02: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
80 lines
2.5 KiB
Diff
80 lines
2.5 KiB
Diff
From 6638fb281f435dcbb9ee62f519dd3889690fc7d7 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Brunet <jbrunet@baylibre.com>
|
|
Date: Mon, 5 Aug 2019 15:40:55 +0200
|
|
Subject: [PATCH 1/8] drm/bridge: dw-hdmi-i2s: support more i2s format
|
|
|
|
The dw-hdmi-i2s supports more formats than just regular i2s.
|
|
Add support for left justified, right justified and dsp modes
|
|
A and B.
|
|
|
|
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
|
|
---
|
|
.../drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 26 ++++++++++++++++---
|
|
drivers/gpu/drm/bridge/synopsys/dw-hdmi.h | 6 +++--
|
|
2 files changed, 27 insertions(+), 5 deletions(-)
|
|
|
|
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 5cbb71a866d5..2b624cff541d 100644
|
|
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c
|
|
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c
|
|
@@ -44,9 +44,8 @@ static int dw_hdmi_i2s_hw_params(struct device *dev, void *data,
|
|
u8 inputclkfs = 0;
|
|
|
|
/* it cares I2S only */
|
|
- if ((fmt->fmt != HDMI_I2S) ||
|
|
- (fmt->bit_clk_master | fmt->frame_clk_master)) {
|
|
- dev_err(dev, "unsupported format/settings\n");
|
|
+ if (fmt->bit_clk_master | fmt->frame_clk_master) {
|
|
+ dev_err(dev, "unsupported clock settings\n");
|
|
return -EINVAL;
|
|
}
|
|
|
|
@@ -63,6 +62,27 @@ static int dw_hdmi_i2s_hw_params(struct device *dev, void *data,
|
|
break;
|
|
}
|
|
|
|
+ switch (fmt->fmt) {
|
|
+ case HDMI_I2S:
|
|
+ conf1 |= HDMI_AUD_CONF1_MODE_I2S;
|
|
+ break;
|
|
+ case HDMI_RIGHT_J:
|
|
+ conf1 |= HDMI_AUD_CONF1_MODE_RIGHT_J;
|
|
+ break;
|
|
+ case HDMI_LEFT_J:
|
|
+ conf1 |= HDMI_AUD_CONF1_MODE_LEFT_J;
|
|
+ break;
|
|
+ case HDMI_DSP_A:
|
|
+ conf1 |= HDMI_AUD_CONF1_MODE_BURST_1;
|
|
+ break;
|
|
+ case HDMI_DSP_B:
|
|
+ conf1 |= HDMI_AUD_CONF1_MODE_BURST_2;
|
|
+ break;
|
|
+ default:
|
|
+ dev_err(dev, "unsupported format\n");
|
|
+ return -EINVAL;
|
|
+ }
|
|
+
|
|
dw_hdmi_set_sample_rate(hdmi, hparms->sample_rate);
|
|
|
|
hdmi_write(audio, inputclkfs, HDMI_AUD_INPUTCLKFS);
|
|
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h
|
|
index 4e3ec09d3ca4..091d7c28aa17 100644
|
|
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h
|
|
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h
|
|
@@ -869,8 +869,10 @@ enum {
|
|
|
|
/* AUD_CONF1 field values */
|
|
HDMI_AUD_CONF1_MODE_I2S = 0x00,
|
|
- HDMI_AUD_CONF1_MODE_RIGHT_J = 0x02,
|
|
- HDMI_AUD_CONF1_MODE_LEFT_J = 0x04,
|
|
+ HDMI_AUD_CONF1_MODE_RIGHT_J = 0x20,
|
|
+ HDMI_AUD_CONF1_MODE_LEFT_J = 0x40,
|
|
+ HDMI_AUD_CONF1_MODE_BURST_1 = 0x60,
|
|
+ HDMI_AUD_CONF1_MODE_BURST_2 = 0x80,
|
|
HDMI_AUD_CONF1_WIDTH_16 = 0x10,
|
|
HDMI_AUD_CONF1_WIDTH_24 = 0x18,
|
|
|
|
--
|
|
2.20.1
|
|
|