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

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

Merge "ARM: dts: msm: Add device tree for sa6155 and sa6155p"

parents f6fbeafa 2cbb1907

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

+3 −0
Original line number Diff line number Diff line
@@ -163,6 +163,9 @@ compatible = "qcom,sm6150-idp" 
compatible = "qcom,sm6150p-idp"

compatible = "qcom,sm6150p"

compatible = "qcom,sm6150p-qrd"

compatible = "qcom,sa6155-adp-star"

compatible = "qcom,sa6155p-adp-star"

compatible = "qcom,sa6155p"

compatible = "qcom,qcs405-rumi"

compatible = "qcom,qcs405-iot"

compatible = "qcom,qcs403-iot"

arch/arm64/boot/dts/qcom/Makefile

+9 −2
Original line number Diff line number Diff line
@@ -85,7 +85,9 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		sm6150p-qrd-overlay.dtbo \

		sm6150p-idp-overlay.dtbo \

		sm6150-external-codec-idp-overlay.dtbo \

		sm6150-usbc-idp-overlay.dtbo

		sm6150-usbc-idp-overlay.dtbo \

		sa6155-adp-star-overlay.dtbo \

		sa6155p-adp-star-overlay.dtbo



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

sm6150-qrd-overlay.dtbo-base := sm6150.dtb
@@ -94,6 +96,8 @@ sm6150p-qrd-overlay.dtbo-base := sm6150p.dtb 
sm6150p-idp-overlay.dtbo-base := sm6150p.dtb

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

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

sa6155-adp-star-overlay.dtbo-base := sa6155.dtb

sa6155p-adp-star-overlay.dtbo-base := sa6155p.dtb

else

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

	sm6150-qrd.dtb \
@@ -101,7 +105,10 @@ dtb-$(CONFIG_ARCH_SM6150) += sm6150-rumi.dtb \ 
	sm6150p-qrd.dtb \

	sm6150p-idp.dtb \

	sm6150-external-codec-idp.dtb \

	sm6150-usbc-idp.dtb

	sm6150-usbc-idp.dtb \

	sa6155-adp-star.dtb \

	sa6155p-adp-star.dtb



endif



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

arch/arm64/boot/dts/qcom/sa6155-adp-star-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 "sa6155-adp-star.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SA6155 ADP-STAR";

	compatible = "qcom,sa6155-adp-star", "qcom,sa6155", "qcom,adp-star";

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

	qcom,board-id = <25 0>;

};

arch/arm64/boot/dts/qcom/sa6155-adp-star.dts

0 → 100644
+21 −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 "sa6155.dtsi"

#include "sa6155-adp-star.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SA6155 ADP-STAR";

	compatible = "qcom,sa6155-adp-star", "qcom,sa6155", "qcom,adp-star";

	qcom,board-id = <25 0>;

};

arch/arm64/boot/dts/qcom/sa6155-adp-star.dtsi

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

 */



&soc {

	qcom,lpass@62400000 {

		status = "disabled";

	};



	qcom,glink {

		modem {

			status = "disabled";

		};

	};

};