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

Commit 52ca05f1 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 initial device tree support for SM8150P" into msm-4.14

parents 717c9f25 64e46473

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

+3 −0
Original line number Diff line number Diff line
@@ -132,6 +132,9 @@ compatible = "qcom,sm8150-rumi" 
compatible = "qcom,sm8150-mtp"

compatible = "qcom,sm8150-cdp"

compatible = "qcom,sm8150-qrd"

compatible = "qcom,sm8150p-cdp"

compatible = "qcom,sm8150p-mtp"

compatible = "qcom,sm8150p-qrd"

compatible = "qcom,sdmshrike-rumi"

compatible = "qcom,sdmshrike-mtp"

compatible = "qcom,sdmshrike-cdp"

arch/arm64/boot/dts/qcom/Makefile

+12 −1
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		sm8150-mtp-overlay.dtbo \

		sm8150-rumi-overlay.dtbo \

		sm8150-qrd-overlay.dtbo \

		sm8150p-cdp-overlay.dtbo \

		sm8150p-mtp-overlay.dtbo \

		sm8150p-qrd-overlay.dtbo \

		sm8150-sdx50m-cdp-overlay.dtbo \

		sm8150-sdx50m-mtp-overlay.dtbo
@@ -25,6 +28,8 @@ sm8150-rumi-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb 
sm8150-qrd-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb

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

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

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

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

else

dtb-$(CONFIG_ARCH_SM8150)	+= sm8150-rumi.dtb \

	sm8150-mtp.dtb \
@@ -33,7 +38,13 @@ dtb-$(CONFIG_ARCH_SM8150) += sm8150-rumi.dtb \ 
	sm8150-v2-rumi.dtb \

	sm8150-v2-mtp.dtb \

	sm8150-v2-cdp.dtb \

	sm8150-v2-qrd.dtb

	sm8150-v2-qrd.dtb \

	sm8150p-mtp.dtb \

	sm8150p-cdp.dtb \

	sm8150p-qrd.dtb \

	sm8150p-v2-mtp.dtb \

	sm8150p-v2-cdp.dtb \

	sm8150p-v2-qrd.dtb

endif



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

arch/arm64/boot/dts/qcom/sm8150p-cdp-overlay.dts

0 → 100644
+27 −0
Original line number Diff line number Diff line 
/* Copyright (c) 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-cdp.dtsi"



/ {

	model = "CDP";

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

	qcom,board-id = <1 0>;

};

arch/arm64/boot/dts/qcom/sm8150p-cdp.dts

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/* Copyright (c) 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 "sm8150p.dtsi"

#include "sm8150-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SM8150P CDP";

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

	qcom,board-id = <1 0>;

};

arch/arm64/boot/dts/qcom/sm8150p-mtp-overlay.dts

0 → 100644
+27 −0
Original line number Diff line number Diff line 
/* Copyright (c) 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-mtp.dtsi"



/ {

	model = "MTP";

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

	qcom,board-id = <8 0>;

};