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

Commit c592e6ee 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 support of PMI8940 for MSM8917"

parents 8e29340b 3b7eb06f

arch/arm/boot/dts/qcom/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -195,10 +195,13 @@ dtb-$(CONFIG_ARCH_MSM8917) += msm8917-rumi.dtb \ 
	apq8017-pmi8950-mtp.dtb \

	msm8917-pmi8937-cdp.dtb \

	msm8917-pmi8937-mtp.dtb \

	msm8917-pmi8940-cdp.dtb \

	msm8917-pmi8940-mtp.dtb \

	msm8917-pmi8950-cdp.dtb \

	msm8917-pmi8950-ext-codec-cdp.dtb \

	msm8917-pmi8950-mtp.dtb \

	msm8917-pmi8937-rcm.dtb \

	msm8917-pmi8940-rcm.dtb \

	msm8917-pmi8950-rcm.dtb \

	msm8917-qgp-tmo.dtb \

	msm8917-pmi8937-qrd-sku5.dtb \

arch/arm/boot/dts/qcom/msm8917-pmi8940-cdp.dts

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

 */



/dts-v1/;



#include "msm8917.dtsi"

#include "msm8917-pmi8940-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM8917-PMI8940 CDP";

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

	qcom,board-id = <1 0>;

	qcom,pmic-id = <0x10019 0x020040 0x0 0x0>;

};

arch/arm/boot/dts/qcom/msm8917-pmi8940-cdp.dtsi

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

 */



#include "msm-pmi8940.dtsi"

#include "msm8917-cdp.dtsi"



&soc {

	led_flash0: qcom,camera-flash {

		cell-index = <0>;

		compatible = "qcom,camera-flash";

		qcom,flash-type = <1>;

		qcom,flash-source = <&pmi8940_flash0 &pmi8940_flash1>;

		qcom,torch-source = <&pmi8940_torch0 &pmi8940_torch1>;

		qcom,switch-source = <&pmi8940_switch>;

	};

};

arch/arm/boot/dts/qcom/msm8917-pmi8940-mtp.dts

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

 */



/dts-v1/;



#include "msm8917.dtsi"

#include "msm8917-pmi8940-mtp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM8917-PMI8940 MTP";

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

	qcom,board-id = <8 0>;

	qcom,pmic-id = <0x10019 0x020040 0x0 0x0>;

};

arch/arm/boot/dts/qcom/msm8917-pmi8940-mtp.dtsi

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

 */



#include "msm-pmi8940.dtsi"

#include "msm8917-mtp.dtsi"



&soc {

	led_flash0: qcom,camera-flash {

		cell-index = <0>;

		compatible = "qcom,camera-flash";

		qcom,flash-type = <1>;

		qcom,flash-source = <&pmi8940_flash0 &pmi8940_flash1>;

		qcom,torch-source = <&pmi8940_torch0 &pmi8940_torch1>;

		qcom,switch-source = <&pmi8940_switch>;

	};

};