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

Commit 61a82b2a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: cec: Use CEC notifier framework in adapter driver"

parents fc6bb145 806fdaa4

Documentation/devicetree/bindings/display/msm/cec.txt

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ various audiovisual products in a user environment. 


Required properties:

- compatible: Must be "qcom,hdmi-cec".

- qcom,hdmi-dev: Phandle for the hdmi device node.

- interrupt-parent: Must be the hdmi interrupt controller.

- interrupts: Interrupt associated with cec.

- reg: Physical base address and length of the controller's registers.
@@ -41,6 +42,7 @@ Example: 
sde_hdmi_cec: qcom,hdmi-cec@c9a0000 {

	compatible = "qcom,hdmi-cec";

	label = "sde_hdmi_cec";

	qcom,hdmi-dev = <&sde_hdmi>;

	interrupt-parent = <&sde_hdmi_tx>;

	interrupts = <1 0>;

arch/arm/boot/dts/qcom/msm8998-sde-display.dtsi

+34 −0
Original line number Diff line number Diff line
@@ -34,6 +34,40 @@ 
		qcom,msm_ext_disp = <&msm_ext_disp>;

	};



	sde_hdmi_cec: qcom,hdmi-cec@c9a0000 {

		compatible = "qcom,hdmi-cec";

		label = "sde_hdmi_cec";

		qcom,hdmi-dev = <&sde_hdmi>;

		interrupt-parent = <&sde_hdmi_tx>;

		interrupts = <1 0>;



		reg = <0xc9a0000 0x50c>;

		reg-names = "hdmi_cec";



		clocks = <&clock_mmss clk_mmss_mnoc_ahb_clk>,

		       <&clock_mmss clk_mmss_mdss_ahb_clk>,

		       <&clock_mmss clk_mmss_mdss_hdmi_clk>;

		clock-names = "cec_mnoc_clk", "cec_iface_clk", "cec_core_clk";



		pinctrl-names = "cec_active", "cec_sleep";

		pinctrl-0 = <&mdss_hdmi_cec_active>;

		pinctrl-1 = <&mdss_hdmi_cec_suspend>;



		cec-gdsc-supply = <&gdsc_mdss>;

		qcom,platform-supply-entries {

			#address-cells = <1>;

			#size-cells = <0>;



			qcom,platform-supply-entry@0 {

				reg = <0>;

				qcom,supply-name = "cec-gdsc";

				qcom,supply-min-voltage = <0>;

				qcom,supply-max-voltage = <0>;

				qcom,supply-enable-load = <0>;

				qcom,supply-disable-load = <0>;

			};

		};

	};

};



&sde_kms {

arch/arm/boot/dts/qcom/msm8998-sde.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -175,6 +175,8 @@ 
		reg-names = "core_physical", "qfprom_physical", "hdcp_physical";

		interrupt-parent = <&sde_kms>;

		interrupts = <8 0>;

		interrupt-controller;

		#interrupt-cells = <1>;

		qcom,hdmi-tx-ddc-clk-gpio = <&tlmm 32 0>;

		qcom,hdmi-tx-ddc-data-gpio = <&tlmm 33 0>;

		qcom,hdmi-tx-hpd-gpio = <&tlmm 34 0>;
@@ -182,11 +184,9 @@ 
		pinctrl-names = "default", "sleep";

		pinctrl-0 = <&mdss_hdmi_hpd_active

			&mdss_hdmi_ddc_active

			&mdss_hdmi_cec_active

			&mdss_hdmi_5v_active>;

		pinctrl-1 = <&mdss_hdmi_hpd_suspend

			&mdss_hdmi_ddc_suspend

			&mdss_hdmi_cec_suspend

			&mdss_hdmi_5v_suspend>;

		hpd-gdsc-supply = <&gdsc_mdss>;

		qcom,supply-names = "hpd-gdsc";

arch/arm64/configs/msmcortex_mediabox-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -405,6 +405,7 @@ CONFIG_MSM_VIDC_VMEM=y 
CONFIG_MSM_VIDC_GOVERNORS=y

CONFIG_MSM_SDE_ROTATOR=y

CONFIG_MSM_SDE_ROTATOR_EVTLOG_DEBUG=y

CONFIG_MSM_SDE_HDMI_CEC=y

CONFIG_DVB_MPQ=m

CONFIG_DVB_MPQ_DEMUX=m

CONFIG_DVB_MPQ_MEDIA_BOX_DEMUX=y

arch/arm64/configs/msmcortex_mediabox_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -407,6 +407,7 @@ CONFIG_MSM_VIDC_VMEM=y 
CONFIG_MSM_VIDC_GOVERNORS=y

CONFIG_MSM_SDE_ROTATOR=y

CONFIG_MSM_SDE_ROTATOR_EVTLOG_DEBUG=y

CONFIG_MSM_SDE_HDMI_CEC=y

CONFIG_DVB_MPQ=m

CONFIG_DVB_MPQ_DEMUX=m

CONFIG_DVB_MPQ_MEDIA_BOX_DEMUX=y