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

Commit e8839caa 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 device nodes for 8909 QRD 1GB boards"

parents c5d08b6a 108a5be0

arch/arm/boot/dts/qcom/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -270,6 +270,8 @@ dtb-$(CONFIG_ARCH_MSM8916) += msm8952-qrd-skum.dtb \ 
       msm8952-mtp.dtb



dtb-$(CONFIG_ARCH_MSM8909) += msm8909-pm8916-mtp.dtb \

        msm8909-1gb-qrd-skuc.dtb \

        msm8909-1gb-qrd-skue.dtb \

	msm8909w-wtp.dtb \

	apq8009w-wtp.dtb \

	apq8009w-cdp.dtb \

arch/arm/boot/dts/qcom/batterydata-qrd-skuc-4v2-2000mah.dtsi

0 → 100644
+121 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2017, 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,qrd-skuc-4v2-2000mah-data {

	qcom,battery-type = "qrd_skuc_4v2_2000mah";

	qcom,batt-id-kohm = <0>;

	qcom,chg-term-ua = <100000>;

	qcom,default-rbatt-mohm = <157>;

	qcom,fcc-mah = <2000>;

	qcom,max-voltage-uv = <4200000>;

	qcom,rbatt-capacitive-mohm = <50>;

	qcom,v-cutoff-uv = <3400000>;

	qcom,flat-ocv-threshold-uv = <3800000>;



	qcom,fcc-temp-lut {

		qcom,lut-col-legend = <(-20) 0 25 40 60>;

		qcom,lut-data = <2028 2029 2031 2029 2024>;

	};



	qcom,ibat-acc-lut {

		qcom,lut-col-legend = <(-20) 0 25>;

		qcom,lut-row-legend = <0 250 500 1000>;

		qcom,lut-data = <1947 1989 1990>,

				<394 1844 1973>,

				<28 1566 1948>,

				<6 918 1869>;

	};



	qcom,pc-temp-ocv-lut {

		qcom,lut-col-legend = <(-20) 0 25 40 60>;

		qcom,lut-row-legend = <100 95 90 85 80>,

					<75 70 65 60 55>,

					<50 45 40 35 30>,

					<25 20 16 13 11>,

					<10 9 8 7 6>,

					<5 4 3 2 1>,

					<0>;

		qcom,lut-data = <4185 4182 4175 4170 4163>,

				<4093 4113 4114 4112 4109>,

				<4039 4075 4071 4065 4062>,

				<3955 4005 4016 4017 4018>,

				<3915 3954 3972 3980 3979>,

				<3879 3927 3949 3948 3944>,

				<3848 3896 3919 3917 3913>,

				<3823 3864 3890 3889 3886>,

				<3803 3837 3856 3860 3857>,

				<3785 3814 3819 3820 3818>,

				<3769 3796 3799 3799 3797>,

				<3754 3785 3786 3785 3783>,

				<3740 3776 3777 3775 3773>,

				<3725 3769 3772 3769 3765>,

				<3710 3759 3767 3762 3755>,

				<3696 3746 3757 3749 3734>,

				<3677 3725 3739 3730 3715>,

				<3657 3707 3715 3708 3694>,

				<3636 3695 3693 3686 3674>,

				<3618 3687 3685 3679 3668>,

				<3604 3682 3683 3678 3667>,

				<3586 3676 3681 3676 3666>,

				<3565 3669 3677 3673 3664>,

				<3538 3660 3672 3669 3659>,

				<3505 3644 3662 3659 3648>,

				<3465 3615 3637 3633 3619>,

				<3420 3561 3585 3581 3566>,

				<3366 3485 3507 3505 3491>,

				<3292 3392 3405 3403 3389>,

				<3177 3269 3273 3267 3247>,

				<3000 3000 3000 3000 3000>;

	};



	qcom,rbatt-sf-lut {

		qcom,lut-col-legend = <(-20) 0 25 40 60>;

		qcom,lut-row-legend = <100 95 90 85 80>,

					<75 70 65 60 55>,

					<50 45 40 35 30>,

					<25 20 16 13 11>,

					<10 9 8 7 6>,

					<5 4 3 2 1>,

					<0>;

		qcom,lut-data = <1306 287 100 80 72>,

				<1306 287 100 80 72>,

				<1279 308 104 82 73>,

				<1187 296 105 83 74>,

				<1167 293 109 87 75>,

				<1147 300 115 88 77>,

				<1135 295 121 92 80>,

				<1140 290 128 98 83>,

				<1145 289 123 102 87>,

				<1156 289 103 84 75>,

				<1175 294 101 81 74>,

				<1203 305 103 83 75>,

				<1240 320 106 85 77>,

				<1286 337 110 88 79>,

				<1346 355 116 89 80>,

				<1424 375 118 88 76>,

				<1520 392 121 88 76>,

				<1585 409 124 91 78>,

				<1600 425 122 90 77>,

				<1470 402 117 88 77>,

				<1520 414 120 90 78>,

				<1614 429 125 94 80>,

				<1799 447 132 97 82>,

				<2021 465 141 101 83>,

				<2321 483 151 104 83>,

				<2785 493 155 105 81>,

				<3481 491 154 107 84>,

				<4527 503 153 109 88>,

				<6542 563 152 111 91>,

				<12962 745 165 118 95>,

				<194170 31358 37864 86058 77785>;

	};

};

arch/arm/boot/dts/qcom/batterydata-qrd-skue-4v35-2000mah.dtsi

0 → 100644
+121 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2017, 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,qrd-skue-4v35-2000mah-data {

	qcom,battery-type = "qrd_skue_4v35_2000mah";

	qcom,batt-id-kohm = <0>;

	qcom,chg-term-ua = <100000>;

	qcom,default-rbatt-mohm = <148>;

	qcom,fcc-mah = <2000>;

	qcom,max-voltage-uv = <4350000>;

	qcom,rbatt-capacitive-mohm = <50>;

	qcom,v-cutoff-uv = <3400000>;

	qcom,flat-ocv-threshold-uv = <3800000>;



	qcom,fcc-temp-lut {

		qcom,lut-col-legend = <(-20) 0 25 40 60>;

		qcom,lut-data = <2084 2082 2080 2073 2064>;

	};



	qcom,ibat-acc-lut {

		qcom,lut-col-legend = <(-20) 0 25>;

		qcom,lut-row-legend = <0 250 500 1000>;

		qcom,lut-data = <2020 2060 2038>,

				<514 1883 2019>,

				<87 1619 1999>,

				<6 1036 1942>;

	};



	qcom,pc-temp-ocv-lut {

		qcom,lut-col-legend = <(-20) 0 25 40 60>;

		qcom,lut-row-legend = <100 95 90 85 80>,

					<75 70 65 60 55>,

					<50 45 40 35 30>,

					<25 20 16 13 11>,

					<10 9 8 7 6>,

					<5 4 3 2 1>,

					<0>;

		qcom,lut-data = <4332 4331 4326 4322 4314>,

				<4235 4255 4257 4254 4250>,

				<4168 4195 4198 4196 4192>,

				<4107 4142 4142 4140 4136>,

				<4058 4090 4090 4088 4084>,

				<3971 4039 4044 4039 4035>,

				<3925 3963 3986 3992 3990>,

				<3889 3927 3953 3953 3951>,

				<3856 3892 3912 3914 3912>,

				<3830 3858 3867 3870 3868>,

				<3808 3829 3834 3835 3833>,

				<3790 3806 3811 3811 3810>,

				<3775 3788 3793 3794 3792>,

				<3760 3775 3780 3779 3778>,

				<3746 3764 3769 3765 3758>,

				<3730 3749 3757 3749 3735>,

				<3711 3730 3739 3730 3715>,

				<3693 3715 3715 3708 3693>,

				<3674 3706 3692 3684 3671>,

				<3656 3699 3688 3679 3668>,

				<3646 3695 3686 3678 3667>,

				<3633 3692 3685 3677 3666>,

				<3617 3686 3683 3676 3664>,

				<3597 3680 3680 3673 3661>,

				<3573 3667 3672 3665 3651>,

				<3542 3643 3647 3641 3622>,

				<3500 3603 3602 3598 3577>,

				<3440 3545 3540 3539 3520>,

				<3347 3463 3458 3463 3434>,

				<3189 3340 3337 3345 3302>,

				<3000 3106 3000 3000 3000>;

	};



	qcom,rbatt-sf-lut {

		qcom,lut-col-legend = <(-20) 0 25 40 60>;

		qcom,lut-row-legend = <100 95 90 85 80>,

					<75 70 65 60 55>,

					<50 45 40 35 30>,

					<25 20 16 13 11>,

					<10 9 8 7 6>,

					<5 4 3 2 1>,

					<0>;

		qcom,lut-data = <1410 265 100 84 79>,

				<1408 265 100 84 79>,

				<1342 268 101 85 79>,

				<1273 273 103 87 80>,

				<1243 276 106 88 81>,

				<1164 286 112 92 82>,

				<1164 268 115 94 84>,

				<1173 268 123 98 88>,

				<1189 264 122 102 90>,

				<1212 265 109 96 86>,

				<1242 268 101 87 80>,

				<1276 276 102 87 79>,

				<1314 287 104 90 81>,

				<1358 302 106 93 84>,

				<1411 318 109 93 83>,

				<1485 336 110 90 79>,

				<1584 357 110 91 80>,

				<1693 396 110 91 81>,

				<1720 421 108 89 78>,

				<1960 465 110 89 80>,

				<2175 494 112 91 81>,

				<2445 530 114 94 83>,

				<2825 573 119 96 86>,

				<3334 629 125 99 89>,

				<4062 689 130 100 89>,

				<5168 783 129 99 83>,

				<6923 916 132 99 85>,

				<10172 1160 145 105 90>,

				<16692 1530 169 119 103>,

				<104534 2708 230 145 150>,

				<279842 43438 178115 106625 131239>;

	};

};

arch/arm/boot/dts/qcom/msm8909-qrd-skuc.dtsi

+39 −90
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2017, 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
@@ -11,50 +11,12 @@ 
 */



#include "msm8909-qrd.dtsi"

#include "msm8909-camera-sensor-skuc.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM8909 QRD SKUC";

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

};



&tlmm_pinmux {

	ap3426_int_pin {

		qcom,pins = <&gp 94>;

		qcom,pin-func = <0>;

		qcom,num-grp-pins = <1>;

		label = "ap3426-irq";

		ap3426_default: ap3426_default {

			drive-strength = <6>;

			bias-pull-up;

		};

		ap3426_sleep: ap3426_sleep {

			drive-strength = <2>;

			bias-pull-down;

		};

	};



	bma2x2_int1_pin {

		qcom,pins = <&gp 96>;

		qcom,num-grp-pins = <1>;

		label = "bma2x2_int1_pin";

		bma2x2_int1_default: int1_default {

			drive-strength = <6>;

			bias-pull-up;

		};

	};



	bma2x2_int2_pin {

		qcom,pins = <&gp 65>;

		qcom,num-grp-pins = <1>;

		label = "bma2x2_int2_pin";

		bma2x2_int2_default: int2_default {

			drive-strength = <6>;

			bias-pull-up;

		};

	};

};



&soc {

	i2c@78b9000 { /* BLSP1 QUP5 */

		focaltech@38 {
@@ -94,47 +56,6 @@ 


	};



	i2c@78b5000 { /* BLSP1 QUP1 */

		di@1e {

			compatible = "di,ap3426";

			reg = <0x1e>;

			vdd-supply = <&pm8909_l17>;

			vio-supply = <&pm8909_l6>;

			interrupt-parent = <&msm_gpio>;

			interrupts = <94 0x2002>;

			pinctrl-names = "default","sleep";

			pinctrl-0 = <&ap3426_default>;

			pinctrl-1 = <&ap3426_sleep>;

			di,irq-gpio = <&msm_gpio 94 0x2002>;

			di,als-cal = <94>;

			di,als-gain = <0>;

			di,als-persist = <1>;

			di,ps-gain = <1>;

			di,ps-persist = <2>;

			di,ps-led-driver = <3>;

			di,ps-mean-time = <0>;

			di,ps-integrated-time = <0>;

			di,ps-distance-table = <887 282 111 78 53 46>;

			di,als-sensitivity = <50>;

			di,wakeup-threshold = <4>;

		};



		bosch@18 { /* Accelerometer sensor */

			compatible = "bosch,bma2x2";

			reg = <0x18>;

			pinctrl-names = "default";

			pinctrl-0 = <&bma2x2_int1_default &bma2x2_int2_default>;

			interrupt-parent = <&msm_gpio>;

			interrupts = <96 0x2002>;

			vdd-supply = <&pm8909_l17>;

			vio-supply = <&pm8909_l6>;

			bosch,init-interval = <200>;

			bosch,place = <5>;

			bosch,gpio-int1 = <&msm_gpio 96 0x2002>;

			bosch,gpio-int2 = <&msm_gpio 65 0x2002>;

		};

	};



	gen-vkeys {

		compatible = "qcom,gen-vkeys";

		label = "ft5x06_ts";
@@ -283,18 +204,46 @@ 
};



&dsi_ili9806e_fwvga_video {

	qcom,mdss-dsi-pwm-gpio = <&pm8909_mpps 2 0>;

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

	qcom,cont-splash-enabled;

};



&pmx_mdss {

	qcom,num-grp-pins = <1>;

	qcom,pins = <&gp 25>;

&msm_gpio {

	pmx_mdss {

		mdss_dsi_active: mdss_dsi_active {

			mux {

				pins = "gpio25";

			};

			config {

				pins = "gpio25";

			};

		};

		mdss_dsi_suspend: mdss_dsi_suspend {

			mux {

				pins = "gpio25";

			};

			config {

				pins = "gpio25";

			};

		};

	};

	pmx_mdss_te {

		mdss_te_active: mdss_te_active {

			mux {

				pins = "gpio24";

			};

			config {

				pins = "gpio24";

			};

		};

		mdss_te_suspend: mdss_te_suspend {

			mux {

				pins = "gpio24";

			};

			config {

				pins = "gpio24";

			};

		};

	};



&pmx_mdss_te {

	qcom,num-grp-pins = <1>;

	qcom,pins = <&gp 24>;

};



&mdss_dsi0 {

arch/arm/boot/dts/qcom/msm8909-qrd-skue.dtsi

+40 −110
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2017, 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
@@ -17,55 +17,6 @@ 
	compatible = "qcom,msm8909-qrd", "qcom,msm8909", "qcom,qrd";

};



&tlmm_pinmux {

	ltr553_int_pin {

		qcom,pins = <&gp 94>;

		qcom,pin-func = <0>;

		qcom,num-grp-pins = <1>;

		label = "ltr553-irq";

		ltr553_default: ltr553_default {

			drive-strength = <6>;

			bias-pull-up;

		};

		ltr553_sleep: ltr553_sleep {

			drive-strength = <2>;

			bias-pull-down;

		};



	};



	bma2x2_int1_pin {

		qcom,pins = <&gp 96>;

		qcom,num-grp-pins = <1>;

		label = "bma2x2_int1_pin";

		bma2x2_int1_default: int1_default {

			  drive-strength = <6>;

			  bias-pull-up;

		};

	};



	bma2x2_int2_pin {

		qcom,pins = <&gp 65>;

		qcom,num-grp-pins = <1>;

		label = "bma2x2_int2_pin";

		bma2x2_int2_default: int2_default {

			  drive-strength = <6>;

			  bias-pull-up;

		};

	};



	hall_int_pin {

		qcom,pins = <&gp 36>;

		qcom,pin-func = <0>;

		qcom,num-grp-pins = <1>;

		label = "hall-irq";

		hall_sensor_int_default: hall_sensor_int_default {

			drive-strength = <6>;

			bias-pull-up;

		};

	};

};



&soc {

	i2c@78b9000 { /* BLSP1 QUP5 */

		focaltech@38 {
@@ -157,55 +108,6 @@ 
		qcom,y-offset = <0>;

	};



	i2c@78b5000 { /* BLSP1 QUP1 */

		liteon@23 {

			compatible = "liteon,ltr553";

			reg = <0x23>;

			vdd-supply = <&pm8909_l17>;

			vio-supply = <&pm8909_l6>;

			interrupt-parent = <&msm_gpio>;

			interrupts = <94 0x2002>;

			pinctrl-names = "default","sleep";

			pinctrl-0 = <&ltr553_default>;

			pinctrl-1 = <&ltr553_sleep>;

			liteon,irq-gpio = <&msm_gpio 94 0x2002>;

			liteon,als-ps-persist = <0>;

			liteon,ps-led = <0x7f>;

			liteon,ps-pulses = <4>;

			liteon,wakeup-threshold = <4>;

			liteon,als-integration-time = <0>;

			liteon,ps-distance-table = <1376 566 343 287 200 170 155>;

		};



		bosch@18 { /* Accelerometer sensor */

			compatible = "bosch,bma2x2";

			reg = <0x18>;

			pinctrl-names = "default";

			pinctrl-0 = <&bma2x2_int1_default &bma2x2_int2_default>;

			interrupt-parent = <&msm_gpio>;

			interrupts = <96 0x2002>;

			vdd-supply = <&pm8909_l17>;

			vio-supply = <&pm8909_l6>;

			bosch,init-interval = <200>;

			bosch,place = <4>;

			bosch,gpio-int1 = <&msm_gpio 96 0x2002>;

			bosch,gpio-int2 = <&msm_gpio 65 0x2002>;

		};

	};



	hall {

		compatible = "hall-switch";

		pinctrl-names = "default";

		pinctrl-0 = <&hall_sensor_int_default>;

		interrupt-parent = <&msm_gpio>;

		interrupts = <36 0x2003>;

		vddio-supply = <&pm8909_l5>;

		linux,gpio-int = <&msm_gpio 36 0x1>;

		linux,wakeup;

		linux,min-uv = <1650000>;

		linux,max-uv = <3300000>;

	};



	sound {

		compatible = "qcom,msm8x16-audio-codec";

		qcom,model = "msm8909-skue-snd-card";
@@ -302,7 +204,7 @@ 
	interrupt-map = <0 &intc 0 125 0

			1 &intc 0 221 0>;

	interrupt-names = "hc_irq", "pwr_irq";

	delete-property/ cd-gpios;

	/delete-property/ cd-gpios;

};



&pm8909_mpps {
@@ -336,18 +238,46 @@ 
};



&dsi_hx8379c_fwvga_video {

	qcom,mdss-dsi-pwm-gpio = <&pm8909_mpps 2 0>;

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

	qcom,cont-splash-enabled;

};



&pmx_mdss {

	qcom,num-grp-pins = <1>;

	qcom,pins = <&gp 25>;

&msm_gpio {

	pmx_mdss {

		mdss_dsi_active: mdss_dsi_active {

			mux {

				pins = "gpio25";

			};

			config {

				pins = "gpio25";

			};

		};

		mdss_dsi_suspend: mdss_dsi_suspend {

			mux {

				pins = "gpio25";

			};

			config {

				pins = "gpio25";

			};

		};

	};

	pmx_mdss_te {

		mdss_te_active: mdss_te_active {

			mux {

				pins = "gpio24";

			};

			config {

				pins = "gpio24";

			};

		};

		mdss_te_suspend: mdss_te_suspend {

			mux {

				pins = "gpio24";

			};

			config {

				pins = "gpio24";

			};

		};

	};



&pmx_mdss_te {

	qcom,num-grp-pins = <1>;

	qcom,pins = <&gp 24>;

};



&mdss_dsi0 {