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

Commit 5cd29916 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 battery profile for SDA845 HDK"

parents ca4157a0 94d2bc5c

Documentation/devicetree/bindings/arm/msm/msm.txt

+3 −0
Original line number Diff line number Diff line
@@ -166,6 +166,8 @@ Generic board variants: 
- VR device:

  compatible = "qcom,qvr"



- HDK device:

  compatible = "qcom,hdk"



Boards (SoC type + board variant):
@@ -279,6 +281,7 @@ compatible = "qcom,sdm845-qvr" 
compatible = "qcom,sda845-cdp"

compatible = "qcom,sda845-mtp"

compatible = "qcom,sda845-qrd"

compatible = "qcom,sda845-hdk"

compatible = "qcom,sdm670-rumi"

compatible = "qcom,sdm670-cdp"

compatible = "qcom,sdm670-mtp"

arch/arm64/boot/dts/qcom/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		sda845-v2-cdp-overlay.dtbo \

		sda845-v2-mtp-overlay.dtbo \

		sda845-v2-qrd-overlay.dtbo \

		sda845-v2-hdk-overlay.dtbo \

		sda845-v2-4k-panel-mtp-overlay.dtbo \

		sda845-v2-4k-panel-cdp-overlay.dtbo \

		sda845-v2-4k-panel-qrd-overlay.dtbo
@@ -53,6 +54,7 @@ sda845-4k-panel-qrd-overlay.dtbo-base := sda845.dtb 
sda845-v2-cdp-overlay.dtbo-base := sda845-v2.dtb

sda845-v2-mtp-overlay.dtbo-base := sda845-v2.dtb

sda845-v2-qrd-overlay.dtbo-base := sda845-v2.dtb

sda845-v2-hdk-overlay.dtbo-base := sda845-v2.dtb

sda845-v2-4k-panel-mtp-overlay.dtbo-base := sda845-v2.dtb

sda845-v2-4k-panel-cdp-overlay.dtbo-base := sda845-v2.dtb

sda845-v2-4k-panel-qrd-overlay.dtbo-base := sda845-v2.dtb

arch/arm64/boot/dts/qcom/sda845-v2-hdk-overlay.dts

0 → 100644
+29 −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/;

/plugin/;



#include <dt-bindings/clock/qcom,gcc-sdm845.h>

#include <dt-bindings/clock/qcom,camcc-sdm845.h>

#include <dt-bindings/clock/qcom,dispcc-sdm845.h>

#include <dt-bindings/clock/qcom,rpmh.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>



#include "sda845-v2-hdk.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDA845 v2 HDK";

	compatible = "qcom,sda845-hdk", "qcom,sda845", "qcom,hdk";

	qcom,msm-id = <341 0x20000>;

	qcom,board-id = <0x01001F 0x00>;

};

arch/arm64/boot/dts/qcom/sda845-v2-hdk.dts

0 → 100644
+23 −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 "sda845-v2.dtsi"

#include "sda845-v2-hdk.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDA845 HDK";

	compatible = "qcom,sda845-hdk", "qcom,sda845", "qcom,hdk";

	qcom,board-id = <0x01001F 0x00>;

};

arch/arm64/boot/dts/qcom/sda845-v2-hdk.dtsi

0 → 100644
+19 −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 "sdm845-qvr.dtsi"



&vendor {

	qcom,battery-data {

		#include "fg-gen3-batterydata-mlp356477-2800mah.dtsi"

	};

};