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

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

Merge "defconfig: msm: Turn on ESOC configs"

parents d0c54cc6 670a1414

arch/arm/boot/dts/qcom/Makefile

+10 −1
Original line number Diff line number Diff line
@@ -59,7 +59,16 @@ dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-pmi8994-cdp.dtb \ 
	apq8096-v3.0-pmi8996-cdp.dtb \

	apq8096-v3.0-pmi8996-mtp.dtb \

	apq8096-v3.0-liquid.dtb \

	apq8096-v3.0-dragonboard.dtb

	apq8096-v3.0-dragonboard.dtb \

	apq8096-v3-pmi8994-mdm9x55-i2s-cdp.dtb \

	apq8096-v3-pmi8994-pm8004-mdm9x55-i2s-cdp.dtb \

	apq8096-v3-pmi8994-pm8004-pmk8001-mdm9x55-i2s-cdp.dtb \

	apq8096-v3-pmi8994-pmk8001-mdm9x55-i2s-cdp.dtb \

	apq8096-v3-pmi8996-mdm9x55-i2s-cdp.dtb \

	apq8096-v3-pmi8994-mdm9x55-i2s-mtp.dtb \

	apq8096-v3-pmi8994-mdm9x55-slimbus-mtp.dtb \

	apq8096-v3-pmi8996-mdm9x55-i2s-mtp.dtb \

	apq8096-v3-pmi8996-mdm9x55-slimbus-mtp.dtb



dtb-$(CONFIG_ARCH_MSMCOBALT) += msmcobalt-sim.dtb \

	msmcobalt-rumi.dtb

arch/arm/boot/dts/qcom/apq8096-v3-pmi8994-mdm9x55-i2s-cdp.dts

0 → 100644
+58 −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.

 */





/dts-v1/;



#include "apq8096-v3.dtsi"

#include "msm8996-cdp.dtsi"

#include "external-soc.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ 8096 v3 + PMI8994, MDM9x55 I2S CDP";

	compatible = "qcom,apq8096-cdp", "qcom,apq8096", "qcom,cdp";

	qcom,board-id = <1 2>;

};



&pil_modem {

	status = "disabled";

};



&mdm3 {

	pinctrl-names = "mdm_active", "mdm_suspend";

	pinctrl-0 = <&ap2mdm_active &mdm2ap_active>;

	pinctrl-1 = <&ap2mdm_sleep &mdm2ap_sleep>;

	interrupt-map = <0 &tlmm 108 0x3

			1 &tlmm 107 0x3

			2 &tlmm 112 0x3>;

	qcom,mdm2ap-errfatal-gpio = <&tlmm 108 0x00>;

	qcom,ap2mdm-errfatal-gpio = <&tlmm 109 0x00>;

	qcom,mdm2ap-status-gpio   = <&tlmm 106 0x00>;

	qcom,ap2mdm-status-gpio   = <&tlmm 107 0x00>;

	qcom,ap2mdm-soft-reset-gpio = <&pm8994_mpps 2 0>;

	qcom,ap2mdm-vddmin-gpio = <&tlmm 111 0x00>;

	qcom,mdm2ap-vddmin-gpio = <&tlmm 112 0x00>;

	status = "ok";

};



&pm8994_mpps {

	mpp@a100 { /* MPP 2*/

		/* MDM PON conrol*/

		qcom,mode = <1>;		/* Digital output */

		qcom,output-type = <0>;		/* CMOS logic */

		qcom,vin-sel = <2>;		/* S4 1.8V */

		qcom,src-sel = <0>;		/* Constant */

		qcom,master-en = <1>;		/* Enable GPIO */

		qcom,invert = <0>;

		status = "okay";

	};

};

arch/arm/boot/dts/qcom/apq8096-v3-pmi8994-mdm9x55-i2s-mtp.dts

0 → 100644
+58 −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.

 */





/dts-v1/;



#include "apq8096-v3.dtsi"

#include "msm8996-mtp.dtsi"

#include "external-soc.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ 8096 v3 + PMI8994, MDM9x55 I2S MTP";

	compatible = "qcom,apq8096-mtp", "qcom,apq8096", "qcom,mtp";

	qcom,board-id = <8 1>;

};



&pil_modem {

	status = "disabled";

};



&mdm3 {

	pinctrl-names = "mdm_active", "mdm_suspend";

	pinctrl-0 = <&ap2mdm_active &mdm2ap_active>;

	pinctrl-1 = <&ap2mdm_sleep &mdm2ap_sleep>;

	interrupt-map = <0 &tlmm 108 0x3

			1 &tlmm 107 0x3

			2 &tlmm 112 0x3>;

	qcom,mdm2ap-errfatal-gpio = <&tlmm 108 0x00>;

	qcom,ap2mdm-errfatal-gpio = <&tlmm 109 0x00>;

	qcom,mdm2ap-status-gpio   = <&tlmm 106 0x00>;

	qcom,ap2mdm-status-gpio   = <&tlmm 107 0x00>;

	qcom,ap2mdm-soft-reset-gpio = <&pm8994_mpps 2 0>;

	qcom,ap2mdm-vddmin-gpio = <&tlmm 111 0x00>;

	qcom,mdm2ap-vddmin-gpio = <&tlmm 112 0x00>;

	status = "ok";

};



&pm8994_mpps {

	mpp@a100 { /* MPP 2*/

		/* MDM PON conrol*/

		qcom,mode = <1>;		/* Digital output */

		qcom,output-type = <0>;		/* CMOS logic */

		qcom,vin-sel = <2>;		/* S4 1.8V */

		qcom,src-sel = <0>;		/* Constant */

		qcom,master-en = <1>;		/* Enable GPIO */

		qcom,invert = <0>;

		status = "okay";

	};

};

arch/arm/boot/dts/qcom/apq8096-v3-pmi8994-mdm9x55-slimbus-mtp.dts

0 → 100644
+58 −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.

 */





/dts-v1/;



#include "apq8096-v3.dtsi"

#include "msm8996-mtp.dtsi"

#include "external-soc.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ 8096 v3 + PMI8994, MDM9x55 Slimbus MTP";

	compatible = "qcom,apq8096-mtp", "qcom,apq8096", "qcom,mtp";

	qcom,board-id = <8 2>;

};



&pil_modem {

	status = "disabled";

};



&mdm3 {

	pinctrl-names = "mdm_active", "mdm_suspend";

	pinctrl-0 = <&ap2mdm_active &mdm2ap_active>;

	pinctrl-1 = <&ap2mdm_sleep &mdm2ap_sleep>;

	interrupt-map = <0 &tlmm 108 0x3

			1 &tlmm 107 0x3

			2 &tlmm 112 0x3>;

	qcom,mdm2ap-errfatal-gpio = <&tlmm 108 0x00>;

	qcom,ap2mdm-errfatal-gpio = <&tlmm 109 0x00>;

	qcom,mdm2ap-status-gpio   = <&tlmm 106 0x00>;

	qcom,ap2mdm-status-gpio   = <&tlmm 107 0x00>;

	qcom,ap2mdm-soft-reset-gpio = <&pm8994_mpps 2 0>;

	qcom,ap2mdm-vddmin-gpio = <&tlmm 111 0x00>;

	qcom,mdm2ap-vddmin-gpio = <&tlmm 112 0x00>;

	status = "ok";

};



&pm8994_mpps {

	mpp@a100 { /* MPP 2*/

		/* MDM PON conrol*/

		qcom,mode = <1>;		/* Digital output */

		qcom,output-type = <0>;		/* CMOS logic */

		qcom,vin-sel = <2>;		/* S4 1.8V */

		qcom,src-sel = <0>;		/* Constant */

		qcom,master-en = <1>;		/* Enable GPIO */

		qcom,invert = <0>;

		status = "okay";

	};

};

arch/arm/boot/dts/qcom/apq8096-v3-pmi8994-pm8004-mdm9x55-i2s-cdp.dts

0 → 100644
+58 −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.

 */



/dts-v1/;



#include "apq8096-v3.dtsi"

#include "msm8996-pm8994-pmi8994-pm8004.dtsi"

#include "msm8996-cdp.dtsi"

#include "external-soc.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ 8096 v3 + PMI8994 + PM8004, MDM9x55 I2S CDP";

	compatible = "qcom,apq8096-cdp", "qcom,apq8096", "qcom,cdp";

	qcom,board-id = <1 2>;

};



&pil_modem {

	status = "disabled";

};



&mdm3 {

	pinctrl-names = "mdm_active", "mdm_suspend";

	pinctrl-0 = <&ap2mdm_active &mdm2ap_active>;

	pinctrl-1 = <&ap2mdm_sleep &mdm2ap_sleep>;

	interrupt-map = <0 &tlmm 108 0x3

			1 &tlmm 107 0x3

			2 &tlmm 112 0x3>;

	qcom,mdm2ap-errfatal-gpio = <&tlmm 108 0x00>;

	qcom,ap2mdm-errfatal-gpio = <&tlmm 109 0x00>;

	qcom,mdm2ap-status-gpio   = <&tlmm 106 0x00>;

	qcom,ap2mdm-status-gpio   = <&tlmm 107 0x00>;

	qcom,ap2mdm-soft-reset-gpio = <&pm8994_mpps 2 0>;

	qcom,ap2mdm-vddmin-gpio = <&tlmm 111 0x00>;

	qcom,mdm2ap-vddmin-gpio = <&tlmm 112 0x00>;

	status = "ok";

};



&pm8994_mpps {

	mpp@a100 { /* MPP 2*/

		/* MDM PON conrol*/

		qcom,mode = <1>;		/* Digital output */

		qcom,output-type = <0>;		/* CMOS logic */

		qcom,vin-sel = <2>;		/* S4 1.8V */

		qcom,src-sel = <0>;		/* Constant */

		qcom,master-en = <1>;		/* Enable GPIO */

		qcom,invert = <0>;

		status = "okay";

	};

};