Merge "ARM: dts: msm: decrease vertical pulse width for OSD display" (2ec18ec7) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm64/boot/dts/qcom/apq8009-robot-som-refboard.dts

+69 −5

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2018, The Linux Foundation. All rights reserved.
		* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -19,6 +19,7 @@
		#include "apq8009-audio-external_codec.dtsi"
		#include "msm8909-pm8916-camera.dtsi"
		#include "msm8909-pm8916-camera-sensor-robot-som.dtsi"
		#include "dsi-panel-osd-disp-fwvga-video.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. APQ8009 Robot SOM refboard";
		@@ -192,10 +193,6 @@
		vin-supply = <&otg_vreg_5p0>;
		};

		mdss_mdp: qcom,mdss_mdp@1a00000 {
		status = "disabled";
		};

		bluetooth: bt_qca9379 {
		compatible = "qca,qca9379";
		qca,bt-reset-gpio = <&msm_gpio 47 0>; /* BT_EN */
		@@ -372,3 +369,70 @@
		&ext_codec {
		status = "okay";
		};

		&rpm_bus {
		rpm-regulator-ldoa4 {
		status = "okay";
		pm8916_l4: regulator-l4 {
		regulator-min-microvolt = <2050000>;
		regulator-max-microvolt = <2050000>;
		qcom,init-voltage = <2050000>;
		regulator-always-on;
		status = "okay";
		};
		};
		};

		&mdss_dsi0_pll {
		status = "okay";
		};

		&mdss_mdp {
		qcom,mdss-pref-prim-intf = "dsi";
		status = "okay";
		};

		&dsi_osd_disp_fwvga_video {
		qcom,mdss-dsi-pwm-gpio = <&pm8916_mpps 4 0>;
		};

		&pmx_mdss {
		mdss_dsi_active: mdss_dsi_active {
		mux {
		pins = "gpio28", "gpio37";
		};
		};

		mdss_dsi_suspend: mdss_dsi_suspend {
		mux {
		pins = "gpio28", "gpio37";
		};
		};
		};

		&mdss_dsi0 {
		qcom,dsi-pref-prim-pan = <&dsi_osd_disp_fwvga_video>;

		pinctrl-names = "mdss_default", "mdss_sleep";
		pinctrl-0 = <&mdss_dsi_active &mdss_dsi_select_gpio>;
		pinctrl-1 = <&mdss_dsi_suspend &mdss_dsi_select_gpio>;

		qcom,platform-reset-gpio = <&msm_gpio 28 0>;
		qcom,platform-bklight-en-gpio = <&msm_gpio 37 0>;

		vdd-supply = <&pm8916_l17>;
		vddio-supply = <&pm8916_l6>;
		status = "okay";
		};

		&pm8916_mpps {
		pinctrl-names = "default";
		pinctrl-0 = <&ext_fep_wled_pwr_en_default>;
		ext_fep_wled_pwr_en_default: ext_fep_wled_pwr_en_default {
		pins = "mpp4"; /* MPP_4 */
		function = "digital"; /* Digital */
		output-high; /* Output */
		power-source = <1>;
		status = "okay";
		};
		};

arch/arm64/boot/dts/qcom/dsi-panel-osd-disp-fwvga-video.dtsi

+2 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2014-2019, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -28,7 +28,7 @@
		qcom,mdss-dsi-h-sync-skew = <0>;
		qcom,mdss-dsi-v-back-porch = <10>;
		qcom,mdss-dsi-v-front-porch = <10>;
		qcom,mdss-dsi-v-pulse-width = <20>;
		qcom,mdss-dsi-v-pulse-width = <5>;
		qcom,mdss-dsi-h-left-border = <0>;
		qcom,mdss-dsi-h-right-border = <0>;
		qcom,mdss-dsi-v-top-border = <0>;

arch/arm64/boot/dts/qcom/msm8909-pinctrl.dtsi

+16 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2014-2019, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -289,7 +289,7 @@
		};
		};

		pmx_mdss {
		pmx_mdss: pmx_mdss {
		mdss_dsi_active: mdss_dsi_active {
		mux {
		pins = "gpio25", "gpio37";
		@@ -343,6 +343,20 @@
		};
		};

		mdss_dsi_select_gpio: mdss_dsi_select_gpio {
		mux {
		pins = "gpio70";
		function = "gpio";
		};

		config {
		pins = "gpio70";
		drive-strength = <8>;
		bias-pull-down;
		output-low;
		};
		};

		spi0 {
		spi0_default: spi0_default {
		mux {

drivers/video/fbdev/msm/mdss_dsi_panel.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,7 @@ void mdss_dsi_panel_pwm_cfg(struct mdss_dsi_ctrl_pdata *ctrl)
		if (ctrl->pwm_bl == NULL \|\| IS_ERR(ctrl->pwm_bl)) {
		pr_err("%s: Error: lpg_chan=%d pwm request failed",
		__func__, ctrl->pwm_lpg_chan);
		ctrl->pwm_bl = NULL;
		}
		ctrl->pwm_enabled = 0;
		}