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

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

Merge "ARM: dts: msm: Add initial device tree support for SM6150P"

parents 69d3f157 05eb9bba

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

+3 −0
Original line number Diff line number Diff line
@@ -160,6 +160,9 @@ compatible = "qcom,sm6150-mtp" 
compatible = "qcom,sm6150-cdp"

compatible = "qcom,sm6150-qrd"

compatible = "qcom,sm6150-idp"

compatible = "qcom,sm6150p-idp"

compatible = "qcom,sm6150p"

compatible = "qcom,sm6150p-qrd"

compatible = "qcom,qcs405-rumi"

compatible = "qcom,qcs405-iot"

compatible = "qcom,qcs403-iot"

arch/arm64/boot/dts/qcom/Makefile

+7 −1
Original line number Diff line number Diff line
@@ -82,14 +82,20 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		sm6150-rumi-overlay.dtbo \

		sm6150-qrd-overlay.dtbo \

		sm6150-idp-overlay.dtbo \

		sm6150p-qrd-overlay.dtbo \

		sm6150p-idp-overlay.dtbo \



sm6150-rumi-overlay.dtbo-base := sm6150.dtb

sm6150-qrd-overlay.dtbo-base := sm6150.dtb

sm6150-idp-overlay.dtbo-base := sm6150.dtb

sm6150p-qrd-overlay.dtbo-base := sm6150p.dtb

sm6150p-idp-overlay.dtbo-base := sm6150p.dtb

else

dtb-$(CONFIG_ARCH_SM6150)	+= sm6150-rumi.dtb \

	sm6150-qrd.dtb \

	sm6150-idp.dtb

	sm6150-idp.dtb \

	sm6150p-qrd.dtb \

	sm6150p-idp.dtb

endif



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

arch/arm64/boot/dts/qcom/sm6150p-idp-overlay.dts

0 → 100644
+25 −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/interrupt-controller/arm-gic.h>



#include "sm6150-idp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SM6150P IDP";

	compatible = "qcom,sm6150p-idp", "qcom,sm6150p", "qcom,idp";

	qcom,msm-id = <369 0x0>;

	qcom,board-id = <34 0>;

};

arch/arm64/boot/dts/qcom/sm6150p-idp.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 "sm6150p.dtsi"

#include "sm6150-idp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SM6150P IDP";

	compatible = "qcom,sm6150p-idp", "qcom,sm6150p", "qcom,idp";

	qcom,board-id = <34 0>;

};

arch/arm64/boot/dts/qcom/sm6150p-qrd-overlay.dts

0 → 100644
+24 −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/interrupt-controller/arm-gic.h>



#include "sm6150-qrd.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SM6150P QRD";

	compatible = "qcom,sm6150p-qrd", "qcom,sm6150p", "qcom,qrd";

	qcom,board-id = <11 0>;

};