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

Commit b650ad37 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: display: 9x35 display device tree"

parents e672a580 2883c58d

Documentation/devicetree/bindings/fb/mdss-qpic-panel.txt

+0 −12
Original line number Diff line number Diff line
@@ -8,12 +8,6 @@ Required properties: 
							resolution.

- qcom,mdss-pan-bpp:		Specifies the panel bits per pixel.

- qcom,refresh_rate:		Panel refresh rate

- vdd-supply:				Phandle for vdd regulator device node.

- avdd-supply:				Phandle for avdd regulator device node.

- qcom,cs-gpio:				Phandle for cs gpio device node.

- qcom,te-gpio:				Phandle for te gpio device node.

- qcom,rst-gpio:			Phandle for rst gpio device node.

- qcom,ad8-gpio:			Phandle for ad8 gpio device node.



Optional properties:

- label:					A string used as a descriptive name of the panel
@@ -24,12 +18,6 @@ Example: 
	qcom,mdss_lcdc_ili9341_qvga {

		compatible = "qcom,mdss-qpic-panel";

		label = "ili qvga lcdc panel";

		vdd-supply = <&pm8019_l11>;

		avdd-supply = <&pm8019_l14>;

		qcom,cs-gpio = <&msmgpio 21 0>;

		qcom,te-gpio = <&msmgpio 22 0>;

		qcom,rst-gpio = <&msmgpio 23 0>;

		qcom,ad8-gpio = <&msmgpio 20 0>;

		qcom,mdss-pan-res = <240 320>;

		qcom,mdss-pan-bpp = <18>;

		qcom,refresh_rate = <60>;

Documentation/devicetree/bindings/fb/mdss-qpic.txt

+14 −0
Original line number Diff line number Diff line
@@ -8,6 +8,13 @@ Required properties: 
- reg:					offset and length of the register set for the device.

- reg-names :			names to refer to register sets related to this device

- interrupts:			IRQ line

- vdd-supply:			Phandle for vdd regulator device node.

- avdd-supply:			Phandle for avdd regulator device node.

- qcom,cs-gpio:			Phandle for cs gpio device node.

- qcom,te-gpio:			Phandle for te gpio device node.

- qcom,rst-gpio:		Phandle for rst gpio device node.

- qcom,ad8-gpio:		Phandle for ad8 gpio device node.

- qcom,bl-gpio:			Phandle for backlight gpio device node.



Example:

	qcom,msm_qpic@f9ac0000 {
@@ -15,4 +22,11 @@ Example: 
		reg = <0xf9ac0000 0x24000>;

		reg-names = "qpic_base";

		interrupts = <0 251 0>;

		vdd-supply = <&pm8019_l11>;

		avdd-supply = <&pm8019_l14>;

		qcom,cs-gpio = <&msmgpio 21 0>;

		qcom,te-gpio = <&msmgpio 22 0>;

		qcom,rst-gpio = <&msmgpio 23 0>;

		qcom,ad8-gpio = <&msmgpio 20 0>;

		qcom,bl-gpio = <&msmgpio 84 0>;

	};

arch/arm/boot/dts/qcom/mdm9630-cdp.dts

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 


#include "mdm9630.dtsi"

#include "mdm9630-cdp.dtsi"

#include "mdm9630-display.dtsi"

#include "qpic-panel-ili-qvga.dtsi"



/ {

	model = "Qualcomm MDM 9630 CDP";

arch/arm/boot/dts/qcom/mdm9630-display.dtsi

0 → 100644
+27 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2014, 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.

 */



/ {

	qcom,msm_qpic@f9ac0000 {

		compatible = "qcom,mdss_qpic";

		reg = <0xf9ac0000 0x24000>;

		reg-names = "qpic_base";

		interrupts = <0 251 0>;

		vdd-supply = <&pmd9635_l6>;

		avdd-supply = <&pmd9635_l12>;

		qcom,cs-gpio = <&msmgpio 21 0>;

		qcom,te-gpio = <&msmgpio 22 0>;

		qcom,rst-gpio = <&msmgpio 23 0>;

		qcom,ad8-gpio = <&msmgpio 20 0>;

		qcom,bl-gpio = <&msmgpio 84 0>;

	};

};

arch/arm/boot/dts/qcom/qpic-panel-ili-qvga.dtsi

+1 −7
Original line number Diff line number Diff line 
/* Copyright (c) 2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2014, 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
@@ -14,12 +14,6 @@ 
	qcom,mdss_lcdc_ili9341_qvga {

		compatible = "qcom,mdss-qpic-panel";

		label = "ili qvga lcdc panel";

		vdd-supply = <&pm8019_l11>;

		avdd-supply = <&pm8019_l14>;

		qcom,cs-gpio = <&msmgpio 21 0>;

		qcom,te-gpio = <&msmgpio 22 0>;

		qcom,rst-gpio = <&msmgpio 23 0>;

		qcom,ad8-gpio = <&msmgpio 20 0>;

		qcom,mdss-pan-res = <240 320>;

		qcom,mdss-pan-bpp = <18>;

		qcom,refresh_rate = <60>;