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

Commit 84522d64 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "ARM: dts: msm: add default brightness for TRINKET target""

parents 38c95276 6e2e793a

Documentation/devicetree/bindings/drm/msm/mdss-dsi-panel.txt

+0 −2
Original line number Diff line number Diff line
@@ -187,8 +187,6 @@ Optional properties: 
					255 = default value.

- qcom,mdss-brightness-max-level:	Specifies the max brightness level supported.

					255 = default value.

- qcom,mdss-dsi-bl-default-level:	Specifies the default brightness level supported.

					"brightness_max_level" = default value.

- qcom,bl-update-flag:			A string that specifies controls for backlight update of the panel.

					"delay_until_first_frame" = Delay backlight update of the panel

					until the first frame is received from the HW.

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

+0 −2
Original line number Diff line number Diff line
@@ -306,7 +306,6 @@ 
	qcom,bl-pmic-pwm-period-usecs = <100>;

	qcom,mdss-dsi-bl-min-level = <1>;

	qcom,mdss-dsi-bl-max-level = <4095>;

	qcom,mdss-dsi-bl-default-level = <102>;

	qcom,platform-te-gpio = <&tlmm 89 0>;

	qcom,platform-reset-gpio = <&tlmm 90 0>;

};
@@ -318,7 +317,6 @@ 
	qcom,bl-pmic-pwm-period-usecs = <100>;

	qcom,mdss-dsi-bl-min-level = <1>;

	qcom,mdss-dsi-bl-max-level = <4095>;

	qcom,mdss-dsi-bl-default-level = <102>;

	qcom,platform-reset-gpio = <&tlmm 90 0>;

};

drivers/gpu/drm/msm/dsi-staging/dsi_panel.c

+0 −10
Original line number Diff line number Diff line
@@ -2212,16 +2212,6 @@ static int dsi_panel_parse_bl_config(struct dsi_panel *panel) 
		panel->bl_config.brightness_max_level = val;

	}



	rc = utils->read_u32(utils->data,

			"qcom,mdss-dsi-bl-default-level", &val);

	if (rc) {

		panel->bl_config.brightness_default_level =

			panel->bl_config.brightness_max_level;

		pr_debug("set default brightness to max level\n");

	} else {

		panel->bl_config.brightness_default_level = val;

	}



	if (panel->bl_config.type == DSI_BACKLIGHT_PWM) {

		rc = dsi_panel_parse_bl_pwm_config(panel);

		if (rc) {

drivers/gpu/drm/msm/dsi-staging/dsi_panel.h

+0 −1
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ struct dsi_backlight_config { 
	u32 bl_min_level;

	u32 bl_max_level;

	u32 brightness_max_level;

	u32 brightness_default_level;

	u32 bl_level;

	u32 bl_scale;

	u32 bl_scale_ad;

drivers/gpu/drm/msm/sde/sde_connector.c

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static int sde_backlight_setup(struct sde_connector *c_conn, 
	display = (struct dsi_display *) c_conn->display;

	bl_config = &display->panel->bl_config;

	props.max_brightness = bl_config->brightness_max_level;

	props.brightness = bl_config->brightness_default_level;

	props.brightness = bl_config->brightness_max_level;

	snprintf(bl_node_name, BL_NODE_NAME_SIZE, "panel%u-backlight",

							display_count);

	c_conn->bl_device = backlight_device_register(bl_node_name, dev->dev,