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

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

Merge "ARM: dts: msm: Add QPIC display configuration for mdmcalifornium"

parents fae5baf6 fa844b33
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@

#include "mdmcalifornium.dtsi"
#include "mdmcalifornium-pinctrl.dtsi"
#include "mdmcalifornium-display.dtsi"
#include "qpic-panel-ili-hvga.dtsi"

&blsp1_uart3 {
	status = "ok";
@@ -117,3 +119,13 @@
		qcom,fast-avg-setup = <0>;
	};
};

/* Display */
&mdss_qpic {
	pinctrl-names= "mdss_default", "mdss_sleep";
	pinctrl-0 = <&mdss_cs_active &mdss_te_active &mdss_rs_active
		&mdss_ad_active &mdss_bl_active>;
	pinctrl-1 = <&mdss_cs_sleep &mdss_te_sleep
		&mdss_rs_sleep &mdss_ad_sleep &mdss_bl_sleep>;
	status = "ok";
};
+35 −0
Original line number Diff line number Diff line
/* Copyright (c) 2015, 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
 * only version 2 as published by the Free Software Foundation.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 */

/ {
	mdss_qpic: qcom,msm_qpic@7980000 {
		compatible = "qcom,mdss_qpic";
		reg = <0x7980000 0x24000>;
		reg-names = "qpic_base";
		interrupts = <0 251 0>;

		qcom,msm-bus,name = "mdss_qpic";
		qcom,msm-bus,num-cases = <2>;
		qcom,msm-bus,num-paths = <1>;

		qcom,msm-bus,vectors-KBps =
			<91 512 0 0>,
			/* Voting for max b/w on PNOC bus for now */
			<91 512 400000 800000>;

		vdd-supply = <&pmdcalifornium_l6>;
		avdd-supply = <&pmdcalifornium_l12>;

		clock-names = "core_a_clk";
		clocks = <&clock_gcc clk_qpic_a_clk>;
	};
};
+132 −0
Original line number Diff line number Diff line
@@ -443,6 +443,138 @@
			};
		};

		mdss_cs_active: mdss_cs_active {
			mux {
				pins = "gpio21";
				function = "ebi2_lcd";
			};

			config {
				pins = "gpio21";
				drive-strength = <10>; /* 10 mA */
				bias-disable; /* NO pull */
			};
		};

		mdss_cs_sleep: mdss_cs_sleep {
			mux {
				pins = "gpio21";
				function = "ebi2_lcd";
			};

			config {
				pins = "gpio21";
				drive-strength = <2>; /* 2 mA */
				bias-disable; /* NO pull */
			};
		};

		mdss_te_active: mdss_te_active {
			mux {
				pins = "gpio22";
				function = "ebi2_lcd";
			};

			config {
				pins = "gpio22";
				drive-strength = <10>; /* 10 mA */
				bias-disable; /* NO pull */
			};
		};

		mdss_te_sleep: mdss_te_sleep {
			mux {
				pins = "gpio22";
				function = "ebi2_lcd";
			};

			config {
				pins = "gpio22";
				drive-strength = <2>; /* 2 mA */
				bias-disable; /* NO pull */
			};
		};

		mdss_rs_active: mdss_rs_active {
			mux {
				pins = "gpio23";
				function = "ebi2_lcd";
			};

			config {
				pins = "gpio23";
				drive-strength = <10>; /* 10 mA */
				bias-disable; /* NO pull */
			};
		};

		mdss_rs_sleep: mdss_rs_sleep {
			mux {
				pins = "gpio23";
				function = "ebi2_lcd";
			};

			config {
				pins = "gpio23";
				drive-strength = <2>; /* 2 mA */
				bias-disable; /* NO pull */
			};
		};

		mdss_ad_active: mdss_ad_active {
			mux {
				pins = "gpio20";
				function = "ebi2_a";
			};

			config {
				pins = "gpio20";
				drive-strength = <10>; /* 10 mA */
				bias-disable; /* NO pull */
			};
		};

		mdss_ad_sleep: mdss_ad_sleep {
			mux {
				pins = "gpio20";
				function = "ebi2_a";
			};

			config {
				pins = "gpio20";
				drive-strength = <2>; /* 2 mA */
				bias-disable; /* NO pull */
			};
		};

		mdss_bl_active: mdss_bl_active {
			mux {
				pins = "gpio68";
				function = "gpio";
			};

			config {
				pins = "gpio68";
				drive-strength = <10>; /* 10 mA */
				bias-disable; /* NO pull */
				output-high;
			};
		};

		mdss_bl_sleep: mdss_bl_sleep {
			mux {
				pins = "gpio68";
				function = "gpio";
			};

			config {
				pins = "gpio68";
				drive-strength = <2>; /* 2 mA */
				bias-disable; /* NO pull */
				output-low;
			};
		};

		i2s_mclk {
			i2s_mclk_sleep: i2s_mclk_sleep {
				mux {