Merge "Merge remote-tracking branch 'quic/dev/msm-4.14-display' into msm-4.14" (f8a2ff32) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/arm64/boot/dts/qcom/sm8150-qrd.dtsi

+0 −29

Original line number	Diff line number	Diff line
		@@ -164,35 +164,6 @@
		};
		};

		&tlmm {
		display_panel_avdd_eldo_default: display_panel_avdd_eldo_default {
		mux {
		pins = "gpio130";
		function = "gpio";
		};
		config {
		pins = "gpio130";
		drive-strength = <8>;
		bias-disable = <0>;
		output-low;
		};
		};
		};

		&soc {
		display_panel_avdd_eldo: display-gpio-regulator@0 {
		compatible = "regulator-fixed";
		regulator-name = "display_panel_avdd_eldo";
		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <1800000>;
		regulator-enable-ramp-delay = <233>;
		gpio = <&tlmm 130 0>;
		enable-active-high;
		pinctrl-names = "default";
		pintctrl-0 = <&display_panel_avdd_eldo_default>;
		};
		};

		&dsi_panel_pwr_supply_vdd_no_labibb {
		qcom,panel-supply-entry@1 {
		qcom,supply-min-voltage = <1800000>;

+28 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,21 @@
		#include "dsi-panel-sw43404-amoled-dsc-wqhd-cmd.dtsi"
		#include <dt-bindings/clock/mdss-10nm-pll-clk.h>

		&tlmm {
		display_panel_avdd_eldo_default: display_panel_avdd_eldo_default {
		mux {
		pins = "gpio130";
		function = "gpio";
		};
		config {
		pins = "gpio130";
		drive-strength = <8>;
		bias-disable = <0>;
		output-low;
		};
		};
		};

		&soc {
		dsi_panel_pwr_supply: dsi_panel_pwr_supply {
		#address-cells = <1>;
		@@ -105,6 +120,18 @@
		};
		};

		display_panel_avdd_eldo: display-gpio-regulator@0 {
		compatible = "regulator-fixed";
		regulator-name = "display_panel_avdd_eldo";
		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <1800000>;
		regulator-enable-ramp-delay = <233>;
		gpio = <&tlmm 130 0>;
		enable-active-high;
		pinctrl-names = "default";
		pintctrl-0 = <&display_panel_avdd_eldo_default>;
		};

		dsi_sharp_4k_dsc_video_display: qcom,dsi-display@0 {
		label = "dsi_sharp_4k_dsc_video_display";
		qcom,display-type = "primary";
		@@ -315,6 +342,7 @@
		vddio-supply = <&pm855_l14>;
		lab-supply = <&lcdb_ldo_vreg>;
		ibb-supply = <&lcdb_ncp_vreg>;
		vdd-supply = <&display_panel_avdd_eldo>;

		qcom,dsi-display-list =
		<&dsi_sharp_4k_dsc_video_display

+10 −0

Original line number	Diff line number	Diff line
		@@ -71,6 +71,16 @@ config DRM_MSM_DSI_STAGING
		Interface and DSI stands for Display Serial Interface which powers
		the primary display of your mobile device.

		config DSI_PARSER
		bool "Enable DSI panel configuration parser"
		depends on DYNAMIC_DEBUG
		default y
		help
		Choose this option if you need text parser for a DSI panel
		configurations which can parse a given text file and get the
		panel configurations. Also, this module provides a set of APIs
		which can be used to get the parsed data.

		config DRM_MSM_DSI_PLL
		bool "Enable DSI PLL driver in MSM DRM"
		depends on DRM_MSM_DSI && COMMON_CLK

+1 −1

Original line number	Diff line number	Diff line
		@@ -4235,7 +4235,7 @@ static void dsi_display_setup(struct dsi_display *display)

		}

		display->display_type = of_get_property(pdev->dev.of_node,
		display->display_type = of_get_property(display->disp_node,
		"qcom,display-type", NULL);
		if (!display->display_type)
		display->display_type = "unknown";

+4 −4

Original line number	Diff line number	Diff line
		@@ -849,13 +849,13 @@ static const struct sde_irq_type sde_irq_map[] = {
		/* BEGIN MAP_RANGE: 352-383 INTF_2_TEAR INTR */
		/* irq_idx: 352-354 */
		{ SDE_IRQ_TYPE_INTF_TEAR_AUTO_REF, INTF_2,
		SDE_INTR_INTF_TEAR_AUTOREFRESH_DONE, 10},
		SDE_INTR_INTF_TEAR_AUTOREFRESH_DONE, 11},
		{ SDE_IRQ_TYPE_INTF_TEAR_WR_PTR, INTF_2,
		SDE_INTR_INTF_TEAR_WR_PTR, 10},
		SDE_INTR_INTF_TEAR_WR_PTR, 11},
		{ SDE_IRQ_TYPE_INTF_TEAR_RD_PTR, INTF_2,
		SDE_INTR_INTF_TEAR_RD_PTR, 10},
		SDE_INTR_INTF_TEAR_RD_PTR, 11},
		{ SDE_IRQ_TYPE_INTF_TEAR_TE_CHECK, INTF_2,
		SDE_INTR_INTF_TEAR_TE_DETECTED, 10},
		SDE_INTR_INTF_TEAR_TE_DETECTED, 11},
		/* irq_idx: 355 */
		{ SDE_IRQ_TYPE_INTF_TEAR_TEAR_CHECK, INTF_2,
		SDE_INTR_INTF_TEAR_TEAR_DETECTED, 11},