Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96a83b8f authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: enable display port audio support for Kona"

parents 3c1d860d e1ac495e

arch/arm64/boot/dts/qcom/kona-audio-overlay.dtsi

+4 −2
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ 
&kona_snd {

	qcom,model = "kona-mtp-snd-card";

	qcom,msm-mi2s-master = <1>, <1>, <1>;

	qcom,ext-disp-audio-rx = <1>;

	qcom,audio-routing =

		"AMIC1", "MIC BIAS1",

		"MIC BIAS1", "Analog Mic1",
@@ -233,8 +234,9 @@ 
	qcom,cdc-dmic01-gpios = <&cdc_dmic01_gpios>;

	qcom,cdc-dmic23-gpios = <&cdc_dmic23_gpios>;

	qcom,cdc-dmic45-gpios = <&cdc_dmic45_gpios>;

	asoc-codec  = <&stub_codec>, <&bolero>;

	asoc-codec-names = "msm-stub-codec.1", "bolero_codec";

	asoc-codec  = <&stub_codec>, <&bolero>, <&ext_disp_audio_codec>;

	asoc-codec-names = "msm-stub-codec.1", "bolero_codec",

			   "msm-ext-disp-audio-codec-rx";

	qcom,wsa-max-devs = <2>;

	qcom,wsa-devs = <&wsa881x_0211>, <&wsa881x_0212>,

			<&wsa881x_0213>, <&wsa881x_0214>;

drivers/gpu/drm/msm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ config DRM_MSM 
	select WANT_DEV_COREDUMP

	select SND_SOC_HDMI_CODEC if SND_SOC

	select SYNC_FILE

	select MSM_EXT_DISPLAY

	select PM_OPP

	default y

	help

drivers/platform/msm/msm_ext_display.c

+2 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.

 */



#define pr_fmt(fmt)	"%s: " fmt, __func__
@@ -14,6 +14,7 @@ 
#include <linux/types.h>

#include <linux/of_platform.h>

#include <linux/msm_ext_display.h>

#include <linux/extcon-provider.h>



struct msm_ext_disp_list {

	struct msm_ext_disp_init_data *data;