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

Commit 3ec099b4 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 a new device tree for msm8926 SKUG PVT"

parents dcc7ee19 1fb95d6b

arch/arm/boot/dts/qti/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ dtb-$(CONFIG_ARCH_MSM8226) += msm8226-sim.dtb \ 
	msm8926-1080p-mtp.dtb \

	msm8926-qrd.dtb \

	msm8926-qrd-skug.dtb \

	msm8926-qrd-skug-pvt.dtb \

	msm8226-v1-qrd-skuf.dtb \

	msm8226-v2-qrd-skuf.dtb \

	apq8026-v1-xpm.dtb \

arch/arm/boot/dts/qti/msm8926-qrd-skug-pvt.dts

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

 */



/dts-v1/;

#include "msm8926-qrd-skug.dtsi"



/ {

	model = "Qti MSM 8926 QRD SKUG PVT";

	compatible = "qcom,msm8926-qrd", "qcom,msm8926", "qcom,qrd";

	qcom,board-id = <0x2000b 5>;

};

arch/arm/boot/dts/qti/msm8926-qrd-skug.dts

+1 −90
Original line number Diff line number Diff line
@@ -11,99 +11,10 @@ 
 */



/dts-v1/;

#include "msm8926.dtsi"

#include "msm8226-qrd.dtsi"

#include "msm8926-camera-sensor-qrd.dtsi"

#include "msm8926-qrd-skug.dtsi"



/ {

	model = "Qualcomm MSM 8926 QRD SKUG";

	compatible = "qcom,msm8926-qrd", "qcom,msm8926", "qcom,qrd";

	qcom,board-id = <11 5>;

};
 


&soc {

	i2c@f9927000 { /* BLSP1 QUP5 */

		qcom,i2c-bus-freq = <100000>;

		focaltech@38 {

			compatible = "focaltech,5x06";

			reg = <0x38>;

			interrupt-parent = <&msmgpio>;

			interrupts = <17 0x2>;

			vdd-supply = <&pm8226_l19>;

			vcc_i2c-supply = <&pm8226_lvs1>;

			focaltech,name = "ft5336";

			focaltech,family-id = <0x14>;

			focaltech,reset-gpio = <&msmgpio 16 0x00>;

			focaltech,irq-gpio = <&msmgpio 17 0x00>;

			focaltech,display-coords = <0 0 720 1280>;

			focaltech,panel-coords = <0 0 720 1400>;

			focaltech,button-map= <139 102 158>;

			focaltech,no-force-update;

			focaltech,i2c-pull-up;

			focaltech,group-id = <1>;

			focaltech,hard-reset-delay-ms = <20>;

			focaltech,soft-reset-delay-ms = <200>;

			focaltech,num-max-touches = <5>;

			focaltech,fw-name = "ft_8926_qrd_fw.bin";

			focaltech,fw-delay-aa-ms = <30>;

			focaltech,fw-delay-55-ms = <30>;

			focaltech,fw-upgrade-id1 = <0x11>;

			focaltech,fw-upgrade-id2 = <0x11>;

			focaltech,fw-delay-readid-ms = <10>;

			focaltech,fw-delay-era-flsh-ms = <2000>;

			focaltech,fw-auto-cal;

			focaltech,ignore-id-check;

		};

	};



	gen-vkeys {

		compatible = "qcom,gen-vkeys";

		label = "ft5x06_ts";

		qcom,disp-maxx = <720>;

		qcom,disp-maxy = <1280>;

		qcom,panel-maxx = <720>;

		qcom,panel-maxy = <1404>;

		qcom,key-codes = <139 172 158>;

		qcom,y-offset = <0>;

	};



	gpio-leds {

		compatible = "gpio-leds";

		keypad-backlight {

			gpios = <&msmgpio 34 0>;

			label = "button-backlight";

			linux,default-trigger = "none";

		};

	};

};



&spmi_bus {

	qcom,pm8226@0 {

		qcom,leds@a100 {

			status = "disable";

			};

		};

};



&qrd_batterydata {

	qcom,rpull-up-kohm = <100>;

	qcom,vref-batt-therm = <1800000>;



	#include "batterydata-qrd-4v2-2000mah.dtsi"

};



&pm8226_bms {

	qcom,battery-data = <&qrd_batterydata>;

};



&pm8226_chg {

	qcom,battery-data = <&qrd_batterydata>;

};



&mdss_dsi0 {

	qcom,dsi-pref-prim-pan = <&dsi_ssd2080m_720_vid>;

};



&dsi_ssd2080m_720_vid {

	qcom,cont-splash-enabled;

};

arch/arm/boot/dts/qti/msm8926-qrd-skug.dtsi

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

 */



#include "msm8926.dtsi"

#include "msm8226-qrd.dtsi"

#include "msm8926-camera-sensor-qrd.dtsi"



&soc {

	i2c@f9927000 { /* BLSP1 QUP5 */

		qcom,i2c-bus-freq = <100000>;

		focaltech@38 {

			compatible = "focaltech,5x06";

			reg = <0x38>;

			interrupt-parent = <&msmgpio>;

			interrupts = <17 0x2>;

			vdd-supply = <&pm8226_l19>;

			vcc_i2c-supply = <&pm8226_lvs1>;

			focaltech,name = "ft5336";

			focaltech,family-id = <0x14>;

			focaltech,reset-gpio = <&msmgpio 16 0x00>;

			focaltech,irq-gpio = <&msmgpio 17 0x00>;

			focaltech,display-coords = <0 0 720 1280>;

			focaltech,panel-coords = <0 0 720 1400>;

			focaltech,button-map= <139 102 158>;

			focaltech,no-force-update;

			focaltech,i2c-pull-up;

			focaltech,group-id = <1>;

			focaltech,hard-reset-delay-ms = <20>;

			focaltech,soft-reset-delay-ms = <200>;

			focaltech,num-max-touches = <5>;

			focaltech,fw-name = "ft_8926_qrd_fw.bin";

			focaltech,fw-delay-aa-ms = <30>;

			focaltech,fw-delay-55-ms = <30>;

			focaltech,fw-upgrade-id1 = <0x11>;

			focaltech,fw-upgrade-id2 = <0x11>;

			focaltech,fw-delay-readid-ms = <10>;

			focaltech,fw-delay-era-flsh-ms = <2000>;

			focaltech,fw-auto-cal;

			focaltech,ignore-id-check;

		};

	};



	gen-vkeys {

		compatible = "qcom,gen-vkeys";

		label = "ft5x06_ts";

		qcom,disp-maxx = <720>;

		qcom,disp-maxy = <1280>;

		qcom,panel-maxx = <720>;

		qcom,panel-maxy = <1404>;

		qcom,key-codes = <139 172 158>;

		qcom,y-offset = <0>;

	};



	gpio-leds {

		compatible = "gpio-leds";

		keypad-backlight {

			gpios = <&msmgpio 34 0>;

			label = "button-backlight";

			linux,default-trigger = "none";

		};

	};

};



&spmi_bus {

	qcom,pm8226@0 {

		qcom,leds@a100 {

			status = "disable";

			};

		};

};



&qrd_batterydata {

	qcom,rpull-up-kohm = <100>;

	qcom,vref-batt-therm = <1800000>;



	#include "batterydata-qrd-4v2-2000mah.dtsi"

};



&pm8226_bms {

	qcom,battery-data = <&qrd_batterydata>;

};



&pm8226_chg {

	qcom,battery-data = <&qrd_batterydata>;

};



&mdss_dsi0 {

	qcom,dsi-pref-prim-pan = <&dsi_ssd2080m_720_vid>;

};



&dsi_ssd2080m_720_vid {

	qcom,cont-splash-enabled;

};