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

Commit 2c988ae6 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 PMI632 devices for SDM450-PMI632 boards"

parents 5041ca00 fbbfb7f9

arch/arm64/boot/dts/qcom/pmi632.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
					<0x2 0xc4 0 IRQ_TYPE_NONE>,

					<0x2 0xc5 0 IRQ_TYPE_NONE>,

					<0x2 0xc6 0 IRQ_TYPE_NONE>,

					<0x2 0xc7 0 IRQ_TYPE_NONE>,

					<0x2 0xc7 0 IRQ_TYPE_NONE>;

			interrupt-names = "pmi632_gpio2", "pmi632_gpio3",

					"pmi632_gpio4", "pmi632_gpio5",

					"pmi632_gpio6", "pmi632_gpio7",
@@ -71,6 +71,7 @@ 
			reg = <0x5700 0x100>;

			qcom,vib-ldo-volt-uv = <1504000>;

			qcom,vib-overdrive-volt-uv = <3544000>;

			status = "disabled";

		};



		pmi632_pwm_1: pwm@b300 {

arch/arm64/boot/dts/qcom/sdm450-pmi632-cdp-s2.dts

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 


#include "sdm450.dtsi"

#include "sdm450-pmi632-cdp-s2.dtsi"

#include "sdm450-pmi632.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM450 + PMI632 CDP S2";

arch/arm64/boot/dts/qcom/sdm450-pmi632-mtp-s3.dts

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 


#include "sdm450.dtsi"

#include "sdm450-pmi632-mtp-s3.dtsi"

#include "sdm450-pmi632.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM450 + PMI632 MTP S3";

arch/arm64/boot/dts/qcom/sdm450-pmi632.dtsi

0 → 100644
+23 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017-2018, 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 "pmi632.dtsi"



&spmi_bus {

	/delete-node/ qcom,pmi8950@2;

	/delete-node/ qcom,pmi8950@3;

};



&pm8953_typec {

	status = "disabled";

};

arch/arm64/boot/dts/qcom/sdm450-qrd-sku4.dts

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 


#include "sdm450.dtsi"

#include "sdm450-qrd-sku4.dtsi"

#include "sdm450-pmi632.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM450 + PMI632 QRD SKU4";