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

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

Merge "msm: mdss: dp: fix HDCP 1.x state transitions"

parents ddc8181a 058c973e

Documentation/devicetree/bindings/fb/mdss-dp.txt

+50 −2
Original line number Diff line number Diff line
@@ -27,7 +27,46 @@ Required properties 
- qcom,aux-en-gpio:			Specifies the aux-channel enable gpio.

- qcom,aux-sel-gpio:			Specifies the aux-channel select gpio.

- qcom,usbplug-cc-gpio:			Specifies the usbplug orientation gpio.

- qcom,aux-cfg-settings:		An array that specifies the DP AUX configuration settings.

- qcom,aux-cfg0-settings:		Specifies the DP AUX configuration 0 settings. The first

					entry in this array corresponds to the register offset

					within DP AUX, while the remaining entries indicate the

					programmable values.

- qcom,aux-cfg1-settings:		Specifies the DP AUX configuration 1 settings. The first

					entry in this array corresponds to the register offset

					within DP AUX, while the remaining entries indicate the

					programmable values.

- qcom,aux-cfg2-settings:		Specifies the DP AUX configuration 2 settings. The first

					entry in this array corresponds to the register offset

					within DP AUX, while the remaining entries indicate the

					programmable values.

- qcom,aux-cfg3-settings:		Specifies the DP AUX configuration 3 settings. The first

					entry in this array corresponds to the register offset

					within DP AUX, while the remaining entries indicate the

					programmable values.

- qcom,aux-cfg4-settings:		Specifies the DP AUX configuration 4 settings. The first

					entry in this array corresponds to the register offset

					within DP AUX, while the remaining entries indicate the

					programmable values.

- qcom,aux-cfg5-settings:		Specifies the DP AUX configuration 5 settings. The first

					entry in this array corresponds to the register offset

					within DP AUX, while the remaining entries indicate the

					programmable values.

- qcom,aux-cfg6-settings:		Specifies the DP AUX configuration 6 settings. The first

					entry in this array corresponds to the register offset

					within DP AUX, while the remaining entries indicate the

					programmable values.

- qcom,aux-cfg7-settings:		Specifies the DP AUX configuration 7 settings. The first

					entry in this array corresponds to the register offset

					within DP AUX, while the remaining entries indicate the

					programmable values.

- qcom,aux-cfg8-settings:		Specifies the DP AUX configuration 8 settings. The first

					entry in this array corresponds to the register offset

					within DP AUX, while the remaining entries indicate the

					programmable values.

- qcom,aux-cfg9-settings:		Specifies the DP AUX configuration 9 settings. The first

					entry in this array corresponds to the register offset

					within DP AUX, while the remaining entries indicate the

					programmable values.



Optional properties:

- qcom,<type>-supply-entries:		A node that lists the elements of the supply used by the
@@ -87,7 +126,16 @@ Example: 
			"core_aux_clk", "core_cfg_ahb_clk", "ctrl_link_clk",

			"ctrl_link_iface_clk", "ctrl_crypto_clk", "ctrl_pixel_clk";



		qcom,aux-cfg-settings = [00 13 00 10 0a 26 0a 03 8b 03];

		qcom,aux-cfg0-settings = [1c 00];

		qcom,aux-cfg1-settings = [20 13 23 1d];

		qcom,aux-cfg2-settings = [24 00];

		qcom,aux-cfg3-settings = [28 00];

		qcom,aux-cfg4-settings = [2c 0a];

		qcom,aux-cfg5-settings = [30 26];

		qcom,aux-cfg6-settings = [34 0a];

		qcom,aux-cfg7-settings = [38 03];

		qcom,aux-cfg8-settings = [3c bb];

		qcom,aux-cfg9-settings = [40 03];

		qcom,logical2physical-lane-map = [02 03 01 00];

		qcom,phy-register-offset = <0x4>;

		qcom,max-pclk-frequency-khz = <593470>;

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

+10 −1
Original line number Diff line number Diff line
@@ -502,7 +502,16 @@ 


		qcom,msm_ext_disp = <&msm_ext_disp>;



		qcom,aux-cfg-settings = [00 13 00 10 0a 26 0a 03 8b 03];

		qcom,aux-cfg0-settings = [1c 00];

		qcom,aux-cfg1-settings = [20 13 23 1d];

		qcom,aux-cfg2-settings = [24 00];

		qcom,aux-cfg3-settings = [28 00];

		qcom,aux-cfg4-settings = [2c 0a];

		qcom,aux-cfg5-settings = [30 26];

		qcom,aux-cfg6-settings = [34 0a];

		qcom,aux-cfg7-settings = [38 03];

		qcom,aux-cfg8-settings = [3c bb];

		qcom,aux-cfg9-settings = [40 03];

		qcom,logical2physical-lane-map = [02 03 01 00];



		qcom,core-supply-entries {

arch/arm/boot/dts/qcom/sdm660-mdss.dtsi

+10 −1
Original line number Diff line number Diff line
@@ -505,7 +505,16 @@ 


		qcom,msm_ext_disp = <&msm_ext_disp>;



		qcom,aux-cfg-settings = [00 13 00 00 0a 28 0a 03 b7 03];

		qcom,aux-cfg0-settings = [20 00];

		qcom,aux-cfg1-settings = [24 13 23 1d];

		qcom,aux-cfg2-settings = [28 00];

		qcom,aux-cfg3-settings = [2c 00];

		qcom,aux-cfg4-settings = [30 0a];

		qcom,aux-cfg5-settings = [34 28];

		qcom,aux-cfg6-settings = [38 0a];

		qcom,aux-cfg7-settings = [3c 03];

		qcom,aux-cfg8-settings = [40 b7];

		qcom,aux-cfg9-settings = [44 03];

		qcom,logical2physical-lane-map = [00 01 02 03];

		qcom,phy-register-offset = <0x4>;

		qcom,max-pclk-frequency-khz = <300000>;

drivers/video/fbdev/msm/mdss_dp.c

+294 −81

File changed.

Preview size limit exceeded, changes collapsed.

drivers/video/fbdev/msm/mdss_dp.h

+110 −6

File changed.

Preview size limit exceeded, changes collapsed.