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

Commit 4dfb0ca6 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 device tree support for sxr1120"

parents df696d5e 20691843

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

+5 −0
Original line number Diff line number Diff line
@@ -95,6 +95,9 @@ SoCs: 
- QCS605

  compatible = "qcom,qcs605"



- SXR1120

  compatible = "qcom,sxr1120"



- SDA670

  compatible = "qcom,sda670"
@@ -324,6 +327,8 @@ compatible = "qcom,sdm670-mtp" 
compatible = "qcom,sdm670-qrd"

compatible = "qcom,qcs605-cdp"

compatible = "qcom,qcs605-mtp"

compatible = "qcom,sxr1120-mtp"

compatible = "qcom,sxr1120-cdp"

compatible = "qcom,sda670-cdp"

compatible = "qcom,sda670-mtp"

compatible = "qcom,sda670-hdk"

arch/arm64/boot/dts/qcom/Makefile

+15 −0
Original line number Diff line number Diff line
@@ -142,11 +142,16 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		sdm670-pm660a-tasha-codec-cdp-overlay.dtbo \

		sdm670-aqt1000-cdp-overlay.dtbo \

		sdm670-pm660a-aqt1000-cdp-overlay.dtbo \

		sxr1120-lc-mtp-overlay.dtbo \

		sxr1120-lc-external-codec-mtp-overlay.dtbo \

		sxr1120-lc-cdp-overlay.dtbo \

		sxr1120-lc-external-codec-cdp-overlay.dtbo \

		qcs605-cdp-overlay.dtbo \

		qcs605-mtp-overlay.dtbo \

		qcs605-360camera-overlay.dtbo \

		qcs605-external-codec-mtp-overlay.dtbo \

		qcs605-lc-mtp-overlay.dtbo \

		qcs605-lc-cdp-overlay.dtbo \

		sdm710-cdp-overlay.dtbo \

		sdm710-mtp-overlay.dtbo \

		sdm710-qrd-overlay.dtbo \
@@ -198,11 +203,16 @@ sda670-mtp-overlay.dtbo-base := sda670.dtb 
sda670-hdk-overlay.dtbo-base := sda670.dtb

sda670-pm660a-cdp-overlay.dtbo-base := sda670.dtb

sda670-pm660a-mtp-overlay.dtbo-base := sda670.dtb

sxr1120-lc-mtp-overlay.dtbo-base := sxr1120-lc.dtb

sxr1120-lc-external-codec-mtp-overlay.dtbo-base := sxr1120-lc.dtb

sxr1120-lc-cdp-overlay.dtbo-base := sxr1120-lc.dtb

sxr1120-lc-external-codec-cdp-overlay.dtbo-base := sxr1120-lc.dtb

qcs605-cdp-overlay.dtbo-base := qcs605.dtb

qcs605-mtp-overlay.dtbo-base := qcs605.dtb

qcs605-external-codec-mtp-overlay.dtbo-base := qcs605.dtb

qcs605-lc-mtp-overlay.dtbo-base := qcs605-lc.dtb

qcs605-360camera-overlay.dtbo-base := qcs605.dtb

qcs605-lc-cdp-overlay.dtbo-base := qcs605-lc-cdp-base.dtb

sdm710-cdp-overlay.dtbo-base := sdm710.dtb

sdm710-mtp-overlay.dtbo-base := sdm710.dtb

sdm710-qrd-overlay.dtbo-base := sdm710.dtb
@@ -253,11 +263,16 @@ dtb-$(CONFIG_ARCH_SDM670) += sdm670-rumi.dtb \ 
	sdm670-pm660a-tasha-codec-cdp.dtb \

	sda670-pm660a-mtp.dtb \

	sda670-pm660a-cdp.dtb \

	sxr1120-lc-mtp.dtb \

	sxr1120-lc-external-codec-mtp.dtb \

	sxr1120-lc-cdp.dtb \

	sxr1120-lc-external-codec-cdp.dtb \

	qcs605-360camera.dtb \

	qcs605-mtp.dtb \

	qcs605-cdp.dtb \

	qcs605-external-codec-mtp.dtb \

	qcs605-lc-mtp.dtb \

	qcs605-lc-cdp.dtb \

	sdm710-mtp.dtb \

	sdm710-cdp.dtb \

	sdm710-qrd.dtb \

arch/arm64/boot/dts/qcom/qcs605-lc-cdp-base.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 "qcs605-lc.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. QCS605 LC CDP Base SoC";

	compatible = "qcom,qcs605";

	qcom,board-id = <1 4>;

};

arch/arm64/boot/dts/qcom/qcs605-lc-cdp-overlay.dts

0 → 100644
+26 −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 "qcs605-lc-cdp.dtsi"

#include "qcs605-lc-audio-overlay.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. QC605 LC Groot + PM8005 CDP";

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

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

	qcom,board-id = <1 4>;

};

arch/arm64/boot/dts/qcom/qcs605-lc-cdp.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/;



#include "qcs605-lc.dtsi"

#include "qcs605-lc-cdp.dtsi"

#include "qcs605-lc-audio-overlay.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. QC605 LC Groot + PM8005 CDP";

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

	qcom,board-id = <1 4>;

};