* [PATCH 0/3] drm: bridge: it66121: Add audio support
@ 2022-03-16 13:57 ` Nicolas Belin
0 siblings, 0 replies; 18+ messages in thread
From: Nicolas Belin @ 2022-03-16 13:57 UTC (permalink / raw)
To: narmstrong, andrzej.hajda, robert.foss
Cc: devicetree, dri-devel, linux-kernel, Laurent.pinchart, jonas,
jernej.skrabec, Nicolas Belin
This patch series adds the audio support on the it66121 HDMI bridge.
Patch 1 updates the ITE 66121 HDMI bridge bindings in order to support
audio.
Patch 2 sets the register page length or window length of the ITE 66121
HDMI bridge to 0x100 according to the documentation.
Patch 3 contains the actual driver modifications in order to add the
audio support on the ITE 66121 HDMI bridge.
Nicolas Belin (3):
dt-bindings: display: bridge: it66121: Add audio support
drm: bridge: it66121: Fix the register page length
drm: bridge: it66121: Add audio support
.../bindings/display/bridge/ite,it66121.yaml | 3 +
drivers/gpu/drm/bridge/ite-it66121.c | 629 +++++++++++++++++-
2 files changed, 631 insertions(+), 1 deletion(-)
--
2.25.1
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 0/3] drm: bridge: it66121: Add audio support
@ 2022-03-16 13:57 ` Nicolas Belin
0 siblings, 0 replies; 18+ messages in thread
From: Nicolas Belin @ 2022-03-16 13:57 UTC (permalink / raw)
To: narmstrong, andrzej.hajda, robert.foss
Cc: devicetree, jonas, linux-kernel, jernej.skrabec, dri-devel,
Nicolas Belin, Laurent.pinchart
This patch series adds the audio support on the it66121 HDMI bridge.
Patch 1 updates the ITE 66121 HDMI bridge bindings in order to support
audio.
Patch 2 sets the register page length or window length of the ITE 66121
HDMI bridge to 0x100 according to the documentation.
Patch 3 contains the actual driver modifications in order to add the
audio support on the ITE 66121 HDMI bridge.
Nicolas Belin (3):
dt-bindings: display: bridge: it66121: Add audio support
drm: bridge: it66121: Fix the register page length
drm: bridge: it66121: Add audio support
.../bindings/display/bridge/ite,it66121.yaml | 3 +
drivers/gpu/drm/bridge/ite-it66121.c | 629 +++++++++++++++++-
2 files changed, 631 insertions(+), 1 deletion(-)
--
2.25.1
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 1/3] dt-bindings: display: bridge: it66121: Add audio support
2022-03-16 13:57 ` Nicolas Belin
@ 2022-03-16 13:57 ` Nicolas Belin
-1 siblings, 0 replies; 18+ messages in thread
From: Nicolas Belin @ 2022-03-16 13:57 UTC (permalink / raw)
To: narmstrong, andrzej.hajda, robert.foss
Cc: devicetree, dri-devel, linux-kernel, Laurent.pinchart, jonas,
jernej.skrabec, Nicolas Belin
Update the ITE bridge HDMI it66121 bindings in order to
support audio.
Signed-off-by: Nicolas Belin <nbelin@baylibre.com>
---
.../devicetree/bindings/display/bridge/ite,it66121.yaml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Documentation/devicetree/bindings/display/bridge/ite,it66121.yaml b/Documentation/devicetree/bindings/display/bridge/ite,it66121.yaml
index 6ec1d5fbb8bc..c6e81f532215 100644
--- a/Documentation/devicetree/bindings/display/bridge/ite,it66121.yaml
+++ b/Documentation/devicetree/bindings/display/bridge/ite,it66121.yaml
@@ -38,6 +38,9 @@ properties:
interrupts:
maxItems: 1
+ "#sound-dai-cells":
+ const: 0
+
ports:
$ref: /schemas/graph.yaml#/properties/ports
--
2.25.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 1/3] dt-bindings: display: bridge: it66121: Add audio support
@ 2022-03-16 13:57 ` Nicolas Belin
0 siblings, 0 replies; 18+ messages in thread
From: Nicolas Belin @ 2022-03-16 13:57 UTC (permalink / raw)
To: narmstrong, andrzej.hajda, robert.foss
Cc: devicetree, jonas, linux-kernel, jernej.skrabec, dri-devel,
Nicolas Belin, Laurent.pinchart
Update the ITE bridge HDMI it66121 bindings in order to
support audio.
Signed-off-by: Nicolas Belin <nbelin@baylibre.com>
---
.../devicetree/bindings/display/bridge/ite,it66121.yaml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Documentation/devicetree/bindings/display/bridge/ite,it66121.yaml b/Documentation/devicetree/bindings/display/bridge/ite,it66121.yaml
index 6ec1d5fbb8bc..c6e81f532215 100644
--- a/Documentation/devicetree/bindings/display/bridge/ite,it66121.yaml
+++ b/Documentation/devicetree/bindings/display/bridge/ite,it66121.yaml
@@ -38,6 +38,9 @@ properties:
interrupts:
maxItems: 1
+ "#sound-dai-cells":
+ const: 0
+
ports:
$ref: /schemas/graph.yaml#/properties/ports
--
2.25.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 2/3] drm: bridge: it66121: Fix the register page length
2022-03-16 13:57 ` Nicolas Belin
@ 2022-03-16 13:57 ` Nicolas Belin
-1 siblings, 0 replies; 18+ messages in thread
From: Nicolas Belin @ 2022-03-16 13:57 UTC (permalink / raw)
To: narmstrong, andrzej.hajda, robert.foss
Cc: devicetree, dri-devel, linux-kernel, Laurent.pinchart, jonas,
jernej.skrabec, Nicolas Belin
Set the register page length or window length to
0x100 according to the documentation.
Fixes: 988156dc2fc9 ("drm: bridge: add it66121 driver")
Signed-off-by: Nicolas Belin <nbelin@baylibre.com>
---
drivers/gpu/drm/bridge/ite-it66121.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/bridge/ite-it66121.c b/drivers/gpu/drm/bridge/ite-it66121.c
index 06b59b422c69..64912b770086 100644
--- a/drivers/gpu/drm/bridge/ite-it66121.c
+++ b/drivers/gpu/drm/bridge/ite-it66121.c
@@ -227,7 +227,7 @@ static const struct regmap_range_cfg it66121_regmap_banks[] = {
.selector_mask = 0x1,
.selector_shift = 0,
.window_start = 0x00,
- .window_len = 0x130,
+ .window_len = 0x100,
},
};
--
2.25.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 2/3] drm: bridge: it66121: Fix the register page length
@ 2022-03-16 13:57 ` Nicolas Belin
0 siblings, 0 replies; 18+ messages in thread
From: Nicolas Belin @ 2022-03-16 13:57 UTC (permalink / raw)
To: narmstrong, andrzej.hajda, robert.foss
Cc: devicetree, jonas, linux-kernel, jernej.skrabec, dri-devel,
Nicolas Belin, Laurent.pinchart
Set the register page length or window length to
0x100 according to the documentation.
Fixes: 988156dc2fc9 ("drm: bridge: add it66121 driver")
Signed-off-by: Nicolas Belin <nbelin@baylibre.com>
---
drivers/gpu/drm/bridge/ite-it66121.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/bridge/ite-it66121.c b/drivers/gpu/drm/bridge/ite-it66121.c
index 06b59b422c69..64912b770086 100644
--- a/drivers/gpu/drm/bridge/ite-it66121.c
+++ b/drivers/gpu/drm/bridge/ite-it66121.c
@@ -227,7 +227,7 @@ static const struct regmap_range_cfg it66121_regmap_banks[] = {
.selector_mask = 0x1,
.selector_shift = 0,
.window_start = 0x00,
- .window_len = 0x130,
+ .window_len = 0x100,
},
};
--
2.25.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 3/3] drm: bridge: it66121: Add audio support
2022-03-16 13:57 ` Nicolas Belin
@ 2022-03-16 13:57 ` Nicolas Belin
-1 siblings, 0 replies; 18+ messages in thread
From: Nicolas Belin @ 2022-03-16 13:57 UTC (permalink / raw)
To: narmstrong, andrzej.hajda, robert.foss
Cc: devicetree, dri-devel, linux-kernel, Laurent.pinchart, jonas,
jernej.skrabec, Nicolas Belin, Andy . Hsieh
Adding the audio support on the HDMI bridge for I2S only.
Signed-off-by: Nicolas Belin <nbelin@baylibre.com>
Signed-off-by: Andy.Hsieh <Andy.Hsieh@mediatek.com>
---
drivers/gpu/drm/bridge/ite-it66121.c | 627 +++++++++++++++++++++++++++
1 file changed, 627 insertions(+)
diff --git a/drivers/gpu/drm/bridge/ite-it66121.c b/drivers/gpu/drm/bridge/ite-it66121.c
index 64912b770086..514989676d07 100644
--- a/drivers/gpu/drm/bridge/ite-it66121.c
+++ b/drivers/gpu/drm/bridge/ite-it66121.c
@@ -27,6 +27,8 @@
#include <drm/drm_print.h>
#include <drm/drm_probe_helper.h>
+#include <sound/hdmi-codec.h>
+
#define IT66121_VENDOR_ID0_REG 0x00
#define IT66121_VENDOR_ID1_REG 0x01
#define IT66121_DEVICE_ID0_REG 0x02
@@ -155,6 +157,9 @@
#define IT66121_AV_MUTE_ON BIT(0)
#define IT66121_AV_MUTE_BLUESCR BIT(1)
+#define IT66121_PKT_CTS_CTRL_REG 0xC5
+#define IT66121_PKT_CTS_CTRL_SEL BIT(1)
+
#define IT66121_PKT_GEN_CTRL_REG 0xC6
#define IT66121_PKT_GEN_CTRL_ON BIT(0)
#define IT66121_PKT_GEN_CTRL_RPT BIT(1)
@@ -202,6 +207,89 @@
#define IT66121_EDID_SLEEP_US 20000
#define IT66121_EDID_TIMEOUT_US 200000
#define IT66121_EDID_FIFO_SIZE 32
+
+#define IT66121_CLK_CTRL0_REG 0x58
+#define IT66121_CLK_CTRL0_AUTO_OVER_SAMPLING BIT(4)
+#define IT66121_CLK_CTRL0_EXT_MCLK_MASK GENMASK(3, 2)
+#define IT66121_CLK_CTRL0_EXT_MCLK_128FS (0 << 2)
+#define IT66121_CLK_CTRL0_EXT_MCLK_256FS BIT(2)
+#define IT66121_CLK_CTRL0_EXT_MCLK_512FS (2 << 2)
+#define IT66121_CLK_CTRL0_EXT_MCLK_1024FS (3 << 2)
+#define IT66121_CLK_CTRL0_AUTO_IPCLK BIT(0)
+#define IT66121_CLK_STATUS1_REG 0x5E
+#define IT66121_CLK_STATUS2_REG 0x5F
+
+#define IT66121_AUD_CTRL0_REG 0xE0
+#define IT66121_AUD_SWL (3 << 6)
+#define IT66121_AUD_16BIT (0 << 6)
+#define IT66121_AUD_18BIT BIT(6)
+#define IT66121_AUD_20BIT (2 << 6)
+#define IT66121_AUD_24BIT (3 << 6)
+#define IT66121_AUD_SPDIFTC BIT(5)
+#define IT66121_AUD_SPDIF BIT(4)
+#define IT66121_AUD_I2S (0 << 4)
+#define IT66121_AUD_EN_I2S3 BIT(3)
+#define IT66121_AUD_EN_I2S2 BIT(2)
+#define IT66121_AUD_EN_I2S1 BIT(1)
+#define IT66121_AUD_EN_I2S0 BIT(0)
+#define IT66121_AUD_CTRL0_AUD_SEL BIT(4)
+
+#define IT66121_AUD_CTRL1_REG 0xE1
+#define IT66121_AUD_FIFOMAP_REG 0xE2
+#define IT66121_AUD_CTRL3_REG 0xE3
+#define IT66121_AUD_SRCVALID_FLAT_REG 0xE4
+#define IT66121_AUD_FLAT_SRC0 BIT(4)
+#define IT66121_AUD_FLAT_SRC1 BIT(5)
+#define IT66121_AUD_FLAT_SRC2 BIT(6)
+#define IT66121_AUD_FLAT_SRC3 BIT(7)
+#define IT66121_AUD_HDAUDIO_REG 0xE5
+
+#define IT66121_AUD_PKT_CTS0_REG 0x130
+#define IT66121_AUD_PKT_CTS1_REG 0x131
+#define IT66121_AUD_PKT_CTS2_REG 0x132
+#define IT66121_AUD_PKT_N0_REG 0x133
+#define IT66121_AUD_PKT_N1_REG 0x134
+#define IT66121_AUD_PKT_N2_REG 0x135
+
+#define IT66121_AUD_CHST_MODE_REG 0x191
+#define IT66121_AUD_CHST_CAT_REG 0x192
+#define IT66121_AUD_CHST_SRCNUM_REG 0x193
+#define IT66121_AUD_CHST_CHTNUM_REG 0x194
+#define IT66121_AUD_CHST_CA_FS_REG 0x198
+#define IT66121_AUD_CHST_OFS_WL_REG 0x199
+
+#define IT66121_AUD_PKT_CTS_CNT0_REG 0x1A0
+#define IT66121_AUD_PKT_CTS_CNT1_REG 0x1A1
+#define IT66121_AUD_PKT_CTS_CNT2_REG 0x1A2
+
+#define IT66121_AUD_FS_22P05K 0x4
+#define IT66121_AUD_FS_44P1K 0x0
+#define IT66121_AUD_FS_88P2K 0x8
+#define IT66121_AUD_FS_176P4K 0xC
+#define IT66121_AUD_FS_24K 0x6
+#define IT66121_AUD_FS_48K 0x2
+#define IT66121_AUD_FS_96K 0xA
+#define IT66121_AUD_FS_192K 0xE
+#define IT66121_AUD_FS_768K 0x9
+#define IT66121_AUD_FS_32K 0x3
+#define IT66121_AUD_FS_OTHER 0x1
+
+#define IT66121_AUD_SWL_21BIT 0xD
+#define IT66121_AUD_SWL_24BIT 0xB
+#define IT66121_AUD_SWL_23BIT 0x9
+#define IT66121_AUD_SWL_22BIT 0x5
+#define IT66121_AUD_SWL_20BIT 0x3
+#define IT66121_AUD_SWL_17BIT 0xC
+#define IT66121_AUD_SWL_19BIT 0x8
+#define IT66121_AUD_SWL_18BIT 0x4
+#define IT66121_AUD_SWL_16BIT 0x2
+#define IT66121_AUD_SWL_NOT_INDICATED 0x0
+
+#define IT66121_VENDOR_ID0 0x54
+#define IT66121_VENDOR_ID1 0x49
+#define IT66121_DEVICE_ID0 0x12
+#define IT66121_DEVICE_ID1 0x06
+#define IT66121_DEVICE_MASK 0x0F
#define IT66121_AFE_CLK_HIGH 80000 /* Khz */
struct it66121_ctx {
@@ -216,6 +304,13 @@ struct it66121_ctx {
u32 bus_width;
struct mutex lock; /* Protects fields below and device registers */
struct hdmi_avi_infoframe hdmi_avi_infoframe;
+ struct {
+ struct platform_device *pdev;
+ u8 ch_enable;
+ u8 fs;
+ u8 swl;
+ bool auto_cts;
+ } audio;
};
static const struct regmap_range_cfg it66121_regmap_banks[] = {
@@ -886,6 +981,536 @@ static irqreturn_t it66121_irq_threaded_handler(int irq, void *dev_id)
return IRQ_HANDLED;
}
+static int it661221_set_chstat(struct it66121_ctx *ctx, u8 iec60958_chstat[])
+{
+ int ret;
+
+ ret = regmap_write(ctx->regmap, IT66121_AUD_CHST_MODE_REG, iec60958_chstat[0] & 0x7C);
+ if (ret)
+ return ret;
+
+ ret = regmap_write(ctx->regmap, IT66121_AUD_CHST_CAT_REG, iec60958_chstat[1]);
+ if (ret)
+ return ret;
+
+ ret = regmap_write(ctx->regmap, IT66121_AUD_CHST_SRCNUM_REG, iec60958_chstat[2] & 0x0F);
+ if (ret)
+ return ret;
+
+ ret = regmap_write(ctx->regmap, IT66121_AUD_CHST_CHTNUM_REG,
+ (iec60958_chstat[2] >> 4) & 0x0F);
+ if (ret)
+ return ret;
+
+ ret = regmap_write(ctx->regmap, IT66121_AUD_CHST_CA_FS_REG, iec60958_chstat[3]);
+ if (ret)
+ return ret;
+
+ return regmap_write(ctx->regmap, IT66121_AUD_CHST_OFS_WL_REG, iec60958_chstat[4]);
+}
+
+static int it661221_set_lpcm_audio(struct it66121_ctx *ctx, u8 audio_src_num, u8 audio_swl)
+{
+ int ret;
+ unsigned int audio_enable = 0;
+ unsigned int audio_format = 0;
+
+ switch (audio_swl) {
+ case 16:
+ audio_enable |= IT66121_AUD_16BIT;
+ break;
+ case 18:
+ audio_enable |= IT66121_AUD_18BIT;
+ break;
+ case 20:
+ audio_enable |= IT66121_AUD_20BIT;
+ break;
+ case 24:
+ default:
+ audio_enable |= IT66121_AUD_24BIT;
+ break;
+ }
+
+ audio_format |= 0x40;
+ switch (audio_src_num) {
+ case 4:
+ audio_enable |= IT66121_AUD_EN_I2S3 | IT66121_AUD_EN_I2S2 |
+ IT66121_AUD_EN_I2S1 | IT66121_AUD_EN_I2S0;
+ break;
+ case 3:
+ audio_enable |= IT66121_AUD_EN_I2S2 | IT66121_AUD_EN_I2S1 |
+ IT66121_AUD_EN_I2S0;
+ break;
+ case 2:
+ audio_enable |= IT66121_AUD_EN_I2S1 | IT66121_AUD_EN_I2S0;
+ break;
+ case 1:
+ default:
+ audio_format &= ~0x40;
+ audio_enable |= IT66121_AUD_EN_I2S0;
+ break;
+ }
+
+ audio_format |= 0x01;
+ ctx->audio.ch_enable = audio_enable;
+
+ ret = regmap_write(ctx->regmap, IT66121_AUD_CTRL0_REG, audio_enable & 0xF0);
+ if (ret)
+ return ret;
+
+ ret = regmap_write(ctx->regmap, IT66121_AUD_CTRL1_REG, audio_format);
+ if (ret)
+ return ret;
+
+ ret = regmap_write(ctx->regmap, IT66121_AUD_FIFOMAP_REG, 0xE4);
+ if (ret)
+ return ret;
+
+ ret = regmap_write(ctx->regmap, IT66121_AUD_CTRL3_REG, 0x00);
+ if (ret)
+ return ret;
+
+ ret = regmap_write(ctx->regmap, IT66121_AUD_SRCVALID_FLAT_REG, 0x00);
+ if (ret)
+ return ret;
+
+ return regmap_write(ctx->regmap, IT66121_AUD_HDAUDIO_REG, 0x00);
+}
+
+static int it661221_set_ncts(struct it66121_ctx *ctx, u8 fs)
+{
+ int ret;
+ unsigned int n;
+
+ switch (fs) {
+ case IT66121_AUD_FS_32K:
+ n = 4096;
+ break;
+ case IT66121_AUD_FS_44P1K:
+ n = 6272;
+ break;
+ case IT66121_AUD_FS_48K:
+ n = 6144;
+ break;
+ case IT66121_AUD_FS_88P2K:
+ n = 12544;
+ break;
+ case IT66121_AUD_FS_96K:
+ n = 12288;
+ break;
+ case IT66121_AUD_FS_176P4K:
+ n = 25088;
+ break;
+ case IT66121_AUD_FS_192K:
+ n = 24576;
+ break;
+ case IT66121_AUD_FS_768K:
+ n = 24576;
+ break;
+ default:
+ n = 6144;
+ break;
+ }
+
+ ret = regmap_write(ctx->regmap, IT66121_AUD_PKT_N0_REG, (u8)((n) & 0xFF));
+ if (ret)
+ return ret;
+
+ ret = regmap_write(ctx->regmap, IT66121_AUD_PKT_N1_REG, (u8)((n >> 8) & 0xFF));
+ if (ret)
+ return ret;
+
+ ret = regmap_write(ctx->regmap, IT66121_AUD_PKT_N2_REG, (u8)((n >> 16) & 0xF));
+ if (ret)
+ return ret;
+
+ if (ctx->audio.auto_cts) {
+ u8 loop_cnt = 255;
+ u8 cts_stable_cnt = 0;
+ unsigned int sum_cts = 0;
+ unsigned int cts = 0;
+ unsigned int last_cts = 0;
+ unsigned int diff;
+ unsigned int val;
+
+ while (loop_cnt--) {
+ msleep(30);
+ regmap_read(ctx->regmap, IT66121_AUD_PKT_CTS_CNT2_REG, &val);
+ cts = val << 12;
+ regmap_read(ctx->regmap, IT66121_AUD_PKT_CTS_CNT1_REG, &val);
+ cts |= val << 4;
+ regmap_read(ctx->regmap, IT66121_AUD_PKT_CTS_CNT0_REG, &val);
+ cts |= val >> 4;
+ if (cts == 0) {
+ continue;
+ } else {
+ if (last_cts > cts)
+ diff = last_cts - cts;
+ else
+ diff = cts - last_cts;
+ last_cts = cts;
+ if (diff < 5) {
+ cts_stable_cnt++;
+ sum_cts += cts;
+ } else {
+ cts_stable_cnt = 0;
+ sum_cts = 0;
+ continue;
+ }
+
+ if (cts_stable_cnt >= 32) {
+ last_cts = (sum_cts >> 5);
+ break;
+ }
+ }
+ }
+
+ regmap_write(ctx->regmap, IT66121_AUD_PKT_CTS0_REG, (u8)((last_cts) & 0xFF));
+ regmap_write(ctx->regmap, IT66121_AUD_PKT_CTS1_REG, (u8)((last_cts >> 8) & 0xFF));
+ regmap_write(ctx->regmap, IT66121_AUD_PKT_CTS2_REG, (u8)((last_cts >> 16) & 0x0F));
+ }
+
+ ret = regmap_write(ctx->regmap, 0xF8, 0xC3);
+ if (ret)
+ return ret;
+
+ ret = regmap_write(ctx->regmap, 0xF8, 0xA5);
+ if (ret)
+ return ret;
+
+ if (ctx->audio.auto_cts) {
+ ret = regmap_write_bits(ctx->regmap, IT66121_PKT_CTS_CTRL_REG,
+ IT66121_PKT_CTS_CTRL_SEL,
+ 1);
+ } else {
+ ret = regmap_write_bits(ctx->regmap, IT66121_PKT_CTS_CTRL_REG,
+ IT66121_PKT_CTS_CTRL_SEL,
+ 0);
+ }
+
+ if (ret)
+ return ret;
+
+ return regmap_write(ctx->regmap, 0xF8, 0xFF);
+}
+
+static int it661221_audio_output_enable(struct it66121_ctx *ctx, bool enable)
+{
+ int ret;
+
+ if (enable) {
+ ret = regmap_write_bits(ctx->regmap, IT66121_SW_RST_REG,
+ IT66121_SW_RST_AUD | IT66121_SW_RST_AREF,
+ 0);
+ if (ret)
+ return ret;
+
+ ret = regmap_write_bits(ctx->regmap, IT66121_AUD_CTRL0_REG,
+ IT66121_AUD_EN_I2S3 | IT66121_AUD_EN_I2S2 |
+ IT66121_AUD_EN_I2S1 | IT66121_AUD_EN_I2S0,
+ ctx->audio.ch_enable);
+ } else {
+ ret = regmap_write_bits(ctx->regmap, IT66121_AUD_CTRL0_REG,
+ IT66121_AUD_EN_I2S3 | IT66121_AUD_EN_I2S2 |
+ IT66121_AUD_EN_I2S1 | IT66121_AUD_EN_I2S0,
+ ctx->audio.ch_enable & 0xF0);
+ if (ret)
+ return ret;
+
+ ret = regmap_write_bits(ctx->regmap, IT66121_SW_RST_REG,
+ IT66121_SW_RST_AUD | IT66121_SW_RST_AREF,
+ IT66121_SW_RST_AUD | IT66121_SW_RST_AREF);
+ }
+
+ return ret;
+}
+
+static int it661221_audio_ch_enable(struct it66121_ctx *ctx, bool enable)
+{
+ int ret;
+
+ if (enable) {
+ ret = regmap_write(ctx->regmap, IT66121_AUD_SRCVALID_FLAT_REG, 0);
+ if (ret)
+ return ret;
+
+ ret = regmap_write(ctx->regmap, IT66121_AUD_CTRL0_REG, ctx->audio.ch_enable);
+ } else {
+ ret = regmap_write(ctx->regmap, IT66121_AUD_CTRL0_REG, ctx->audio.ch_enable & 0xF0);
+ }
+
+ return ret;
+}
+
+static int it66121_audio_hw_params(struct device *dev, void *data,
+ struct hdmi_codec_daifmt *daifmt,
+ struct hdmi_codec_params *params)
+{
+ u8 fs;
+ u8 swl;
+ int ret;
+ struct it66121_ctx *ctx = dev_get_drvdata(dev);
+ static u8 iec60958_chstat[5];
+ unsigned int channels = params->channels;
+ unsigned int sample_rate = params->sample_rate;
+ unsigned int sample_width = params->sample_width;
+
+ mutex_lock(&ctx->lock);
+ dev_dbg(dev, "%s: %u, %u, %u, %u\n", __func__,
+ daifmt->fmt, sample_rate, sample_width, channels);
+
+ switch (daifmt->fmt) {
+ case HDMI_I2S:
+ dev_dbg(dev, "Using HDMI I2S\n");
+ break;
+ default:
+ dev_err(dev, "Invalid or unsupported DAI format %d\n", daifmt->fmt);
+ ret = -EINVAL;
+ goto out;
+ }
+
+ // Set audio clock recovery (N/CTS)
+ ret = regmap_write(ctx->regmap, IT66121_CLK_CTRL0_REG,
+ IT66121_CLK_CTRL0_AUTO_OVER_SAMPLING |
+ IT66121_CLK_CTRL0_EXT_MCLK_256FS |
+ IT66121_CLK_CTRL0_AUTO_IPCLK);
+ if (ret)
+ goto out;
+
+ ret = regmap_write_bits(ctx->regmap, IT66121_AUD_CTRL0_REG,
+ IT66121_AUD_CTRL0_AUD_SEL, 0); // remove spdif selection
+ if (ret)
+ goto out;
+
+ switch (sample_rate) {
+ case 44100L:
+ fs = IT66121_AUD_FS_44P1K;
+ break;
+ case 88200L:
+ fs = IT66121_AUD_FS_88P2K;
+ break;
+ case 176400L:
+ fs = IT66121_AUD_FS_176P4K;
+ break;
+ case 32000L:
+ fs = IT66121_AUD_FS_32K;
+ break;
+ case 48000L:
+ fs = IT66121_AUD_FS_48K;
+ break;
+ case 96000L:
+ fs = IT66121_AUD_FS_96K;
+ break;
+ case 192000L:
+ fs = IT66121_AUD_FS_192K;
+ break;
+ case 768000L:
+ fs = IT66121_AUD_FS_768K;
+ break;
+ default:
+ fs = IT66121_AUD_FS_48K;
+ break;
+ }
+
+ ctx->audio.fs = fs;
+ ret = it661221_set_ncts(ctx, fs);
+ if (ret) {
+ dev_err(dev, "Failed to set N/CTS: %d\n", ret);
+ goto out;
+ }
+
+ // Set audio format register (except audio channel enable)
+ ret = it661221_set_lpcm_audio(ctx, (channels + 1) / 2, sample_width);
+ if (ret) {
+ dev_err(dev, "Failed to set LPCM audio: %d\n", ret);
+ goto out;
+ }
+
+ // Set audio channel status
+ iec60958_chstat[0] = 0;
+ if ((channels + 1) / 2 == 1)
+ iec60958_chstat[0] |= 0x1;
+ iec60958_chstat[0] &= ~(1 << 1);
+ iec60958_chstat[1] = 0;
+ iec60958_chstat[2] = (channels + 1) / 2;
+ iec60958_chstat[2] |= (channels << 4) & 0xF0;
+ iec60958_chstat[3] = fs;
+
+ switch (sample_width) {
+ case 21L:
+ swl = IT66121_AUD_SWL_21BIT;
+ break;
+ case 24L:
+ swl = IT66121_AUD_SWL_24BIT;
+ break;
+ case 23L:
+ swl = IT66121_AUD_SWL_23BIT;
+ break;
+ case 22L:
+ swl = IT66121_AUD_SWL_22BIT;
+ break;
+ case 20L:
+ swl = IT66121_AUD_SWL_20BIT;
+ break;
+ case 17L:
+ swl = IT66121_AUD_SWL_17BIT;
+ break;
+ case 19L:
+ swl = IT66121_AUD_SWL_19BIT;
+ break;
+ case 18L:
+ swl = IT66121_AUD_SWL_18BIT;
+ break;
+ case 16L:
+ swl = IT66121_AUD_SWL_16BIT;
+ break;
+ default:
+ swl = IT66121_AUD_SWL_NOT_INDICATED;
+ break;
+ }
+
+ iec60958_chstat[4] = (((~fs) << 4) & 0xF0) | swl;
+ ret = it661221_set_chstat(ctx, iec60958_chstat);
+ if (ret) {
+ dev_err(dev, "Failed to set channel status: %d\n", ret);
+ goto out;
+ }
+
+ // Enable audio channel enable while input clock stable (if SPDIF).
+ ret = it661221_audio_ch_enable(ctx, true);
+ if (ret) {
+ dev_err(dev, "Failed to enable audio channel: %d\n", ret);
+ goto out;
+ }
+
+ ret = regmap_write_bits(ctx->regmap, IT66121_INT_MASK1_REG,
+ IT66121_INT_MASK1_AUD_OVF,
+ 0);
+ if (ret)
+ goto out;
+
+ dev_dbg(dev, "HDMI audio enabled.\n");
+out:
+ mutex_unlock(&ctx->lock);
+
+ return ret;
+}
+
+static int it66121_audio_startup(struct device *dev, void *data)
+{
+ int ret;
+ struct it66121_ctx *ctx = dev_get_drvdata(dev);
+
+ dev_dbg(dev, "%s\n", __func__);
+
+ mutex_lock(&ctx->lock);
+ ret = it661221_audio_output_enable(ctx, true);
+ if (ret)
+ dev_err(dev, "Failed to enable audio output: %d\n", ret);
+
+ mutex_unlock(&ctx->lock);
+
+ return ret;
+}
+
+static void it66121_audio_shutdown(struct device *dev, void *data)
+{
+ int ret;
+ struct it66121_ctx *ctx = dev_get_drvdata(dev);
+
+ dev_dbg(dev, "%s\n", __func__);
+
+ mutex_lock(&ctx->lock);
+ ret = it661221_audio_output_enable(ctx, false);
+ if (ret)
+ dev_err(dev, "Failed to disable audio output: %d\n", ret);
+
+ mutex_unlock(&ctx->lock);
+}
+
+static int it66121_audio_mute(struct device *dev, void *data,
+ bool enable, int direction)
+{
+ int ret;
+ struct it66121_ctx *ctx = dev_get_drvdata(dev);
+
+ dev_dbg(dev, "%s: enable=%s, direction=%d\n",
+ __func__, enable ? "true" : "false", direction);
+
+ mutex_lock(&ctx->lock);
+
+ if (enable) {
+ ret = regmap_write_bits(ctx->regmap, IT66121_AUD_SRCVALID_FLAT_REG,
+ IT66121_AUD_FLAT_SRC0 | IT66121_AUD_FLAT_SRC1 |
+ IT66121_AUD_FLAT_SRC2 | IT66121_AUD_FLAT_SRC3,
+ IT66121_AUD_FLAT_SRC0 | IT66121_AUD_FLAT_SRC1 |
+ IT66121_AUD_FLAT_SRC2 | IT66121_AUD_FLAT_SRC3);
+ } else {
+ ret = regmap_write_bits(ctx->regmap, IT66121_AUD_SRCVALID_FLAT_REG,
+ IT66121_AUD_FLAT_SRC0 | IT66121_AUD_FLAT_SRC1 |
+ IT66121_AUD_FLAT_SRC2 | IT66121_AUD_FLAT_SRC3,
+ 0);
+ }
+
+ mutex_unlock(&ctx->lock);
+
+ return ret;
+}
+
+static int it66121_audio_get_eld(struct device *dev, void *data,
+ u8 *buf, size_t len)
+{
+ struct it66121_ctx *ctx = dev_get_drvdata(dev);
+
+ mutex_lock(&ctx->lock);
+
+ memcpy(buf, ctx->connector->eld,
+ min(sizeof(ctx->connector->eld), len));
+
+ mutex_unlock(&ctx->lock);
+
+ return 0;
+}
+
+static const struct hdmi_codec_ops it66121_audio_codec_ops = {
+ .hw_params = it66121_audio_hw_params,
+ .audio_startup = it66121_audio_startup,
+ .audio_shutdown = it66121_audio_shutdown,
+ .mute_stream = it66121_audio_mute,
+ .get_eld = it66121_audio_get_eld,
+ .no_capture_mute = 1,
+};
+
+static int it66121_audio_codec_init(struct it66121_ctx *ctx, struct device *dev)
+{
+ struct hdmi_codec_pdata codec_data = {
+ .ops = &it66121_audio_codec_ops,
+ .i2s = 1, /* Only i2s support for now */
+ .spdif = 0,
+ .max_i2s_channels = 8,
+ };
+
+ dev_dbg(dev, "%s\n", __func__);
+
+ if (!of_property_read_bool(dev->of_node, "#sound-dai-cells")) {
+ dev_info(dev, "No \"#sound-dai-cells\", no audio\n");
+ return 0;
+ }
+
+ ctx->audio.pdev = platform_device_register_data(dev,
+ HDMI_CODEC_DRV_NAME,
+ PLATFORM_DEVID_AUTO,
+ &codec_data,
+ sizeof(codec_data));
+
+ if (IS_ERR(ctx->audio.pdev)) {
+ dev_err(dev, "Failed to initialize HDMI audio codec: %d\n",
+ PTR_ERR_OR_ZERO(ctx->audio.pdev));
+ }
+
+ return PTR_ERR_OR_ZERO(ctx->audio.pdev);
+}
+
static int it66121_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
@@ -991,6 +1616,8 @@ static int it66121_probe(struct i2c_client *client,
return ret;
}
+ it66121_audio_codec_init(ctx, dev);
+
drm_bridge_add(&ctx->bridge);
dev_info(ctx->dev, "IT66121 revision %d probed\n", revision_id);
--
2.25.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 3/3] drm: bridge: it66121: Add audio support
@ 2022-03-16 13:57 ` Nicolas Belin
0 siblings, 0 replies; 18+ messages in thread
From: Nicolas Belin @ 2022-03-16 13:57 UTC (permalink / raw)
To: narmstrong, andrzej.hajda, robert.foss
Cc: devicetree, jonas, Andy . Hsieh, linux-kernel, jernej.skrabec,
dri-devel, Nicolas Belin, Laurent.pinchart
Adding the audio support on the HDMI bridge for I2S only.
Signed-off-by: Nicolas Belin <nbelin@baylibre.com>
Signed-off-by: Andy.Hsieh <Andy.Hsieh@mediatek.com>
---
drivers/gpu/drm/bridge/ite-it66121.c | 627 +++++++++++++++++++++++++++
1 file changed, 627 insertions(+)
diff --git a/drivers/gpu/drm/bridge/ite-it66121.c b/drivers/gpu/drm/bridge/ite-it66121.c
index 64912b770086..514989676d07 100644
--- a/drivers/gpu/drm/bridge/ite-it66121.c
+++ b/drivers/gpu/drm/bridge/ite-it66121.c
@@ -27,6 +27,8 @@
#include <drm/drm_print.h>
#include <drm/drm_probe_helper.h>
+#include <sound/hdmi-codec.h>
+
#define IT66121_VENDOR_ID0_REG 0x00
#define IT66121_VENDOR_ID1_REG 0x01
#define IT66121_DEVICE_ID0_REG 0x02
@@ -155,6 +157,9 @@
#define IT66121_AV_MUTE_ON BIT(0)
#define IT66121_AV_MUTE_BLUESCR BIT(1)
+#define IT66121_PKT_CTS_CTRL_REG 0xC5
+#define IT66121_PKT_CTS_CTRL_SEL BIT(1)
+
#define IT66121_PKT_GEN_CTRL_REG 0xC6
#define IT66121_PKT_GEN_CTRL_ON BIT(0)
#define IT66121_PKT_GEN_CTRL_RPT BIT(1)
@@ -202,6 +207,89 @@
#define IT66121_EDID_SLEEP_US 20000
#define IT66121_EDID_TIMEOUT_US 200000
#define IT66121_EDID_FIFO_SIZE 32
+
+#define IT66121_CLK_CTRL0_REG 0x58
+#define IT66121_CLK_CTRL0_AUTO_OVER_SAMPLING BIT(4)
+#define IT66121_CLK_CTRL0_EXT_MCLK_MASK GENMASK(3, 2)
+#define IT66121_CLK_CTRL0_EXT_MCLK_128FS (0 << 2)
+#define IT66121_CLK_CTRL0_EXT_MCLK_256FS BIT(2)
+#define IT66121_CLK_CTRL0_EXT_MCLK_512FS (2 << 2)
+#define IT66121_CLK_CTRL0_EXT_MCLK_1024FS (3 << 2)
+#define IT66121_CLK_CTRL0_AUTO_IPCLK BIT(0)
+#define IT66121_CLK_STATUS1_REG 0x5E
+#define IT66121_CLK_STATUS2_REG 0x5F
+
+#define IT66121_AUD_CTRL0_REG 0xE0
+#define IT66121_AUD_SWL (3 << 6)
+#define IT66121_AUD_16BIT (0 << 6)
+#define IT66121_AUD_18BIT BIT(6)
+#define IT66121_AUD_20BIT (2 << 6)
+#define IT66121_AUD_24BIT (3 << 6)
+#define IT66121_AUD_SPDIFTC BIT(5)
+#define IT66121_AUD_SPDIF BIT(4)
+#define IT66121_AUD_I2S (0 << 4)
+#define IT66121_AUD_EN_I2S3 BIT(3)
+#define IT66121_AUD_EN_I2S2 BIT(2)
+#define IT66121_AUD_EN_I2S1 BIT(1)
+#define IT66121_AUD_EN_I2S0 BIT(0)
+#define IT66121_AUD_CTRL0_AUD_SEL BIT(4)
+
+#define IT66121_AUD_CTRL1_REG 0xE1
+#define IT66121_AUD_FIFOMAP_REG 0xE2
+#define IT66121_AUD_CTRL3_REG 0xE3
+#define IT66121_AUD_SRCVALID_FLAT_REG 0xE4
+#define IT66121_AUD_FLAT_SRC0 BIT(4)
+#define IT66121_AUD_FLAT_SRC1 BIT(5)
+#define IT66121_AUD_FLAT_SRC2 BIT(6)
+#define IT66121_AUD_FLAT_SRC3 BIT(7)
+#define IT66121_AUD_HDAUDIO_REG 0xE5
+
+#define IT66121_AUD_PKT_CTS0_REG 0x130
+#define IT66121_AUD_PKT_CTS1_REG 0x131
+#define IT66121_AUD_PKT_CTS2_REG 0x132
+#define IT66121_AUD_PKT_N0_REG 0x133
+#define IT66121_AUD_PKT_N1_REG 0x134
+#define IT66121_AUD_PKT_N2_REG 0x135
+
+#define IT66121_AUD_CHST_MODE_REG 0x191
+#define IT66121_AUD_CHST_CAT_REG 0x192
+#define IT66121_AUD_CHST_SRCNUM_REG 0x193
+#define IT66121_AUD_CHST_CHTNUM_REG 0x194
+#define IT66121_AUD_CHST_CA_FS_REG 0x198
+#define IT66121_AUD_CHST_OFS_WL_REG 0x199
+
+#define IT66121_AUD_PKT_CTS_CNT0_REG 0x1A0
+#define IT66121_AUD_PKT_CTS_CNT1_REG 0x1A1
+#define IT66121_AUD_PKT_CTS_CNT2_REG 0x1A2
+
+#define IT66121_AUD_FS_22P05K 0x4
+#define IT66121_AUD_FS_44P1K 0x0
+#define IT66121_AUD_FS_88P2K 0x8
+#define IT66121_AUD_FS_176P4K 0xC
+#define IT66121_AUD_FS_24K 0x6
+#define IT66121_AUD_FS_48K 0x2
+#define IT66121_AUD_FS_96K 0xA
+#define IT66121_AUD_FS_192K 0xE
+#define IT66121_AUD_FS_768K 0x9
+#define IT66121_AUD_FS_32K 0x3
+#define IT66121_AUD_FS_OTHER 0x1
+
+#define IT66121_AUD_SWL_21BIT 0xD
+#define IT66121_AUD_SWL_24BIT 0xB
+#define IT66121_AUD_SWL_23BIT 0x9
+#define IT66121_AUD_SWL_22BIT 0x5
+#define IT66121_AUD_SWL_20BIT 0x3
+#define IT66121_AUD_SWL_17BIT 0xC
+#define IT66121_AUD_SWL_19BIT 0x8
+#define IT66121_AUD_SWL_18BIT 0x4
+#define IT66121_AUD_SWL_16BIT 0x2
+#define IT66121_AUD_SWL_NOT_INDICATED 0x0
+
+#define IT66121_VENDOR_ID0 0x54
+#define IT66121_VENDOR_ID1 0x49
+#define IT66121_DEVICE_ID0 0x12
+#define IT66121_DEVICE_ID1 0x06
+#define IT66121_DEVICE_MASK 0x0F
#define IT66121_AFE_CLK_HIGH 80000 /* Khz */
struct it66121_ctx {
@@ -216,6 +304,13 @@ struct it66121_ctx {
u32 bus_width;
struct mutex lock; /* Protects fields below and device registers */
struct hdmi_avi_infoframe hdmi_avi_infoframe;
+ struct {
+ struct platform_device *pdev;
+ u8 ch_enable;
+ u8 fs;
+ u8 swl;
+ bool auto_cts;
+ } audio;
};
static const struct regmap_range_cfg it66121_regmap_banks[] = {
@@ -886,6 +981,536 @@ static irqreturn_t it66121_irq_threaded_handler(int irq, void *dev_id)
return IRQ_HANDLED;
}
+static int it661221_set_chstat(struct it66121_ctx *ctx, u8 iec60958_chstat[])
+{
+ int ret;
+
+ ret = regmap_write(ctx->regmap, IT66121_AUD_CHST_MODE_REG, iec60958_chstat[0] & 0x7C);
+ if (ret)
+ return ret;
+
+ ret = regmap_write(ctx->regmap, IT66121_AUD_CHST_CAT_REG, iec60958_chstat[1]);
+ if (ret)
+ return ret;
+
+ ret = regmap_write(ctx->regmap, IT66121_AUD_CHST_SRCNUM_REG, iec60958_chstat[2] & 0x0F);
+ if (ret)
+ return ret;
+
+ ret = regmap_write(ctx->regmap, IT66121_AUD_CHST_CHTNUM_REG,
+ (iec60958_chstat[2] >> 4) & 0x0F);
+ if (ret)
+ return ret;
+
+ ret = regmap_write(ctx->regmap, IT66121_AUD_CHST_CA_FS_REG, iec60958_chstat[3]);
+ if (ret)
+ return ret;
+
+ return regmap_write(ctx->regmap, IT66121_AUD_CHST_OFS_WL_REG, iec60958_chstat[4]);
+}
+
+static int it661221_set_lpcm_audio(struct it66121_ctx *ctx, u8 audio_src_num, u8 audio_swl)
+{
+ int ret;
+ unsigned int audio_enable = 0;
+ unsigned int audio_format = 0;
+
+ switch (audio_swl) {
+ case 16:
+ audio_enable |= IT66121_AUD_16BIT;
+ break;
+ case 18:
+ audio_enable |= IT66121_AUD_18BIT;
+ break;
+ case 20:
+ audio_enable |= IT66121_AUD_20BIT;
+ break;
+ case 24:
+ default:
+ audio_enable |= IT66121_AUD_24BIT;
+ break;
+ }
+
+ audio_format |= 0x40;
+ switch (audio_src_num) {
+ case 4:
+ audio_enable |= IT66121_AUD_EN_I2S3 | IT66121_AUD_EN_I2S2 |
+ IT66121_AUD_EN_I2S1 | IT66121_AUD_EN_I2S0;
+ break;
+ case 3:
+ audio_enable |= IT66121_AUD_EN_I2S2 | IT66121_AUD_EN_I2S1 |
+ IT66121_AUD_EN_I2S0;
+ break;
+ case 2:
+ audio_enable |= IT66121_AUD_EN_I2S1 | IT66121_AUD_EN_I2S0;
+ break;
+ case 1:
+ default:
+ audio_format &= ~0x40;
+ audio_enable |= IT66121_AUD_EN_I2S0;
+ break;
+ }
+
+ audio_format |= 0x01;
+ ctx->audio.ch_enable = audio_enable;
+
+ ret = regmap_write(ctx->regmap, IT66121_AUD_CTRL0_REG, audio_enable & 0xF0);
+ if (ret)
+ return ret;
+
+ ret = regmap_write(ctx->regmap, IT66121_AUD_CTRL1_REG, audio_format);
+ if (ret)
+ return ret;
+
+ ret = regmap_write(ctx->regmap, IT66121_AUD_FIFOMAP_REG, 0xE4);
+ if (ret)
+ return ret;
+
+ ret = regmap_write(ctx->regmap, IT66121_AUD_CTRL3_REG, 0x00);
+ if (ret)
+ return ret;
+
+ ret = regmap_write(ctx->regmap, IT66121_AUD_SRCVALID_FLAT_REG, 0x00);
+ if (ret)
+ return ret;
+
+ return regmap_write(ctx->regmap, IT66121_AUD_HDAUDIO_REG, 0x00);
+}
+
+static int it661221_set_ncts(struct it66121_ctx *ctx, u8 fs)
+{
+ int ret;
+ unsigned int n;
+
+ switch (fs) {
+ case IT66121_AUD_FS_32K:
+ n = 4096;
+ break;
+ case IT66121_AUD_FS_44P1K:
+ n = 6272;
+ break;
+ case IT66121_AUD_FS_48K:
+ n = 6144;
+ break;
+ case IT66121_AUD_FS_88P2K:
+ n = 12544;
+ break;
+ case IT66121_AUD_FS_96K:
+ n = 12288;
+ break;
+ case IT66121_AUD_FS_176P4K:
+ n = 25088;
+ break;
+ case IT66121_AUD_FS_192K:
+ n = 24576;
+ break;
+ case IT66121_AUD_FS_768K:
+ n = 24576;
+ break;
+ default:
+ n = 6144;
+ break;
+ }
+
+ ret = regmap_write(ctx->regmap, IT66121_AUD_PKT_N0_REG, (u8)((n) & 0xFF));
+ if (ret)
+ return ret;
+
+ ret = regmap_write(ctx->regmap, IT66121_AUD_PKT_N1_REG, (u8)((n >> 8) & 0xFF));
+ if (ret)
+ return ret;
+
+ ret = regmap_write(ctx->regmap, IT66121_AUD_PKT_N2_REG, (u8)((n >> 16) & 0xF));
+ if (ret)
+ return ret;
+
+ if (ctx->audio.auto_cts) {
+ u8 loop_cnt = 255;
+ u8 cts_stable_cnt = 0;
+ unsigned int sum_cts = 0;
+ unsigned int cts = 0;
+ unsigned int last_cts = 0;
+ unsigned int diff;
+ unsigned int val;
+
+ while (loop_cnt--) {
+ msleep(30);
+ regmap_read(ctx->regmap, IT66121_AUD_PKT_CTS_CNT2_REG, &val);
+ cts = val << 12;
+ regmap_read(ctx->regmap, IT66121_AUD_PKT_CTS_CNT1_REG, &val);
+ cts |= val << 4;
+ regmap_read(ctx->regmap, IT66121_AUD_PKT_CTS_CNT0_REG, &val);
+ cts |= val >> 4;
+ if (cts == 0) {
+ continue;
+ } else {
+ if (last_cts > cts)
+ diff = last_cts - cts;
+ else
+ diff = cts - last_cts;
+ last_cts = cts;
+ if (diff < 5) {
+ cts_stable_cnt++;
+ sum_cts += cts;
+ } else {
+ cts_stable_cnt = 0;
+ sum_cts = 0;
+ continue;
+ }
+
+ if (cts_stable_cnt >= 32) {
+ last_cts = (sum_cts >> 5);
+ break;
+ }
+ }
+ }
+
+ regmap_write(ctx->regmap, IT66121_AUD_PKT_CTS0_REG, (u8)((last_cts) & 0xFF));
+ regmap_write(ctx->regmap, IT66121_AUD_PKT_CTS1_REG, (u8)((last_cts >> 8) & 0xFF));
+ regmap_write(ctx->regmap, IT66121_AUD_PKT_CTS2_REG, (u8)((last_cts >> 16) & 0x0F));
+ }
+
+ ret = regmap_write(ctx->regmap, 0xF8, 0xC3);
+ if (ret)
+ return ret;
+
+ ret = regmap_write(ctx->regmap, 0xF8, 0xA5);
+ if (ret)
+ return ret;
+
+ if (ctx->audio.auto_cts) {
+ ret = regmap_write_bits(ctx->regmap, IT66121_PKT_CTS_CTRL_REG,
+ IT66121_PKT_CTS_CTRL_SEL,
+ 1);
+ } else {
+ ret = regmap_write_bits(ctx->regmap, IT66121_PKT_CTS_CTRL_REG,
+ IT66121_PKT_CTS_CTRL_SEL,
+ 0);
+ }
+
+ if (ret)
+ return ret;
+
+ return regmap_write(ctx->regmap, 0xF8, 0xFF);
+}
+
+static int it661221_audio_output_enable(struct it66121_ctx *ctx, bool enable)
+{
+ int ret;
+
+ if (enable) {
+ ret = regmap_write_bits(ctx->regmap, IT66121_SW_RST_REG,
+ IT66121_SW_RST_AUD | IT66121_SW_RST_AREF,
+ 0);
+ if (ret)
+ return ret;
+
+ ret = regmap_write_bits(ctx->regmap, IT66121_AUD_CTRL0_REG,
+ IT66121_AUD_EN_I2S3 | IT66121_AUD_EN_I2S2 |
+ IT66121_AUD_EN_I2S1 | IT66121_AUD_EN_I2S0,
+ ctx->audio.ch_enable);
+ } else {
+ ret = regmap_write_bits(ctx->regmap, IT66121_AUD_CTRL0_REG,
+ IT66121_AUD_EN_I2S3 | IT66121_AUD_EN_I2S2 |
+ IT66121_AUD_EN_I2S1 | IT66121_AUD_EN_I2S0,
+ ctx->audio.ch_enable & 0xF0);
+ if (ret)
+ return ret;
+
+ ret = regmap_write_bits(ctx->regmap, IT66121_SW_RST_REG,
+ IT66121_SW_RST_AUD | IT66121_SW_RST_AREF,
+ IT66121_SW_RST_AUD | IT66121_SW_RST_AREF);
+ }
+
+ return ret;
+}
+
+static int it661221_audio_ch_enable(struct it66121_ctx *ctx, bool enable)
+{
+ int ret;
+
+ if (enable) {
+ ret = regmap_write(ctx->regmap, IT66121_AUD_SRCVALID_FLAT_REG, 0);
+ if (ret)
+ return ret;
+
+ ret = regmap_write(ctx->regmap, IT66121_AUD_CTRL0_REG, ctx->audio.ch_enable);
+ } else {
+ ret = regmap_write(ctx->regmap, IT66121_AUD_CTRL0_REG, ctx->audio.ch_enable & 0xF0);
+ }
+
+ return ret;
+}
+
+static int it66121_audio_hw_params(struct device *dev, void *data,
+ struct hdmi_codec_daifmt *daifmt,
+ struct hdmi_codec_params *params)
+{
+ u8 fs;
+ u8 swl;
+ int ret;
+ struct it66121_ctx *ctx = dev_get_drvdata(dev);
+ static u8 iec60958_chstat[5];
+ unsigned int channels = params->channels;
+ unsigned int sample_rate = params->sample_rate;
+ unsigned int sample_width = params->sample_width;
+
+ mutex_lock(&ctx->lock);
+ dev_dbg(dev, "%s: %u, %u, %u, %u\n", __func__,
+ daifmt->fmt, sample_rate, sample_width, channels);
+
+ switch (daifmt->fmt) {
+ case HDMI_I2S:
+ dev_dbg(dev, "Using HDMI I2S\n");
+ break;
+ default:
+ dev_err(dev, "Invalid or unsupported DAI format %d\n", daifmt->fmt);
+ ret = -EINVAL;
+ goto out;
+ }
+
+ // Set audio clock recovery (N/CTS)
+ ret = regmap_write(ctx->regmap, IT66121_CLK_CTRL0_REG,
+ IT66121_CLK_CTRL0_AUTO_OVER_SAMPLING |
+ IT66121_CLK_CTRL0_EXT_MCLK_256FS |
+ IT66121_CLK_CTRL0_AUTO_IPCLK);
+ if (ret)
+ goto out;
+
+ ret = regmap_write_bits(ctx->regmap, IT66121_AUD_CTRL0_REG,
+ IT66121_AUD_CTRL0_AUD_SEL, 0); // remove spdif selection
+ if (ret)
+ goto out;
+
+ switch (sample_rate) {
+ case 44100L:
+ fs = IT66121_AUD_FS_44P1K;
+ break;
+ case 88200L:
+ fs = IT66121_AUD_FS_88P2K;
+ break;
+ case 176400L:
+ fs = IT66121_AUD_FS_176P4K;
+ break;
+ case 32000L:
+ fs = IT66121_AUD_FS_32K;
+ break;
+ case 48000L:
+ fs = IT66121_AUD_FS_48K;
+ break;
+ case 96000L:
+ fs = IT66121_AUD_FS_96K;
+ break;
+ case 192000L:
+ fs = IT66121_AUD_FS_192K;
+ break;
+ case 768000L:
+ fs = IT66121_AUD_FS_768K;
+ break;
+ default:
+ fs = IT66121_AUD_FS_48K;
+ break;
+ }
+
+ ctx->audio.fs = fs;
+ ret = it661221_set_ncts(ctx, fs);
+ if (ret) {
+ dev_err(dev, "Failed to set N/CTS: %d\n", ret);
+ goto out;
+ }
+
+ // Set audio format register (except audio channel enable)
+ ret = it661221_set_lpcm_audio(ctx, (channels + 1) / 2, sample_width);
+ if (ret) {
+ dev_err(dev, "Failed to set LPCM audio: %d\n", ret);
+ goto out;
+ }
+
+ // Set audio channel status
+ iec60958_chstat[0] = 0;
+ if ((channels + 1) / 2 == 1)
+ iec60958_chstat[0] |= 0x1;
+ iec60958_chstat[0] &= ~(1 << 1);
+ iec60958_chstat[1] = 0;
+ iec60958_chstat[2] = (channels + 1) / 2;
+ iec60958_chstat[2] |= (channels << 4) & 0xF0;
+ iec60958_chstat[3] = fs;
+
+ switch (sample_width) {
+ case 21L:
+ swl = IT66121_AUD_SWL_21BIT;
+ break;
+ case 24L:
+ swl = IT66121_AUD_SWL_24BIT;
+ break;
+ case 23L:
+ swl = IT66121_AUD_SWL_23BIT;
+ break;
+ case 22L:
+ swl = IT66121_AUD_SWL_22BIT;
+ break;
+ case 20L:
+ swl = IT66121_AUD_SWL_20BIT;
+ break;
+ case 17L:
+ swl = IT66121_AUD_SWL_17BIT;
+ break;
+ case 19L:
+ swl = IT66121_AUD_SWL_19BIT;
+ break;
+ case 18L:
+ swl = IT66121_AUD_SWL_18BIT;
+ break;
+ case 16L:
+ swl = IT66121_AUD_SWL_16BIT;
+ break;
+ default:
+ swl = IT66121_AUD_SWL_NOT_INDICATED;
+ break;
+ }
+
+ iec60958_chstat[4] = (((~fs) << 4) & 0xF0) | swl;
+ ret = it661221_set_chstat(ctx, iec60958_chstat);
+ if (ret) {
+ dev_err(dev, "Failed to set channel status: %d\n", ret);
+ goto out;
+ }
+
+ // Enable audio channel enable while input clock stable (if SPDIF).
+ ret = it661221_audio_ch_enable(ctx, true);
+ if (ret) {
+ dev_err(dev, "Failed to enable audio channel: %d\n", ret);
+ goto out;
+ }
+
+ ret = regmap_write_bits(ctx->regmap, IT66121_INT_MASK1_REG,
+ IT66121_INT_MASK1_AUD_OVF,
+ 0);
+ if (ret)
+ goto out;
+
+ dev_dbg(dev, "HDMI audio enabled.\n");
+out:
+ mutex_unlock(&ctx->lock);
+
+ return ret;
+}
+
+static int it66121_audio_startup(struct device *dev, void *data)
+{
+ int ret;
+ struct it66121_ctx *ctx = dev_get_drvdata(dev);
+
+ dev_dbg(dev, "%s\n", __func__);
+
+ mutex_lock(&ctx->lock);
+ ret = it661221_audio_output_enable(ctx, true);
+ if (ret)
+ dev_err(dev, "Failed to enable audio output: %d\n", ret);
+
+ mutex_unlock(&ctx->lock);
+
+ return ret;
+}
+
+static void it66121_audio_shutdown(struct device *dev, void *data)
+{
+ int ret;
+ struct it66121_ctx *ctx = dev_get_drvdata(dev);
+
+ dev_dbg(dev, "%s\n", __func__);
+
+ mutex_lock(&ctx->lock);
+ ret = it661221_audio_output_enable(ctx, false);
+ if (ret)
+ dev_err(dev, "Failed to disable audio output: %d\n", ret);
+
+ mutex_unlock(&ctx->lock);
+}
+
+static int it66121_audio_mute(struct device *dev, void *data,
+ bool enable, int direction)
+{
+ int ret;
+ struct it66121_ctx *ctx = dev_get_drvdata(dev);
+
+ dev_dbg(dev, "%s: enable=%s, direction=%d\n",
+ __func__, enable ? "true" : "false", direction);
+
+ mutex_lock(&ctx->lock);
+
+ if (enable) {
+ ret = regmap_write_bits(ctx->regmap, IT66121_AUD_SRCVALID_FLAT_REG,
+ IT66121_AUD_FLAT_SRC0 | IT66121_AUD_FLAT_SRC1 |
+ IT66121_AUD_FLAT_SRC2 | IT66121_AUD_FLAT_SRC3,
+ IT66121_AUD_FLAT_SRC0 | IT66121_AUD_FLAT_SRC1 |
+ IT66121_AUD_FLAT_SRC2 | IT66121_AUD_FLAT_SRC3);
+ } else {
+ ret = regmap_write_bits(ctx->regmap, IT66121_AUD_SRCVALID_FLAT_REG,
+ IT66121_AUD_FLAT_SRC0 | IT66121_AUD_FLAT_SRC1 |
+ IT66121_AUD_FLAT_SRC2 | IT66121_AUD_FLAT_SRC3,
+ 0);
+ }
+
+ mutex_unlock(&ctx->lock);
+
+ return ret;
+}
+
+static int it66121_audio_get_eld(struct device *dev, void *data,
+ u8 *buf, size_t len)
+{
+ struct it66121_ctx *ctx = dev_get_drvdata(dev);
+
+ mutex_lock(&ctx->lock);
+
+ memcpy(buf, ctx->connector->eld,
+ min(sizeof(ctx->connector->eld), len));
+
+ mutex_unlock(&ctx->lock);
+
+ return 0;
+}
+
+static const struct hdmi_codec_ops it66121_audio_codec_ops = {
+ .hw_params = it66121_audio_hw_params,
+ .audio_startup = it66121_audio_startup,
+ .audio_shutdown = it66121_audio_shutdown,
+ .mute_stream = it66121_audio_mute,
+ .get_eld = it66121_audio_get_eld,
+ .no_capture_mute = 1,
+};
+
+static int it66121_audio_codec_init(struct it66121_ctx *ctx, struct device *dev)
+{
+ struct hdmi_codec_pdata codec_data = {
+ .ops = &it66121_audio_codec_ops,
+ .i2s = 1, /* Only i2s support for now */
+ .spdif = 0,
+ .max_i2s_channels = 8,
+ };
+
+ dev_dbg(dev, "%s\n", __func__);
+
+ if (!of_property_read_bool(dev->of_node, "#sound-dai-cells")) {
+ dev_info(dev, "No \"#sound-dai-cells\", no audio\n");
+ return 0;
+ }
+
+ ctx->audio.pdev = platform_device_register_data(dev,
+ HDMI_CODEC_DRV_NAME,
+ PLATFORM_DEVID_AUTO,
+ &codec_data,
+ sizeof(codec_data));
+
+ if (IS_ERR(ctx->audio.pdev)) {
+ dev_err(dev, "Failed to initialize HDMI audio codec: %d\n",
+ PTR_ERR_OR_ZERO(ctx->audio.pdev));
+ }
+
+ return PTR_ERR_OR_ZERO(ctx->audio.pdev);
+}
+
static int it66121_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
@@ -991,6 +1616,8 @@ static int it66121_probe(struct i2c_client *client,
return ret;
}
+ it66121_audio_codec_init(ctx, dev);
+
drm_bridge_add(&ctx->bridge);
dev_info(ctx->dev, "IT66121 revision %d probed\n", revision_id);
--
2.25.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH 2/3] drm: bridge: it66121: Fix the register page length
2022-03-16 13:57 ` Nicolas Belin
@ 2022-03-18 8:34 ` Neil Armstrong
-1 siblings, 0 replies; 18+ messages in thread
From: Neil Armstrong @ 2022-03-18 8:34 UTC (permalink / raw)
To: Nicolas Belin, andrzej.hajda, robert.foss
Cc: devicetree, dri-devel, linux-kernel, Laurent.pinchart, jonas,
jernej.skrabec
On 16/03/2022 14:57, Nicolas Belin wrote:
> Set the register page length or window length to
> 0x100 according to the documentation.
>
> Fixes: 988156dc2fc9 ("drm: bridge: add it66121 driver")
> Signed-off-by: Nicolas Belin <nbelin@baylibre.com>
> ---
> drivers/gpu/drm/bridge/ite-it66121.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/bridge/ite-it66121.c b/drivers/gpu/drm/bridge/ite-it66121.c
> index 06b59b422c69..64912b770086 100644
> --- a/drivers/gpu/drm/bridge/ite-it66121.c
> +++ b/drivers/gpu/drm/bridge/ite-it66121.c
> @@ -227,7 +227,7 @@ static const struct regmap_range_cfg it66121_regmap_banks[] = {
> .selector_mask = 0x1,
> .selector_shift = 0,
> .window_start = 0x00,
> - .window_len = 0x130,
> + .window_len = 0x100,
> },
> };
>
The documentation we have access to at [1] is confusing:
Reg00 ~ Reg2F are accessible in any register bank.
Reg30~ RegFF are accessible in register bank0
Reg130~ Reg1BF are accessible in register bank1. These are HDMI packet registers.
But indeed it means:
- Reg00 ~ Reg2F: are always accessible, whether bank0 or bank1 is set
- Reg30~ RegFF: only when bank0 is set
- Reg130~ Reg1BF: only when bank0 is set at Reg30~ RegF range
So 0x100 is the right window_len here.
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
[1] https://rockchip.fr/radxa/IT66121_Register_List_Release_V1.0.pdf
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 2/3] drm: bridge: it66121: Fix the register page length
@ 2022-03-18 8:34 ` Neil Armstrong
0 siblings, 0 replies; 18+ messages in thread
From: Neil Armstrong @ 2022-03-18 8:34 UTC (permalink / raw)
To: Nicolas Belin, andrzej.hajda, robert.foss
Cc: devicetree, jonas, linux-kernel, jernej.skrabec, dri-devel,
Laurent.pinchart
On 16/03/2022 14:57, Nicolas Belin wrote:
> Set the register page length or window length to
> 0x100 according to the documentation.
>
> Fixes: 988156dc2fc9 ("drm: bridge: add it66121 driver")
> Signed-off-by: Nicolas Belin <nbelin@baylibre.com>
> ---
> drivers/gpu/drm/bridge/ite-it66121.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/bridge/ite-it66121.c b/drivers/gpu/drm/bridge/ite-it66121.c
> index 06b59b422c69..64912b770086 100644
> --- a/drivers/gpu/drm/bridge/ite-it66121.c
> +++ b/drivers/gpu/drm/bridge/ite-it66121.c
> @@ -227,7 +227,7 @@ static const struct regmap_range_cfg it66121_regmap_banks[] = {
> .selector_mask = 0x1,
> .selector_shift = 0,
> .window_start = 0x00,
> - .window_len = 0x130,
> + .window_len = 0x100,
> },
> };
>
The documentation we have access to at [1] is confusing:
Reg00 ~ Reg2F are accessible in any register bank.
Reg30~ RegFF are accessible in register bank0
Reg130~ Reg1BF are accessible in register bank1. These are HDMI packet registers.
But indeed it means:
- Reg00 ~ Reg2F: are always accessible, whether bank0 or bank1 is set
- Reg30~ RegFF: only when bank0 is set
- Reg130~ Reg1BF: only when bank0 is set at Reg30~ RegF range
So 0x100 is the right window_len here.
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
[1] https://rockchip.fr/radxa/IT66121_Register_List_Release_V1.0.pdf
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 3/3] drm: bridge: it66121: Add audio support
2022-03-16 13:57 ` Nicolas Belin
@ 2022-03-18 8:44 ` Neil Armstrong
-1 siblings, 0 replies; 18+ messages in thread
From: Neil Armstrong @ 2022-03-18 8:44 UTC (permalink / raw)
To: Nicolas Belin, andrzej.hajda, robert.foss
Cc: devicetree, dri-devel, linux-kernel, Laurent.pinchart, jonas,
jernej.skrabec, Andy . Hsieh
On 16/03/2022 14:57, Nicolas Belin wrote:
> Adding the audio support on the HDMI bridge for I2S only.
>
> Signed-off-by: Nicolas Belin <nbelin@baylibre.com>
> Signed-off-by: Andy.Hsieh <Andy.Hsieh@mediatek.com>
> ---
> drivers/gpu/drm/bridge/ite-it66121.c | 627 +++++++++++++++++++++++++++
> 1 file changed, 627 insertions(+)
>
> diff --git a/drivers/gpu/drm/bridge/ite-it66121.c b/drivers/gpu/drm/bridge/ite-it66121.c
> index 64912b770086..514989676d07 100644
> --- a/drivers/gpu/drm/bridge/ite-it66121.c
> +++ b/drivers/gpu/drm/bridge/ite-it66121.c
> @@ -27,6 +27,8 @@
> #include <drm/drm_print.h>
> #include <drm/drm_probe_helper.h>
>
> +#include <sound/hdmi-codec.h>
> +
> #define IT66121_VENDOR_ID0_REG 0x00
> #define IT66121_VENDOR_ID1_REG 0x01
> #define IT66121_DEVICE_ID0_REG 0x02
> @@ -155,6 +157,9 @@
> #define IT66121_AV_MUTE_ON BIT(0)
> #define IT66121_AV_MUTE_BLUESCR BIT(1)
>
> +#define IT66121_PKT_CTS_CTRL_REG 0xC5
> +#define IT66121_PKT_CTS_CTRL_SEL BIT(1)
> +
> #define IT66121_PKT_GEN_CTRL_REG 0xC6
> #define IT66121_PKT_GEN_CTRL_ON BIT(0)
> #define IT66121_PKT_GEN_CTRL_RPT BIT(1)
> @@ -202,6 +207,89 @@
> #define IT66121_EDID_SLEEP_US 20000
> #define IT66121_EDID_TIMEOUT_US 200000
> #define IT66121_EDID_FIFO_SIZE 32
> +
> +#define IT66121_CLK_CTRL0_REG 0x58
> +#define IT66121_CLK_CTRL0_AUTO_OVER_SAMPLING BIT(4)
> +#define IT66121_CLK_CTRL0_EXT_MCLK_MASK GENMASK(3, 2)
> +#define IT66121_CLK_CTRL0_EXT_MCLK_128FS (0 << 2)
> +#define IT66121_CLK_CTRL0_EXT_MCLK_256FS BIT(2)
> +#define IT66121_CLK_CTRL0_EXT_MCLK_512FS (2 << 2)
> +#define IT66121_CLK_CTRL0_EXT_MCLK_1024FS (3 << 2)
> +#define IT66121_CLK_CTRL0_AUTO_IPCLK BIT(0)
> +#define IT66121_CLK_STATUS1_REG 0x5E
> +#define IT66121_CLK_STATUS2_REG 0x5F
> +
> +#define IT66121_AUD_CTRL0_REG 0xE0
> +#define IT66121_AUD_SWL (3 << 6)
> +#define IT66121_AUD_16BIT (0 << 6)
> +#define IT66121_AUD_18BIT BIT(6)
> +#define IT66121_AUD_20BIT (2 << 6)
> +#define IT66121_AUD_24BIT (3 << 6)
> +#define IT66121_AUD_SPDIFTC BIT(5)
> +#define IT66121_AUD_SPDIF BIT(4)
> +#define IT66121_AUD_I2S (0 << 4)
> +#define IT66121_AUD_EN_I2S3 BIT(3)
> +#define IT66121_AUD_EN_I2S2 BIT(2)
> +#define IT66121_AUD_EN_I2S1 BIT(1)
> +#define IT66121_AUD_EN_I2S0 BIT(0)
> +#define IT66121_AUD_CTRL0_AUD_SEL BIT(4)
> +
> +#define IT66121_AUD_CTRL1_REG 0xE1
> +#define IT66121_AUD_FIFOMAP_REG 0xE2
> +#define IT66121_AUD_CTRL3_REG 0xE3
> +#define IT66121_AUD_SRCVALID_FLAT_REG 0xE4
> +#define IT66121_AUD_FLAT_SRC0 BIT(4)
> +#define IT66121_AUD_FLAT_SRC1 BIT(5)
> +#define IT66121_AUD_FLAT_SRC2 BIT(6)
> +#define IT66121_AUD_FLAT_SRC3 BIT(7)
> +#define IT66121_AUD_HDAUDIO_REG 0xE5
> +
> +#define IT66121_AUD_PKT_CTS0_REG 0x130
> +#define IT66121_AUD_PKT_CTS1_REG 0x131
> +#define IT66121_AUD_PKT_CTS2_REG 0x132
> +#define IT66121_AUD_PKT_N0_REG 0x133
> +#define IT66121_AUD_PKT_N1_REG 0x134
> +#define IT66121_AUD_PKT_N2_REG 0x135
> +
> +#define IT66121_AUD_CHST_MODE_REG 0x191
> +#define IT66121_AUD_CHST_CAT_REG 0x192
> +#define IT66121_AUD_CHST_SRCNUM_REG 0x193
> +#define IT66121_AUD_CHST_CHTNUM_REG 0x194
> +#define IT66121_AUD_CHST_CA_FS_REG 0x198
> +#define IT66121_AUD_CHST_OFS_WL_REG 0x199
> +
> +#define IT66121_AUD_PKT_CTS_CNT0_REG 0x1A0
> +#define IT66121_AUD_PKT_CTS_CNT1_REG 0x1A1
> +#define IT66121_AUD_PKT_CTS_CNT2_REG 0x1A2
> +
> +#define IT66121_AUD_FS_22P05K 0x4
> +#define IT66121_AUD_FS_44P1K 0x0
> +#define IT66121_AUD_FS_88P2K 0x8
> +#define IT66121_AUD_FS_176P4K 0xC
> +#define IT66121_AUD_FS_24K 0x6
> +#define IT66121_AUD_FS_48K 0x2
> +#define IT66121_AUD_FS_96K 0xA
> +#define IT66121_AUD_FS_192K 0xE
> +#define IT66121_AUD_FS_768K 0x9
> +#define IT66121_AUD_FS_32K 0x3
> +#define IT66121_AUD_FS_OTHER 0x1
> +
> +#define IT66121_AUD_SWL_21BIT 0xD
> +#define IT66121_AUD_SWL_24BIT 0xB
> +#define IT66121_AUD_SWL_23BIT 0x9
> +#define IT66121_AUD_SWL_22BIT 0x5
> +#define IT66121_AUD_SWL_20BIT 0x3
> +#define IT66121_AUD_SWL_17BIT 0xC
> +#define IT66121_AUD_SWL_19BIT 0x8
> +#define IT66121_AUD_SWL_18BIT 0x4
> +#define IT66121_AUD_SWL_16BIT 0x2
> +#define IT66121_AUD_SWL_NOT_INDICATED 0x0
> +
> +#define IT66121_VENDOR_ID0 0x54
> +#define IT66121_VENDOR_ID1 0x49
> +#define IT66121_DEVICE_ID0 0x12
> +#define IT66121_DEVICE_ID1 0x06
> +#define IT66121_DEVICE_MASK 0x0F
> #define IT66121_AFE_CLK_HIGH 80000 /* Khz */
>
> struct it66121_ctx {
> @@ -216,6 +304,13 @@ struct it66121_ctx {
> u32 bus_width;
> struct mutex lock; /* Protects fields below and device registers */
> struct hdmi_avi_infoframe hdmi_avi_infoframe;
> + struct {
> + struct platform_device *pdev;
> + u8 ch_enable;
> + u8 fs;
> + u8 swl;
> + bool auto_cts;
> + } audio;
> };
>
> static const struct regmap_range_cfg it66121_regmap_banks[] = {
> @@ -886,6 +981,536 @@ static irqreturn_t it66121_irq_threaded_handler(int irq, void *dev_id)
> return IRQ_HANDLED;
> }
>
> +static int it661221_set_chstat(struct it66121_ctx *ctx, u8 iec60958_chstat[])
> +{
> + int ret;
> +
> + ret = regmap_write(ctx->regmap, IT66121_AUD_CHST_MODE_REG, iec60958_chstat[0] & 0x7C);
> + if (ret)
> + return ret;
> +
> + ret = regmap_write(ctx->regmap, IT66121_AUD_CHST_CAT_REG, iec60958_chstat[1]);
> + if (ret)
> + return ret;
> +
> + ret = regmap_write(ctx->regmap, IT66121_AUD_CHST_SRCNUM_REG, iec60958_chstat[2] & 0x0F);
> + if (ret)
> + return ret;
> +
> + ret = regmap_write(ctx->regmap, IT66121_AUD_CHST_CHTNUM_REG,
> + (iec60958_chstat[2] >> 4) & 0x0F);
> + if (ret)
> + return ret;
> +
> + ret = regmap_write(ctx->regmap, IT66121_AUD_CHST_CA_FS_REG, iec60958_chstat[3]);
> + if (ret)
> + return ret;
> +
> + return regmap_write(ctx->regmap, IT66121_AUD_CHST_OFS_WL_REG, iec60958_chstat[4]);
> +}
> +
> +static int it661221_set_lpcm_audio(struct it66121_ctx *ctx, u8 audio_src_num, u8 audio_swl)
> +{
> + int ret;
> + unsigned int audio_enable = 0;
> + unsigned int audio_format = 0;
> +
> + switch (audio_swl) {
> + case 16:
> + audio_enable |= IT66121_AUD_16BIT;
> + break;
> + case 18:
> + audio_enable |= IT66121_AUD_18BIT;
> + break;
> + case 20:
> + audio_enable |= IT66121_AUD_20BIT;
> + break;
> + case 24:
> + default:
> + audio_enable |= IT66121_AUD_24BIT;
> + break;
> + }
> +
> + audio_format |= 0x40;
> + switch (audio_src_num) {
> + case 4:
> + audio_enable |= IT66121_AUD_EN_I2S3 | IT66121_AUD_EN_I2S2 |
> + IT66121_AUD_EN_I2S1 | IT66121_AUD_EN_I2S0;
> + break;
> + case 3:
> + audio_enable |= IT66121_AUD_EN_I2S2 | IT66121_AUD_EN_I2S1 |
> + IT66121_AUD_EN_I2S0;
> + break;
> + case 2:
> + audio_enable |= IT66121_AUD_EN_I2S1 | IT66121_AUD_EN_I2S0;
> + break;
> + case 1:
> + default:
> + audio_format &= ~0x40;
> + audio_enable |= IT66121_AUD_EN_I2S0;
> + break;
> + }
> +
> + audio_format |= 0x01;
> + ctx->audio.ch_enable = audio_enable;
> +
> + ret = regmap_write(ctx->regmap, IT66121_AUD_CTRL0_REG, audio_enable & 0xF0);
> + if (ret)
> + return ret;
> +
> + ret = regmap_write(ctx->regmap, IT66121_AUD_CTRL1_REG, audio_format);
> + if (ret)
> + return ret;
> +
> + ret = regmap_write(ctx->regmap, IT66121_AUD_FIFOMAP_REG, 0xE4);
> + if (ret)
> + return ret;
> +
> + ret = regmap_write(ctx->regmap, IT66121_AUD_CTRL3_REG, 0x00);
> + if (ret)
> + return ret;
> +
> + ret = regmap_write(ctx->regmap, IT66121_AUD_SRCVALID_FLAT_REG, 0x00);
> + if (ret)
> + return ret;
> +
> + return regmap_write(ctx->regmap, IT66121_AUD_HDAUDIO_REG, 0x00);
> +}
> +
> +static int it661221_set_ncts(struct it66121_ctx *ctx, u8 fs)
> +{
> + int ret;
> + unsigned int n;
> +
> + switch (fs) {
> + case IT66121_AUD_FS_32K:
> + n = 4096;
> + break;
> + case IT66121_AUD_FS_44P1K:
> + n = 6272;
> + break;
> + case IT66121_AUD_FS_48K:
> + n = 6144;
> + break;
> + case IT66121_AUD_FS_88P2K:
> + n = 12544;
> + break;
> + case IT66121_AUD_FS_96K:
> + n = 12288;
> + break;
> + case IT66121_AUD_FS_176P4K:
> + n = 25088;
> + break;
> + case IT66121_AUD_FS_192K:
> + n = 24576;
> + break;
> + case IT66121_AUD_FS_768K:
> + n = 24576;
> + break;
> + default:
> + n = 6144;
> + break;
> + }
> +
> + ret = regmap_write(ctx->regmap, IT66121_AUD_PKT_N0_REG, (u8)((n) & 0xFF));
> + if (ret)
> + return ret;
> +
> + ret = regmap_write(ctx->regmap, IT66121_AUD_PKT_N1_REG, (u8)((n >> 8) & 0xFF));
> + if (ret)
> + return ret;
> +
> + ret = regmap_write(ctx->regmap, IT66121_AUD_PKT_N2_REG, (u8)((n >> 16) & 0xF));
> + if (ret)
> + return ret;
> +
> + if (ctx->audio.auto_cts) {
> + u8 loop_cnt = 255;
> + u8 cts_stable_cnt = 0;
> + unsigned int sum_cts = 0;
> + unsigned int cts = 0;
> + unsigned int last_cts = 0;
> + unsigned int diff;
> + unsigned int val;
> +
> + while (loop_cnt--) {
> + msleep(30);
> + regmap_read(ctx->regmap, IT66121_AUD_PKT_CTS_CNT2_REG, &val);
> + cts = val << 12;
> + regmap_read(ctx->regmap, IT66121_AUD_PKT_CTS_CNT1_REG, &val);
> + cts |= val << 4;
> + regmap_read(ctx->regmap, IT66121_AUD_PKT_CTS_CNT0_REG, &val);
> + cts |= val >> 4;
> + if (cts == 0) {
> + continue;
> + } else {
> + if (last_cts > cts)
> + diff = last_cts - cts;
> + else
> + diff = cts - last_cts;
> + last_cts = cts;
> + if (diff < 5) {
> + cts_stable_cnt++;
> + sum_cts += cts;
> + } else {
> + cts_stable_cnt = 0;
> + sum_cts = 0;
> + continue;
> + }
> +
> + if (cts_stable_cnt >= 32) {
> + last_cts = (sum_cts >> 5);
> + break;
> + }
> + }
> + }
> +
> + regmap_write(ctx->regmap, IT66121_AUD_PKT_CTS0_REG, (u8)((last_cts) & 0xFF));
> + regmap_write(ctx->regmap, IT66121_AUD_PKT_CTS1_REG, (u8)((last_cts >> 8) & 0xFF));
> + regmap_write(ctx->regmap, IT66121_AUD_PKT_CTS2_REG, (u8)((last_cts >> 16) & 0x0F));
> + }
> +
> + ret = regmap_write(ctx->regmap, 0xF8, 0xC3);
> + if (ret)
> + return ret;
> +
> + ret = regmap_write(ctx->regmap, 0xF8, 0xA5);
> + if (ret)
> + return ret;
> +
> + if (ctx->audio.auto_cts) {
> + ret = regmap_write_bits(ctx->regmap, IT66121_PKT_CTS_CTRL_REG,
> + IT66121_PKT_CTS_CTRL_SEL,
> + 1);
> + } else {
> + ret = regmap_write_bits(ctx->regmap, IT66121_PKT_CTS_CTRL_REG,
> + IT66121_PKT_CTS_CTRL_SEL,
> + 0);
> + }
> +
> + if (ret)
> + return ret;
> +
> + return regmap_write(ctx->regmap, 0xF8, 0xFF);
> +}
> +
> +static int it661221_audio_output_enable(struct it66121_ctx *ctx, bool enable)
> +{
> + int ret;
> +
> + if (enable) {
> + ret = regmap_write_bits(ctx->regmap, IT66121_SW_RST_REG,
> + IT66121_SW_RST_AUD | IT66121_SW_RST_AREF,
> + 0);
> + if (ret)
> + return ret;
> +
> + ret = regmap_write_bits(ctx->regmap, IT66121_AUD_CTRL0_REG,
> + IT66121_AUD_EN_I2S3 | IT66121_AUD_EN_I2S2 |
> + IT66121_AUD_EN_I2S1 | IT66121_AUD_EN_I2S0,
> + ctx->audio.ch_enable);
> + } else {
> + ret = regmap_write_bits(ctx->regmap, IT66121_AUD_CTRL0_REG,
> + IT66121_AUD_EN_I2S3 | IT66121_AUD_EN_I2S2 |
> + IT66121_AUD_EN_I2S1 | IT66121_AUD_EN_I2S0,
> + ctx->audio.ch_enable & 0xF0);
> + if (ret)
> + return ret;
> +
> + ret = regmap_write_bits(ctx->regmap, IT66121_SW_RST_REG,
> + IT66121_SW_RST_AUD | IT66121_SW_RST_AREF,
> + IT66121_SW_RST_AUD | IT66121_SW_RST_AREF);
> + }
> +
> + return ret;
> +}
> +
> +static int it661221_audio_ch_enable(struct it66121_ctx *ctx, bool enable)
> +{
> + int ret;
> +
> + if (enable) {
> + ret = regmap_write(ctx->regmap, IT66121_AUD_SRCVALID_FLAT_REG, 0);
> + if (ret)
> + return ret;
> +
> + ret = regmap_write(ctx->regmap, IT66121_AUD_CTRL0_REG, ctx->audio.ch_enable);
> + } else {
> + ret = regmap_write(ctx->regmap, IT66121_AUD_CTRL0_REG, ctx->audio.ch_enable & 0xF0);
> + }
> +
> + return ret;
> +}
> +
> +static int it66121_audio_hw_params(struct device *dev, void *data,
> + struct hdmi_codec_daifmt *daifmt,
> + struct hdmi_codec_params *params)
> +{
> + u8 fs;
> + u8 swl;
> + int ret;
> + struct it66121_ctx *ctx = dev_get_drvdata(dev);
> + static u8 iec60958_chstat[5];
> + unsigned int channels = params->channels;
> + unsigned int sample_rate = params->sample_rate;
> + unsigned int sample_width = params->sample_width;
> +
> + mutex_lock(&ctx->lock);
> + dev_dbg(dev, "%s: %u, %u, %u, %u\n", __func__,
> + daifmt->fmt, sample_rate, sample_width, channels);
> +
> + switch (daifmt->fmt) {
> + case HDMI_I2S:
> + dev_dbg(dev, "Using HDMI I2S\n");
> + break;
> + default:
> + dev_err(dev, "Invalid or unsupported DAI format %d\n", daifmt->fmt);
> + ret = -EINVAL;
> + goto out;
> + }
> +
> + // Set audio clock recovery (N/CTS)
> + ret = regmap_write(ctx->regmap, IT66121_CLK_CTRL0_REG,
> + IT66121_CLK_CTRL0_AUTO_OVER_SAMPLING |
> + IT66121_CLK_CTRL0_EXT_MCLK_256FS |
> + IT66121_CLK_CTRL0_AUTO_IPCLK);
> + if (ret)
> + goto out;
> +
> + ret = regmap_write_bits(ctx->regmap, IT66121_AUD_CTRL0_REG,
> + IT66121_AUD_CTRL0_AUD_SEL, 0); // remove spdif selection
> + if (ret)
> + goto out;
> +
> + switch (sample_rate) {
> + case 44100L:
> + fs = IT66121_AUD_FS_44P1K;
> + break;
> + case 88200L:
> + fs = IT66121_AUD_FS_88P2K;
> + break;
> + case 176400L:
> + fs = IT66121_AUD_FS_176P4K;
> + break;
> + case 32000L:
> + fs = IT66121_AUD_FS_32K;
> + break;
> + case 48000L:
> + fs = IT66121_AUD_FS_48K;
> + break;
> + case 96000L:
> + fs = IT66121_AUD_FS_96K;
> + break;
> + case 192000L:
> + fs = IT66121_AUD_FS_192K;
> + break;
> + case 768000L:
> + fs = IT66121_AUD_FS_768K;
> + break;
> + default:
> + fs = IT66121_AUD_FS_48K;
> + break;
> + }
> +
> + ctx->audio.fs = fs;
> + ret = it661221_set_ncts(ctx, fs);
> + if (ret) {
> + dev_err(dev, "Failed to set N/CTS: %d\n", ret);
> + goto out;
> + }
> +
> + // Set audio format register (except audio channel enable)
> + ret = it661221_set_lpcm_audio(ctx, (channels + 1) / 2, sample_width);
> + if (ret) {
> + dev_err(dev, "Failed to set LPCM audio: %d\n", ret);
> + goto out;
> + }
> +
> + // Set audio channel status
> + iec60958_chstat[0] = 0;
> + if ((channels + 1) / 2 == 1)
> + iec60958_chstat[0] |= 0x1;
> + iec60958_chstat[0] &= ~(1 << 1);
> + iec60958_chstat[1] = 0;
> + iec60958_chstat[2] = (channels + 1) / 2;
> + iec60958_chstat[2] |= (channels << 4) & 0xF0;
> + iec60958_chstat[3] = fs;
> +
> + switch (sample_width) {
> + case 21L:
> + swl = IT66121_AUD_SWL_21BIT;
> + break;
> + case 24L:
> + swl = IT66121_AUD_SWL_24BIT;
> + break;
> + case 23L:
> + swl = IT66121_AUD_SWL_23BIT;
> + break;
> + case 22L:
> + swl = IT66121_AUD_SWL_22BIT;
> + break;
> + case 20L:
> + swl = IT66121_AUD_SWL_20BIT;
> + break;
> + case 17L:
> + swl = IT66121_AUD_SWL_17BIT;
> + break;
> + case 19L:
> + swl = IT66121_AUD_SWL_19BIT;
> + break;
> + case 18L:
> + swl = IT66121_AUD_SWL_18BIT;
> + break;
> + case 16L:
> + swl = IT66121_AUD_SWL_16BIT;
> + break;
> + default:
> + swl = IT66121_AUD_SWL_NOT_INDICATED;
> + break;
> + }
> +
> + iec60958_chstat[4] = (((~fs) << 4) & 0xF0) | swl;
> + ret = it661221_set_chstat(ctx, iec60958_chstat);
> + if (ret) {
> + dev_err(dev, "Failed to set channel status: %d\n", ret);
> + goto out;
> + }
> +
> + // Enable audio channel enable while input clock stable (if SPDIF).
> + ret = it661221_audio_ch_enable(ctx, true);
> + if (ret) {
> + dev_err(dev, "Failed to enable audio channel: %d\n", ret);
> + goto out;
> + }
> +
> + ret = regmap_write_bits(ctx->regmap, IT66121_INT_MASK1_REG,
> + IT66121_INT_MASK1_AUD_OVF,
> + 0);
> + if (ret)
> + goto out;
> +
> + dev_dbg(dev, "HDMI audio enabled.\n");
> +out:
> + mutex_unlock(&ctx->lock);
> +
> + return ret;
> +}
> +
> +static int it66121_audio_startup(struct device *dev, void *data)
> +{
> + int ret;
> + struct it66121_ctx *ctx = dev_get_drvdata(dev);
> +
> + dev_dbg(dev, "%s\n", __func__);
> +
> + mutex_lock(&ctx->lock);
> + ret = it661221_audio_output_enable(ctx, true);
> + if (ret)
> + dev_err(dev, "Failed to enable audio output: %d\n", ret);
> +
> + mutex_unlock(&ctx->lock);
> +
> + return ret;
> +}
> +
> +static void it66121_audio_shutdown(struct device *dev, void *data)
> +{
> + int ret;
> + struct it66121_ctx *ctx = dev_get_drvdata(dev);
> +
> + dev_dbg(dev, "%s\n", __func__);
> +
> + mutex_lock(&ctx->lock);
> + ret = it661221_audio_output_enable(ctx, false);
> + if (ret)
> + dev_err(dev, "Failed to disable audio output: %d\n", ret);
> +
> + mutex_unlock(&ctx->lock);
> +}
> +
> +static int it66121_audio_mute(struct device *dev, void *data,
> + bool enable, int direction)
> +{
> + int ret;
> + struct it66121_ctx *ctx = dev_get_drvdata(dev);
> +
> + dev_dbg(dev, "%s: enable=%s, direction=%d\n",
> + __func__, enable ? "true" : "false", direction);
> +
> + mutex_lock(&ctx->lock);
> +
> + if (enable) {
> + ret = regmap_write_bits(ctx->regmap, IT66121_AUD_SRCVALID_FLAT_REG,
> + IT66121_AUD_FLAT_SRC0 | IT66121_AUD_FLAT_SRC1 |
> + IT66121_AUD_FLAT_SRC2 | IT66121_AUD_FLAT_SRC3,
> + IT66121_AUD_FLAT_SRC0 | IT66121_AUD_FLAT_SRC1 |
> + IT66121_AUD_FLAT_SRC2 | IT66121_AUD_FLAT_SRC3);
> + } else {
> + ret = regmap_write_bits(ctx->regmap, IT66121_AUD_SRCVALID_FLAT_REG,
> + IT66121_AUD_FLAT_SRC0 | IT66121_AUD_FLAT_SRC1 |
> + IT66121_AUD_FLAT_SRC2 | IT66121_AUD_FLAT_SRC3,
> + 0);
> + }
> +
> + mutex_unlock(&ctx->lock);
> +
> + return ret;
> +}
> +
> +static int it66121_audio_get_eld(struct device *dev, void *data,
> + u8 *buf, size_t len)
> +{
> + struct it66121_ctx *ctx = dev_get_drvdata(dev);
> +
> + mutex_lock(&ctx->lock);
> +
> + memcpy(buf, ctx->connector->eld,
> + min(sizeof(ctx->connector->eld), len));
> +
> + mutex_unlock(&ctx->lock);
> +
> + return 0;
> +}
> +
> +static const struct hdmi_codec_ops it66121_audio_codec_ops = {
> + .hw_params = it66121_audio_hw_params,
> + .audio_startup = it66121_audio_startup,
> + .audio_shutdown = it66121_audio_shutdown,
> + .mute_stream = it66121_audio_mute,
> + .get_eld = it66121_audio_get_eld,
> + .no_capture_mute = 1,
> +};
> +
> +static int it66121_audio_codec_init(struct it66121_ctx *ctx, struct device *dev)
> +{
> + struct hdmi_codec_pdata codec_data = {
> + .ops = &it66121_audio_codec_ops,
> + .i2s = 1, /* Only i2s support for now */
> + .spdif = 0,
> + .max_i2s_channels = 8,
> + };
> +
> + dev_dbg(dev, "%s\n", __func__);
> +
> + if (!of_property_read_bool(dev->of_node, "#sound-dai-cells")) {
> + dev_info(dev, "No \"#sound-dai-cells\", no audio\n");
> + return 0;
> + }
> +
> + ctx->audio.pdev = platform_device_register_data(dev,
> + HDMI_CODEC_DRV_NAME,
> + PLATFORM_DEVID_AUTO,
> + &codec_data,
> + sizeof(codec_data));
> +
> + if (IS_ERR(ctx->audio.pdev)) {
> + dev_err(dev, "Failed to initialize HDMI audio codec: %d\n",
> + PTR_ERR_OR_ZERO(ctx->audio.pdev));
> + }
> +
> + return PTR_ERR_OR_ZERO(ctx->audio.pdev);
> +}
> +
> static int it66121_probe(struct i2c_client *client,
> const struct i2c_device_id *id)
> {
> @@ -991,6 +1616,8 @@ static int it66121_probe(struct i2c_client *client,
> return ret;
> }
>
> + it66121_audio_codec_init(ctx, dev);
> +
> drm_bridge_add(&ctx->bridge);
>
> dev_info(ctx->dev, "IT66121 revision %d probed\n", revision_id);
Looks good to me, it follows programming sequence described in [1].
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
[1] https://rockchip.fr/radxa/IT66121_Programming_Guide.v1.05.pdf
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 3/3] drm: bridge: it66121: Add audio support
@ 2022-03-18 8:44 ` Neil Armstrong
0 siblings, 0 replies; 18+ messages in thread
From: Neil Armstrong @ 2022-03-18 8:44 UTC (permalink / raw)
To: Nicolas Belin, andrzej.hajda, robert.foss
Cc: devicetree, jonas, Andy . Hsieh, linux-kernel, jernej.skrabec,
dri-devel, Laurent.pinchart
On 16/03/2022 14:57, Nicolas Belin wrote:
> Adding the audio support on the HDMI bridge for I2S only.
>
> Signed-off-by: Nicolas Belin <nbelin@baylibre.com>
> Signed-off-by: Andy.Hsieh <Andy.Hsieh@mediatek.com>
> ---
> drivers/gpu/drm/bridge/ite-it66121.c | 627 +++++++++++++++++++++++++++
> 1 file changed, 627 insertions(+)
>
> diff --git a/drivers/gpu/drm/bridge/ite-it66121.c b/drivers/gpu/drm/bridge/ite-it66121.c
> index 64912b770086..514989676d07 100644
> --- a/drivers/gpu/drm/bridge/ite-it66121.c
> +++ b/drivers/gpu/drm/bridge/ite-it66121.c
> @@ -27,6 +27,8 @@
> #include <drm/drm_print.h>
> #include <drm/drm_probe_helper.h>
>
> +#include <sound/hdmi-codec.h>
> +
> #define IT66121_VENDOR_ID0_REG 0x00
> #define IT66121_VENDOR_ID1_REG 0x01
> #define IT66121_DEVICE_ID0_REG 0x02
> @@ -155,6 +157,9 @@
> #define IT66121_AV_MUTE_ON BIT(0)
> #define IT66121_AV_MUTE_BLUESCR BIT(1)
>
> +#define IT66121_PKT_CTS_CTRL_REG 0xC5
> +#define IT66121_PKT_CTS_CTRL_SEL BIT(1)
> +
> #define IT66121_PKT_GEN_CTRL_REG 0xC6
> #define IT66121_PKT_GEN_CTRL_ON BIT(0)
> #define IT66121_PKT_GEN_CTRL_RPT BIT(1)
> @@ -202,6 +207,89 @@
> #define IT66121_EDID_SLEEP_US 20000
> #define IT66121_EDID_TIMEOUT_US 200000
> #define IT66121_EDID_FIFO_SIZE 32
> +
> +#define IT66121_CLK_CTRL0_REG 0x58
> +#define IT66121_CLK_CTRL0_AUTO_OVER_SAMPLING BIT(4)
> +#define IT66121_CLK_CTRL0_EXT_MCLK_MASK GENMASK(3, 2)
> +#define IT66121_CLK_CTRL0_EXT_MCLK_128FS (0 << 2)
> +#define IT66121_CLK_CTRL0_EXT_MCLK_256FS BIT(2)
> +#define IT66121_CLK_CTRL0_EXT_MCLK_512FS (2 << 2)
> +#define IT66121_CLK_CTRL0_EXT_MCLK_1024FS (3 << 2)
> +#define IT66121_CLK_CTRL0_AUTO_IPCLK BIT(0)
> +#define IT66121_CLK_STATUS1_REG 0x5E
> +#define IT66121_CLK_STATUS2_REG 0x5F
> +
> +#define IT66121_AUD_CTRL0_REG 0xE0
> +#define IT66121_AUD_SWL (3 << 6)
> +#define IT66121_AUD_16BIT (0 << 6)
> +#define IT66121_AUD_18BIT BIT(6)
> +#define IT66121_AUD_20BIT (2 << 6)
> +#define IT66121_AUD_24BIT (3 << 6)
> +#define IT66121_AUD_SPDIFTC BIT(5)
> +#define IT66121_AUD_SPDIF BIT(4)
> +#define IT66121_AUD_I2S (0 << 4)
> +#define IT66121_AUD_EN_I2S3 BIT(3)
> +#define IT66121_AUD_EN_I2S2 BIT(2)
> +#define IT66121_AUD_EN_I2S1 BIT(1)
> +#define IT66121_AUD_EN_I2S0 BIT(0)
> +#define IT66121_AUD_CTRL0_AUD_SEL BIT(4)
> +
> +#define IT66121_AUD_CTRL1_REG 0xE1
> +#define IT66121_AUD_FIFOMAP_REG 0xE2
> +#define IT66121_AUD_CTRL3_REG 0xE3
> +#define IT66121_AUD_SRCVALID_FLAT_REG 0xE4
> +#define IT66121_AUD_FLAT_SRC0 BIT(4)
> +#define IT66121_AUD_FLAT_SRC1 BIT(5)
> +#define IT66121_AUD_FLAT_SRC2 BIT(6)
> +#define IT66121_AUD_FLAT_SRC3 BIT(7)
> +#define IT66121_AUD_HDAUDIO_REG 0xE5
> +
> +#define IT66121_AUD_PKT_CTS0_REG 0x130
> +#define IT66121_AUD_PKT_CTS1_REG 0x131
> +#define IT66121_AUD_PKT_CTS2_REG 0x132
> +#define IT66121_AUD_PKT_N0_REG 0x133
> +#define IT66121_AUD_PKT_N1_REG 0x134
> +#define IT66121_AUD_PKT_N2_REG 0x135
> +
> +#define IT66121_AUD_CHST_MODE_REG 0x191
> +#define IT66121_AUD_CHST_CAT_REG 0x192
> +#define IT66121_AUD_CHST_SRCNUM_REG 0x193
> +#define IT66121_AUD_CHST_CHTNUM_REG 0x194
> +#define IT66121_AUD_CHST_CA_FS_REG 0x198
> +#define IT66121_AUD_CHST_OFS_WL_REG 0x199
> +
> +#define IT66121_AUD_PKT_CTS_CNT0_REG 0x1A0
> +#define IT66121_AUD_PKT_CTS_CNT1_REG 0x1A1
> +#define IT66121_AUD_PKT_CTS_CNT2_REG 0x1A2
> +
> +#define IT66121_AUD_FS_22P05K 0x4
> +#define IT66121_AUD_FS_44P1K 0x0
> +#define IT66121_AUD_FS_88P2K 0x8
> +#define IT66121_AUD_FS_176P4K 0xC
> +#define IT66121_AUD_FS_24K 0x6
> +#define IT66121_AUD_FS_48K 0x2
> +#define IT66121_AUD_FS_96K 0xA
> +#define IT66121_AUD_FS_192K 0xE
> +#define IT66121_AUD_FS_768K 0x9
> +#define IT66121_AUD_FS_32K 0x3
> +#define IT66121_AUD_FS_OTHER 0x1
> +
> +#define IT66121_AUD_SWL_21BIT 0xD
> +#define IT66121_AUD_SWL_24BIT 0xB
> +#define IT66121_AUD_SWL_23BIT 0x9
> +#define IT66121_AUD_SWL_22BIT 0x5
> +#define IT66121_AUD_SWL_20BIT 0x3
> +#define IT66121_AUD_SWL_17BIT 0xC
> +#define IT66121_AUD_SWL_19BIT 0x8
> +#define IT66121_AUD_SWL_18BIT 0x4
> +#define IT66121_AUD_SWL_16BIT 0x2
> +#define IT66121_AUD_SWL_NOT_INDICATED 0x0
> +
> +#define IT66121_VENDOR_ID0 0x54
> +#define IT66121_VENDOR_ID1 0x49
> +#define IT66121_DEVICE_ID0 0x12
> +#define IT66121_DEVICE_ID1 0x06
> +#define IT66121_DEVICE_MASK 0x0F
> #define IT66121_AFE_CLK_HIGH 80000 /* Khz */
>
> struct it66121_ctx {
> @@ -216,6 +304,13 @@ struct it66121_ctx {
> u32 bus_width;
> struct mutex lock; /* Protects fields below and device registers */
> struct hdmi_avi_infoframe hdmi_avi_infoframe;
> + struct {
> + struct platform_device *pdev;
> + u8 ch_enable;
> + u8 fs;
> + u8 swl;
> + bool auto_cts;
> + } audio;
> };
>
> static const struct regmap_range_cfg it66121_regmap_banks[] = {
> @@ -886,6 +981,536 @@ static irqreturn_t it66121_irq_threaded_handler(int irq, void *dev_id)
> return IRQ_HANDLED;
> }
>
> +static int it661221_set_chstat(struct it66121_ctx *ctx, u8 iec60958_chstat[])
> +{
> + int ret;
> +
> + ret = regmap_write(ctx->regmap, IT66121_AUD_CHST_MODE_REG, iec60958_chstat[0] & 0x7C);
> + if (ret)
> + return ret;
> +
> + ret = regmap_write(ctx->regmap, IT66121_AUD_CHST_CAT_REG, iec60958_chstat[1]);
> + if (ret)
> + return ret;
> +
> + ret = regmap_write(ctx->regmap, IT66121_AUD_CHST_SRCNUM_REG, iec60958_chstat[2] & 0x0F);
> + if (ret)
> + return ret;
> +
> + ret = regmap_write(ctx->regmap, IT66121_AUD_CHST_CHTNUM_REG,
> + (iec60958_chstat[2] >> 4) & 0x0F);
> + if (ret)
> + return ret;
> +
> + ret = regmap_write(ctx->regmap, IT66121_AUD_CHST_CA_FS_REG, iec60958_chstat[3]);
> + if (ret)
> + return ret;
> +
> + return regmap_write(ctx->regmap, IT66121_AUD_CHST_OFS_WL_REG, iec60958_chstat[4]);
> +}
> +
> +static int it661221_set_lpcm_audio(struct it66121_ctx *ctx, u8 audio_src_num, u8 audio_swl)
> +{
> + int ret;
> + unsigned int audio_enable = 0;
> + unsigned int audio_format = 0;
> +
> + switch (audio_swl) {
> + case 16:
> + audio_enable |= IT66121_AUD_16BIT;
> + break;
> + case 18:
> + audio_enable |= IT66121_AUD_18BIT;
> + break;
> + case 20:
> + audio_enable |= IT66121_AUD_20BIT;
> + break;
> + case 24:
> + default:
> + audio_enable |= IT66121_AUD_24BIT;
> + break;
> + }
> +
> + audio_format |= 0x40;
> + switch (audio_src_num) {
> + case 4:
> + audio_enable |= IT66121_AUD_EN_I2S3 | IT66121_AUD_EN_I2S2 |
> + IT66121_AUD_EN_I2S1 | IT66121_AUD_EN_I2S0;
> + break;
> + case 3:
> + audio_enable |= IT66121_AUD_EN_I2S2 | IT66121_AUD_EN_I2S1 |
> + IT66121_AUD_EN_I2S0;
> + break;
> + case 2:
> + audio_enable |= IT66121_AUD_EN_I2S1 | IT66121_AUD_EN_I2S0;
> + break;
> + case 1:
> + default:
> + audio_format &= ~0x40;
> + audio_enable |= IT66121_AUD_EN_I2S0;
> + break;
> + }
> +
> + audio_format |= 0x01;
> + ctx->audio.ch_enable = audio_enable;
> +
> + ret = regmap_write(ctx->regmap, IT66121_AUD_CTRL0_REG, audio_enable & 0xF0);
> + if (ret)
> + return ret;
> +
> + ret = regmap_write(ctx->regmap, IT66121_AUD_CTRL1_REG, audio_format);
> + if (ret)
> + return ret;
> +
> + ret = regmap_write(ctx->regmap, IT66121_AUD_FIFOMAP_REG, 0xE4);
> + if (ret)
> + return ret;
> +
> + ret = regmap_write(ctx->regmap, IT66121_AUD_CTRL3_REG, 0x00);
> + if (ret)
> + return ret;
> +
> + ret = regmap_write(ctx->regmap, IT66121_AUD_SRCVALID_FLAT_REG, 0x00);
> + if (ret)
> + return ret;
> +
> + return regmap_write(ctx->regmap, IT66121_AUD_HDAUDIO_REG, 0x00);
> +}
> +
> +static int it661221_set_ncts(struct it66121_ctx *ctx, u8 fs)
> +{
> + int ret;
> + unsigned int n;
> +
> + switch (fs) {
> + case IT66121_AUD_FS_32K:
> + n = 4096;
> + break;
> + case IT66121_AUD_FS_44P1K:
> + n = 6272;
> + break;
> + case IT66121_AUD_FS_48K:
> + n = 6144;
> + break;
> + case IT66121_AUD_FS_88P2K:
> + n = 12544;
> + break;
> + case IT66121_AUD_FS_96K:
> + n = 12288;
> + break;
> + case IT66121_AUD_FS_176P4K:
> + n = 25088;
> + break;
> + case IT66121_AUD_FS_192K:
> + n = 24576;
> + break;
> + case IT66121_AUD_FS_768K:
> + n = 24576;
> + break;
> + default:
> + n = 6144;
> + break;
> + }
> +
> + ret = regmap_write(ctx->regmap, IT66121_AUD_PKT_N0_REG, (u8)((n) & 0xFF));
> + if (ret)
> + return ret;
> +
> + ret = regmap_write(ctx->regmap, IT66121_AUD_PKT_N1_REG, (u8)((n >> 8) & 0xFF));
> + if (ret)
> + return ret;
> +
> + ret = regmap_write(ctx->regmap, IT66121_AUD_PKT_N2_REG, (u8)((n >> 16) & 0xF));
> + if (ret)
> + return ret;
> +
> + if (ctx->audio.auto_cts) {
> + u8 loop_cnt = 255;
> + u8 cts_stable_cnt = 0;
> + unsigned int sum_cts = 0;
> + unsigned int cts = 0;
> + unsigned int last_cts = 0;
> + unsigned int diff;
> + unsigned int val;
> +
> + while (loop_cnt--) {
> + msleep(30);
> + regmap_read(ctx->regmap, IT66121_AUD_PKT_CTS_CNT2_REG, &val);
> + cts = val << 12;
> + regmap_read(ctx->regmap, IT66121_AUD_PKT_CTS_CNT1_REG, &val);
> + cts |= val << 4;
> + regmap_read(ctx->regmap, IT66121_AUD_PKT_CTS_CNT0_REG, &val);
> + cts |= val >> 4;
> + if (cts == 0) {
> + continue;
> + } else {
> + if (last_cts > cts)
> + diff = last_cts - cts;
> + else
> + diff = cts - last_cts;
> + last_cts = cts;
> + if (diff < 5) {
> + cts_stable_cnt++;
> + sum_cts += cts;
> + } else {
> + cts_stable_cnt = 0;
> + sum_cts = 0;
> + continue;
> + }
> +
> + if (cts_stable_cnt >= 32) {
> + last_cts = (sum_cts >> 5);
> + break;
> + }
> + }
> + }
> +
> + regmap_write(ctx->regmap, IT66121_AUD_PKT_CTS0_REG, (u8)((last_cts) & 0xFF));
> + regmap_write(ctx->regmap, IT66121_AUD_PKT_CTS1_REG, (u8)((last_cts >> 8) & 0xFF));
> + regmap_write(ctx->regmap, IT66121_AUD_PKT_CTS2_REG, (u8)((last_cts >> 16) & 0x0F));
> + }
> +
> + ret = regmap_write(ctx->regmap, 0xF8, 0xC3);
> + if (ret)
> + return ret;
> +
> + ret = regmap_write(ctx->regmap, 0xF8, 0xA5);
> + if (ret)
> + return ret;
> +
> + if (ctx->audio.auto_cts) {
> + ret = regmap_write_bits(ctx->regmap, IT66121_PKT_CTS_CTRL_REG,
> + IT66121_PKT_CTS_CTRL_SEL,
> + 1);
> + } else {
> + ret = regmap_write_bits(ctx->regmap, IT66121_PKT_CTS_CTRL_REG,
> + IT66121_PKT_CTS_CTRL_SEL,
> + 0);
> + }
> +
> + if (ret)
> + return ret;
> +
> + return regmap_write(ctx->regmap, 0xF8, 0xFF);
> +}
> +
> +static int it661221_audio_output_enable(struct it66121_ctx *ctx, bool enable)
> +{
> + int ret;
> +
> + if (enable) {
> + ret = regmap_write_bits(ctx->regmap, IT66121_SW_RST_REG,
> + IT66121_SW_RST_AUD | IT66121_SW_RST_AREF,
> + 0);
> + if (ret)
> + return ret;
> +
> + ret = regmap_write_bits(ctx->regmap, IT66121_AUD_CTRL0_REG,
> + IT66121_AUD_EN_I2S3 | IT66121_AUD_EN_I2S2 |
> + IT66121_AUD_EN_I2S1 | IT66121_AUD_EN_I2S0,
> + ctx->audio.ch_enable);
> + } else {
> + ret = regmap_write_bits(ctx->regmap, IT66121_AUD_CTRL0_REG,
> + IT66121_AUD_EN_I2S3 | IT66121_AUD_EN_I2S2 |
> + IT66121_AUD_EN_I2S1 | IT66121_AUD_EN_I2S0,
> + ctx->audio.ch_enable & 0xF0);
> + if (ret)
> + return ret;
> +
> + ret = regmap_write_bits(ctx->regmap, IT66121_SW_RST_REG,
> + IT66121_SW_RST_AUD | IT66121_SW_RST_AREF,
> + IT66121_SW_RST_AUD | IT66121_SW_RST_AREF);
> + }
> +
> + return ret;
> +}
> +
> +static int it661221_audio_ch_enable(struct it66121_ctx *ctx, bool enable)
> +{
> + int ret;
> +
> + if (enable) {
> + ret = regmap_write(ctx->regmap, IT66121_AUD_SRCVALID_FLAT_REG, 0);
> + if (ret)
> + return ret;
> +
> + ret = regmap_write(ctx->regmap, IT66121_AUD_CTRL0_REG, ctx->audio.ch_enable);
> + } else {
> + ret = regmap_write(ctx->regmap, IT66121_AUD_CTRL0_REG, ctx->audio.ch_enable & 0xF0);
> + }
> +
> + return ret;
> +}
> +
> +static int it66121_audio_hw_params(struct device *dev, void *data,
> + struct hdmi_codec_daifmt *daifmt,
> + struct hdmi_codec_params *params)
> +{
> + u8 fs;
> + u8 swl;
> + int ret;
> + struct it66121_ctx *ctx = dev_get_drvdata(dev);
> + static u8 iec60958_chstat[5];
> + unsigned int channels = params->channels;
> + unsigned int sample_rate = params->sample_rate;
> + unsigned int sample_width = params->sample_width;
> +
> + mutex_lock(&ctx->lock);
> + dev_dbg(dev, "%s: %u, %u, %u, %u\n", __func__,
> + daifmt->fmt, sample_rate, sample_width, channels);
> +
> + switch (daifmt->fmt) {
> + case HDMI_I2S:
> + dev_dbg(dev, "Using HDMI I2S\n");
> + break;
> + default:
> + dev_err(dev, "Invalid or unsupported DAI format %d\n", daifmt->fmt);
> + ret = -EINVAL;
> + goto out;
> + }
> +
> + // Set audio clock recovery (N/CTS)
> + ret = regmap_write(ctx->regmap, IT66121_CLK_CTRL0_REG,
> + IT66121_CLK_CTRL0_AUTO_OVER_SAMPLING |
> + IT66121_CLK_CTRL0_EXT_MCLK_256FS |
> + IT66121_CLK_CTRL0_AUTO_IPCLK);
> + if (ret)
> + goto out;
> +
> + ret = regmap_write_bits(ctx->regmap, IT66121_AUD_CTRL0_REG,
> + IT66121_AUD_CTRL0_AUD_SEL, 0); // remove spdif selection
> + if (ret)
> + goto out;
> +
> + switch (sample_rate) {
> + case 44100L:
> + fs = IT66121_AUD_FS_44P1K;
> + break;
> + case 88200L:
> + fs = IT66121_AUD_FS_88P2K;
> + break;
> + case 176400L:
> + fs = IT66121_AUD_FS_176P4K;
> + break;
> + case 32000L:
> + fs = IT66121_AUD_FS_32K;
> + break;
> + case 48000L:
> + fs = IT66121_AUD_FS_48K;
> + break;
> + case 96000L:
> + fs = IT66121_AUD_FS_96K;
> + break;
> + case 192000L:
> + fs = IT66121_AUD_FS_192K;
> + break;
> + case 768000L:
> + fs = IT66121_AUD_FS_768K;
> + break;
> + default:
> + fs = IT66121_AUD_FS_48K;
> + break;
> + }
> +
> + ctx->audio.fs = fs;
> + ret = it661221_set_ncts(ctx, fs);
> + if (ret) {
> + dev_err(dev, "Failed to set N/CTS: %d\n", ret);
> + goto out;
> + }
> +
> + // Set audio format register (except audio channel enable)
> + ret = it661221_set_lpcm_audio(ctx, (channels + 1) / 2, sample_width);
> + if (ret) {
> + dev_err(dev, "Failed to set LPCM audio: %d\n", ret);
> + goto out;
> + }
> +
> + // Set audio channel status
> + iec60958_chstat[0] = 0;
> + if ((channels + 1) / 2 == 1)
> + iec60958_chstat[0] |= 0x1;
> + iec60958_chstat[0] &= ~(1 << 1);
> + iec60958_chstat[1] = 0;
> + iec60958_chstat[2] = (channels + 1) / 2;
> + iec60958_chstat[2] |= (channels << 4) & 0xF0;
> + iec60958_chstat[3] = fs;
> +
> + switch (sample_width) {
> + case 21L:
> + swl = IT66121_AUD_SWL_21BIT;
> + break;
> + case 24L:
> + swl = IT66121_AUD_SWL_24BIT;
> + break;
> + case 23L:
> + swl = IT66121_AUD_SWL_23BIT;
> + break;
> + case 22L:
> + swl = IT66121_AUD_SWL_22BIT;
> + break;
> + case 20L:
> + swl = IT66121_AUD_SWL_20BIT;
> + break;
> + case 17L:
> + swl = IT66121_AUD_SWL_17BIT;
> + break;
> + case 19L:
> + swl = IT66121_AUD_SWL_19BIT;
> + break;
> + case 18L:
> + swl = IT66121_AUD_SWL_18BIT;
> + break;
> + case 16L:
> + swl = IT66121_AUD_SWL_16BIT;
> + break;
> + default:
> + swl = IT66121_AUD_SWL_NOT_INDICATED;
> + break;
> + }
> +
> + iec60958_chstat[4] = (((~fs) << 4) & 0xF0) | swl;
> + ret = it661221_set_chstat(ctx, iec60958_chstat);
> + if (ret) {
> + dev_err(dev, "Failed to set channel status: %d\n", ret);
> + goto out;
> + }
> +
> + // Enable audio channel enable while input clock stable (if SPDIF).
> + ret = it661221_audio_ch_enable(ctx, true);
> + if (ret) {
> + dev_err(dev, "Failed to enable audio channel: %d\n", ret);
> + goto out;
> + }
> +
> + ret = regmap_write_bits(ctx->regmap, IT66121_INT_MASK1_REG,
> + IT66121_INT_MASK1_AUD_OVF,
> + 0);
> + if (ret)
> + goto out;
> +
> + dev_dbg(dev, "HDMI audio enabled.\n");
> +out:
> + mutex_unlock(&ctx->lock);
> +
> + return ret;
> +}
> +
> +static int it66121_audio_startup(struct device *dev, void *data)
> +{
> + int ret;
> + struct it66121_ctx *ctx = dev_get_drvdata(dev);
> +
> + dev_dbg(dev, "%s\n", __func__);
> +
> + mutex_lock(&ctx->lock);
> + ret = it661221_audio_output_enable(ctx, true);
> + if (ret)
> + dev_err(dev, "Failed to enable audio output: %d\n", ret);
> +
> + mutex_unlock(&ctx->lock);
> +
> + return ret;
> +}
> +
> +static void it66121_audio_shutdown(struct device *dev, void *data)
> +{
> + int ret;
> + struct it66121_ctx *ctx = dev_get_drvdata(dev);
> +
> + dev_dbg(dev, "%s\n", __func__);
> +
> + mutex_lock(&ctx->lock);
> + ret = it661221_audio_output_enable(ctx, false);
> + if (ret)
> + dev_err(dev, "Failed to disable audio output: %d\n", ret);
> +
> + mutex_unlock(&ctx->lock);
> +}
> +
> +static int it66121_audio_mute(struct device *dev, void *data,
> + bool enable, int direction)
> +{
> + int ret;
> + struct it66121_ctx *ctx = dev_get_drvdata(dev);
> +
> + dev_dbg(dev, "%s: enable=%s, direction=%d\n",
> + __func__, enable ? "true" : "false", direction);
> +
> + mutex_lock(&ctx->lock);
> +
> + if (enable) {
> + ret = regmap_write_bits(ctx->regmap, IT66121_AUD_SRCVALID_FLAT_REG,
> + IT66121_AUD_FLAT_SRC0 | IT66121_AUD_FLAT_SRC1 |
> + IT66121_AUD_FLAT_SRC2 | IT66121_AUD_FLAT_SRC3,
> + IT66121_AUD_FLAT_SRC0 | IT66121_AUD_FLAT_SRC1 |
> + IT66121_AUD_FLAT_SRC2 | IT66121_AUD_FLAT_SRC3);
> + } else {
> + ret = regmap_write_bits(ctx->regmap, IT66121_AUD_SRCVALID_FLAT_REG,
> + IT66121_AUD_FLAT_SRC0 | IT66121_AUD_FLAT_SRC1 |
> + IT66121_AUD_FLAT_SRC2 | IT66121_AUD_FLAT_SRC3,
> + 0);
> + }
> +
> + mutex_unlock(&ctx->lock);
> +
> + return ret;
> +}
> +
> +static int it66121_audio_get_eld(struct device *dev, void *data,
> + u8 *buf, size_t len)
> +{
> + struct it66121_ctx *ctx = dev_get_drvdata(dev);
> +
> + mutex_lock(&ctx->lock);
> +
> + memcpy(buf, ctx->connector->eld,
> + min(sizeof(ctx->connector->eld), len));
> +
> + mutex_unlock(&ctx->lock);
> +
> + return 0;
> +}
> +
> +static const struct hdmi_codec_ops it66121_audio_codec_ops = {
> + .hw_params = it66121_audio_hw_params,
> + .audio_startup = it66121_audio_startup,
> + .audio_shutdown = it66121_audio_shutdown,
> + .mute_stream = it66121_audio_mute,
> + .get_eld = it66121_audio_get_eld,
> + .no_capture_mute = 1,
> +};
> +
> +static int it66121_audio_codec_init(struct it66121_ctx *ctx, struct device *dev)
> +{
> + struct hdmi_codec_pdata codec_data = {
> + .ops = &it66121_audio_codec_ops,
> + .i2s = 1, /* Only i2s support for now */
> + .spdif = 0,
> + .max_i2s_channels = 8,
> + };
> +
> + dev_dbg(dev, "%s\n", __func__);
> +
> + if (!of_property_read_bool(dev->of_node, "#sound-dai-cells")) {
> + dev_info(dev, "No \"#sound-dai-cells\", no audio\n");
> + return 0;
> + }
> +
> + ctx->audio.pdev = platform_device_register_data(dev,
> + HDMI_CODEC_DRV_NAME,
> + PLATFORM_DEVID_AUTO,
> + &codec_data,
> + sizeof(codec_data));
> +
> + if (IS_ERR(ctx->audio.pdev)) {
> + dev_err(dev, "Failed to initialize HDMI audio codec: %d\n",
> + PTR_ERR_OR_ZERO(ctx->audio.pdev));
> + }
> +
> + return PTR_ERR_OR_ZERO(ctx->audio.pdev);
> +}
> +
> static int it66121_probe(struct i2c_client *client,
> const struct i2c_device_id *id)
> {
> @@ -991,6 +1616,8 @@ static int it66121_probe(struct i2c_client *client,
> return ret;
> }
>
> + it66121_audio_codec_init(ctx, dev);
> +
> drm_bridge_add(&ctx->bridge);
>
> dev_info(ctx->dev, "IT66121 revision %d probed\n", revision_id);
Looks good to me, it follows programming sequence described in [1].
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
[1] https://rockchip.fr/radxa/IT66121_Programming_Guide.v1.05.pdf
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 1/3] dt-bindings: display: bridge: it66121: Add audio support
2022-03-16 13:57 ` Nicolas Belin
@ 2022-03-23 20:06 ` Rob Herring
-1 siblings, 0 replies; 18+ messages in thread
From: Rob Herring @ 2022-03-23 20:06 UTC (permalink / raw)
To: Nicolas Belin
Cc: linux-kernel, andrzej.hajda, robert.foss, Laurent.pinchart,
narmstrong, devicetree, jonas, jernej.skrabec, dri-devel
On Wed, 16 Mar 2022 14:57:31 +0100, Nicolas Belin wrote:
> Update the ITE bridge HDMI it66121 bindings in order to
> support audio.
>
> Signed-off-by: Nicolas Belin <nbelin@baylibre.com>
> ---
> .../devicetree/bindings/display/bridge/ite,it66121.yaml | 3 +++
> 1 file changed, 3 insertions(+)
>
Acked-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 1/3] dt-bindings: display: bridge: it66121: Add audio support
@ 2022-03-23 20:06 ` Rob Herring
0 siblings, 0 replies; 18+ messages in thread
From: Rob Herring @ 2022-03-23 20:06 UTC (permalink / raw)
To: Nicolas Belin
Cc: devicetree, jernej.skrabec, narmstrong, dri-devel, jonas,
linux-kernel, robert.foss, Laurent.pinchart, andrzej.hajda
On Wed, 16 Mar 2022 14:57:31 +0100, Nicolas Belin wrote:
> Update the ITE bridge HDMI it66121 bindings in order to
> support audio.
>
> Signed-off-by: Nicolas Belin <nbelin@baylibre.com>
> ---
> .../devicetree/bindings/display/bridge/ite,it66121.yaml | 3 +++
> 1 file changed, 3 insertions(+)
>
Acked-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 0/3] drm: bridge: it66121: Add audio support
2022-03-16 13:57 ` Nicolas Belin
@ 2022-03-24 8:53 ` Neil Armstrong
-1 siblings, 0 replies; 18+ messages in thread
From: Neil Armstrong @ 2022-03-24 8:53 UTC (permalink / raw)
To: robert.foss, andrzej.hajda, Nicolas Belin
Cc: devicetree, jernej.skrabec, jonas, Neil Armstrong, linux-kernel,
dri-devel, Laurent.pinchart
Hi,
On Wed, 16 Mar 2022 14:57:30 +0100, Nicolas Belin wrote:
> This patch series adds the audio support on the it66121 HDMI bridge.
>
> Patch 1 updates the ITE 66121 HDMI bridge bindings in order to support
> audio.
>
> Patch 2 sets the register page length or window length of the ITE 66121
> HDMI bridge to 0x100 according to the documentation.
>
> [...]
Thanks, Applied to https://anongit.freedesktop.org/git/drm/drm-misc.git (drm-misc-next)
[1/3] dt-bindings: display: bridge: it66121: Add audio support
https://cgit.freedesktop.org/drm/drm-misc/commit/?id=cc2f2df48a17980e815fa09a43b81861f7ebad85
[2/3] drm: bridge: it66121: Fix the register page length
https://cgit.freedesktop.org/drm/drm-misc/commit/?id=003a1bd6a2a55c16cb2451153533dbedb12bebec
[3/3] drm: bridge: it66121: Add audio support
https://cgit.freedesktop.org/drm/drm-misc/commit/?id=e0fd83dbe92426e4f09b01111d260d2a7dc72fdb
--
Neil
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 0/3] drm: bridge: it66121: Add audio support
@ 2022-03-24 8:53 ` Neil Armstrong
0 siblings, 0 replies; 18+ messages in thread
From: Neil Armstrong @ 2022-03-24 8:53 UTC (permalink / raw)
To: robert.foss, andrzej.hajda, Nicolas Belin
Cc: Neil Armstrong, linux-kernel, jonas, devicetree, dri-devel,
Laurent.pinchart, jernej.skrabec
Hi,
On Wed, 16 Mar 2022 14:57:30 +0100, Nicolas Belin wrote:
> This patch series adds the audio support on the it66121 HDMI bridge.
>
> Patch 1 updates the ITE 66121 HDMI bridge bindings in order to support
> audio.
>
> Patch 2 sets the register page length or window length of the ITE 66121
> HDMI bridge to 0x100 according to the documentation.
>
> [...]
Thanks, Applied to https://anongit.freedesktop.org/git/drm/drm-misc.git (drm-misc-next)
[1/3] dt-bindings: display: bridge: it66121: Add audio support
https://cgit.freedesktop.org/drm/drm-misc/commit/?id=cc2f2df48a17980e815fa09a43b81861f7ebad85
[2/3] drm: bridge: it66121: Fix the register page length
https://cgit.freedesktop.org/drm/drm-misc/commit/?id=003a1bd6a2a55c16cb2451153533dbedb12bebec
[3/3] drm: bridge: it66121: Add audio support
https://cgit.freedesktop.org/drm/drm-misc/commit/?id=e0fd83dbe92426e4f09b01111d260d2a7dc72fdb
--
Neil
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [3/3] drm: bridge: it66121: Add audio support
2022-03-16 13:57 ` Nicolas Belin
@ 2023-08-25 10:58 ` Nishanth Menon
-1 siblings, 0 replies; 18+ messages in thread
From: Nishanth Menon @ 2023-08-25 10:58 UTC (permalink / raw)
To: Nicolas Belin, Jai Luthra
Cc: narmstrong, andrzej.hajda, robert.foss, devicetree, jonas,
Andy . Hsieh, linux-kernel, jernej.skrabec, dri-devel,
Laurent.pinchart
On 14:57-20220316, Nicolas Belin wrote:
> Adding the audio support on the HDMI bridge for I2S only.
>
> Signed-off-by: Nicolas Belin <nbelin@baylibre.com>
> Signed-off-by: Andy.Hsieh <Andy.Hsieh@mediatek.com>
> Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
> ---
> drivers/gpu/drm/bridge/ite-it66121.c | 627 +++++++++++++++++++++++++++
> 1 file changed, 627 insertions(+)
>
> diff --git a/drivers/gpu/drm/bridge/ite-it66121.c b/drivers/gpu/drm/bridge/ite-it66121.c
> index 64912b770086..514989676d07 100644
> --- a/drivers/gpu/drm/bridge/ite-it66121.c
> +++ b/drivers/gpu/drm/bridge/ite-it66121.c
Not sure how, but I see this when HDMI is not connected on BeaglePlay
https://gist.github.com/nmenon/f3d4a34ec9b9d188fbefb65f94090bcb
Cc Jai Luthra
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [3/3] drm: bridge: it66121: Add audio support
@ 2023-08-25 10:58 ` Nishanth Menon
0 siblings, 0 replies; 18+ messages in thread
From: Nishanth Menon @ 2023-08-25 10:58 UTC (permalink / raw)
To: Nicolas Belin, Jai Luthra
Cc: devicetree, jernej.skrabec, jonas, dri-devel, narmstrong,
linux-kernel, robert.foss, Andy . Hsieh, andrzej.hajda,
Laurent.pinchart
On 14:57-20220316, Nicolas Belin wrote:
> Adding the audio support on the HDMI bridge for I2S only.
>
> Signed-off-by: Nicolas Belin <nbelin@baylibre.com>
> Signed-off-by: Andy.Hsieh <Andy.Hsieh@mediatek.com>
> Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
> ---
> drivers/gpu/drm/bridge/ite-it66121.c | 627 +++++++++++++++++++++++++++
> 1 file changed, 627 insertions(+)
>
> diff --git a/drivers/gpu/drm/bridge/ite-it66121.c b/drivers/gpu/drm/bridge/ite-it66121.c
> index 64912b770086..514989676d07 100644
> --- a/drivers/gpu/drm/bridge/ite-it66121.c
> +++ b/drivers/gpu/drm/bridge/ite-it66121.c
Not sure how, but I see this when HDMI is not connected on BeaglePlay
https://gist.github.com/nmenon/f3d4a34ec9b9d188fbefb65f94090bcb
Cc Jai Luthra
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2023-08-25 12:13 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-16 13:57 [PATCH 0/3] drm: bridge: it66121: Add audio support Nicolas Belin
2022-03-16 13:57 ` Nicolas Belin
2022-03-16 13:57 ` [PATCH 1/3] dt-bindings: display: " Nicolas Belin
2022-03-16 13:57 ` Nicolas Belin
2022-03-23 20:06 ` Rob Herring
2022-03-23 20:06 ` Rob Herring
2022-03-16 13:57 ` [PATCH 2/3] drm: bridge: it66121: Fix the register page length Nicolas Belin
2022-03-16 13:57 ` Nicolas Belin
2022-03-18 8:34 ` Neil Armstrong
2022-03-18 8:34 ` Neil Armstrong
2022-03-16 13:57 ` [PATCH 3/3] drm: bridge: it66121: Add audio support Nicolas Belin
2022-03-16 13:57 ` Nicolas Belin
2022-03-18 8:44 ` Neil Armstrong
2022-03-18 8:44 ` Neil Armstrong
2023-08-25 10:58 ` [3/3] " Nishanth Menon
2023-08-25 10:58 ` Nishanth Menon
2022-03-24 8:53 ` [PATCH 0/3] " Neil Armstrong
2022-03-24 8:53 ` Neil Armstrong
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.