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

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

Merge "Revert "ARM: dts: msm: enable SPI display for MSM8909w""

parents 25f4039f 2f34c3ae

arch/arm/boot/dts/qcom/msm8909-mdss-panels.dtsi

+2 −3
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include "dsi-panel-auo-qvga-cmd.dtsi"

#include "dsi-panel-auo-cx-qvga-cmd.dtsi"

#include "dsi-panel-390p-auo-cmd.dtsi"

#include "spi-panel-st7789v2-qvga-cmd.dtsi"



&soc {

	dsi_panel_pwr_supply: dsi_panel_pwr_supply {
@@ -56,8 +55,8 @@ 
		qcom,panel-supply-entry@0 {

			reg = <0>;

			qcom,supply-name = "vdd";

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

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

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

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

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

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

		};

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

+0 −23
Original line number Diff line number Diff line
@@ -153,29 +153,6 @@ 
				00 c0 00 00 00 00 00 01 bb];

		};

	};



	mdss_spi: qcom,mdss_spi {

			compatible = "qcom,mdss-spi-display";

			label = "mdss spi panel";



			qcom,mdss-fb-map = <&mdss_fb0>;

			qcom,mdss-mdp = <&mdss_mdp>;

			vdd-supply = <&pm8909_l17>;

			vddio-supply = <&pm8909_l6>;



			qcom,panel-supply-entries {

			#address-cells = <1>;

			#size-cells = <0>;

				qcom,panel-supply-entry@0 {

					reg = <0>;

					qcom,supply-name = "vdd";

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

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

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

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

				};

			};

	};

};



#include "msm8909-mdss-panels.dtsi"

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

+2 −2
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ 
		pmx_mdss {

			mdss_dsi_active: mdss_dsi_active {

				mux {

					pins = "gpio25", "gpio37", "gpio59";

					pins = "gpio25", "gpio37";

					function = "gpio";

				};
@@ -302,7 +302,7 @@ 


			mdss_dsi_suspend: mdss_dsi_suspend {

				mux {

					pins = "gpio25", "gpio37", "gpio59";

					pins = "gpio25", "gpio37";

					function = "gpio";

				};

arch/arm/boot/dts/qcom/msm8909.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -1341,7 +1341,7 @@ 
		status = "disabled";

	};



	spi_4: spi@78b8000{ /* BLSP1 QUP4 */

	spi_4: spi@78B8000{ /* BLSP1 QUP4 */

		compatible = "qcom,spi-qup-v2";

		#address-cells = <1>;

		#size-cells = <0>;
@@ -1364,7 +1364,7 @@ 
		qcom,bam-consumer-pipe-index = <10>;

		qcom,bam-producer-pipe-index = <11>;

		qcom,master-id = <86>;

		status = "ok";

		status = "disabled";

	};



	dma_blsp1: qcom,sps-dma@7884000 { /* BLSP1 */

arch/arm/boot/dts/qcom/msm8909w-pm660-mtp.dtsi

+0 −30
Original line number Diff line number Diff line
@@ -20,16 +20,6 @@ 
		/delete-property/ qcom,mipi-csi-vdd-supply;

	};



	spi_4 {

		qcom,mdss_spi_client {

			reg = <0>;

			compatible = "qcom,mdss-spi-client";

			label = "MDSS SPI QUP4 CLIENT";

			dc-gpio = <&msm_gpio 59 0>;

			spi-max-frequency = <50000000>;

		};

	};



	i2c@78b9000 {

		synaptics@20 {

			/delete-property/ avdd-supply;
@@ -202,26 +192,6 @@ 
	qcom,panel-supply-entries = <&dsi_pm660_panel_pwr_supply>;

};



&spi_st7789v2_qvga_cmd {

	qcom,panel-supply-entries = <&dsi_pm660_panel_pwr_supply>;

	qcom,mdss-spi-bl-pmic-pwm-frequency = <100>;

	qcom,mdss-spi-bl-pmic-bank-select = <0>;

};



&mdss_spi {

	qcom,spi-pref-prim-pan = <&spi_st7789v2_qvga_cmd>;

	pinctrl-names = "mdss_default", "mdss_sleep";

	pinctrl-0 = <&mdss_te_active>;

	pinctrl-1 = <&mdss_te_suspend>;



	qcom,platform-te-gpio = <&msm_gpio 24 0>;

	qcom,platform-reset-gpio = <&msm_gpio 25 0>;

	qcom,platform-spi-dc-gpio = <&msm_gpio 59 0>;



	vdd-supply = <&pm660_l18>;

	vddio-supply = <&pm660_l11>;

};



&mdss_dsi{

	vdda-supply = <&pm660_l5>; /*1.2V*/

	vddio-supply = <&pm660_l12>; /*1.8V*/