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

Commit 23f8534c authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add dts support for sm8150p HDK devices"

parents 99ed54bb b0037a67

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

+5 −0
Original line number Diff line number Diff line
@@ -97,6 +97,9 @@ Generic board variants: 
- QRD device:

  compatible = "qcom,qrd"



- HDK device:

  compatible = "qcom,hdk"



- ADP device:

  compatible = "qcom,adp"
@@ -152,9 +155,11 @@ compatible = "qcom,sm8150-rumi" 
compatible = "qcom,sm8150-mtp"

compatible = "qcom,sm8150-cdp"

compatible = "qcom,sm8150-qrd"

compatible = "qcom,sm8150-hdk"

compatible = "qcom,sm8150p-cdp"

compatible = "qcom,sm8150p-mtp"

compatible = "qcom,sm8150p-qrd"

compatible = "qcom,sm8150p-hdk"

compatible = "qcom,sdmshrike-rumi"

compatible = "qcom,sdmshrike-mtp"

compatible = "qcom,sdmshrike-cdp"

arch/arm64/boot/dts/qcom/Makefile

+6 −2
Original line number Diff line number Diff line
@@ -40,12 +40,14 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		sm8150-sdx50m-mtp-2.5k-panel-overlay.dtbo \

		sm8150-sdx50m-qrd-overlay.dtbo \

		sm8150-sdxprairie-cdp-overlay.dtbo \

		sm8150-sdxprairie-mtp-overlay.dtbo

		sm8150-sdxprairie-mtp-overlay.dtbo \

		sm8150-hdk-overlay.dtbo



sm8150-cdp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

sm8150-mtp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

sm8150-rumi-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

sm8150-qrd-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

sm8150-hdk-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

sm8150-qrd-dvt-overlay.dtbo-base := sm8150-v2.dtb sm8150p-v2.dtb

sa8155-adp-star-overlay.dtbo-base := sa8155.dtb sa8155-v2.dtb

sa8155p-adp-star-overlay.dtbo-base := sa8155p.dtb sa8155p-v2.dtb
@@ -78,7 +80,9 @@ dtb-$(CONFIG_ARCH_SM8150) += sm8150-rumi.dtb \ 
	sm8150p-qrd.dtb \

	sm8150p-v2-mtp.dtb \

	sm8150p-v2-cdp.dtb \

	sm8150p-v2-qrd.dtb

	sm8150p-v2-qrd.dtb \

	sm8150-hdk.dtb \

	sm8150p-hdk.dtb

endif



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

arch/arm64/boot/dts/qcom/sm8150-hdk-overlay.dts

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

 */



/dts-v1/;

/plugin/;



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

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

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

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



#include "sm8150-hdk.dtsi"



/ {

	model = "HDK";

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

	qcom,board-id = <0x1f 0x0>;

};

arch/arm64/boot/dts/qcom/sm8150-hdk.dts

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

 */



/dts-v1/;



#include "sm8150-v2.dtsi"

#include "sm8150-hdk.dtsi"



/ {

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

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

	qcom,board-id = <0x01001f 0x0>;

};

arch/arm64/boot/dts/qcom/sm8150-hdk.dtsi

0 → 100644
+13 −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 "sm8150-qrd.dtsi"

#include "sm8150-qrd-audio-overlay.dtsi"