ANDROID: lt9611: Sync w/ Vinod's most recent lt9611 patches which enable HDMI audio

Vinod has reworked the lt9611 hdmi bridge support in preperation
to upstream it, allong with adding HDMI audio support.

This patch algins the android-mainline tree to match his v3 patches
that he has submitted upstream (see link).

Bug: 146449535
Fixes: 3599a06ba2 ("ANDROID: drm/bridge: Introduce LT9611 DSI to HDMI bridge")
Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: Iaed396f409a5a12effcb6a9d63834483e20a1d47
Link: https://lore.kernel.org/lkml/20200617105950.3165360-1-vkoul@kernel.org/
This commit is contained in:
John Stultz
2020-06-04 22:02:25 +00:00
parent 0cc1b4a3a8
commit f2ddade04b
4 changed files with 449 additions and 355 deletions

View File

@@ -483,9 +483,10 @@
status = "okay";
clock-frequency = <400000>;
hdmi-bridge@3b {
compatible = "lt,lt9611";
lt9611_codec: hdmi-bridge@3b {
compatible = "lontium,lt9611";
reg = <0x3b>;
#sound-dai-cells = <1>;
interrupts-extended = <&tlmm 84 IRQ_TYPE_EDGE_FALLING>;
@@ -780,6 +781,21 @@
};
};
hdmi-dai-link {
link-name = "HDMI Playback";
cpu {
sound-dai = <&q6afedai QUATERNARY_MI2S_RX>;
};
platform {
sound-dai = <&q6routing>;
};
codec {
sound-dai = <&lt9611_codec 0>;
};
};
slim-dai-link {
link-name = "SLIM Playback";
cpu {

View File

@@ -50,11 +50,16 @@ config DRM_DISPLAY_CONNECTOR
config DRM_LONTIUM_LT9611
tristate "Lontium LT9611 DSI/HDMI bridge"
select SND_SOC_HDMI_CODEC if SND_SOC
depends on OF
select DRM_PANEL_BRIDGE
select DRM_KMS_HELPER
select REGMAP_I2C
help
Lontium LT9611 DSI/HDMI bridge chip driver.
Driver for Lontium LT9611 DSI to HDMI bridge
chip driver that converts dual DSI and I2S to
HDMI signals
Please say Y if you have such hardware.
config DRM_LVDS_CODEC
tristate "Transparent LVDS encoders and decoders support"

View File

@@ -2,7 +2,7 @@
obj-$(CONFIG_DRM_CDNS_DSI) += cdns-dsi.o
obj-$(CONFIG_DRM_CHRONTEL_CH7033) += chrontel-ch7033.o
obj-$(CONFIG_DRM_DISPLAY_CONNECTOR) += display-connector.o
obj-$(CONFIG_DRM_LONTIUM_LT9611) += lt9611.o
obj-$(CONFIG_DRM_LONTIUM_LT9611) += lontium-lt9611.o
obj-$(CONFIG_DRM_LVDS_CODEC) += lvds-codec.o
obj-$(CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW) += megachips-stdpxxxx-ge-b850v3-fw.o
obj-$(CONFIG_DRM_NXP_PTN3460) += nxp-ptn3460.o