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

Commit 13f7ed3d 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 dts support for QRD1130 devices"

parents b78ea39a e4c70a8d

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

+3 −0
Original line number Diff line number Diff line
@@ -104,6 +104,9 @@ SoCs: 
- SXR1130

  compatible = "qcom,sxr1130"



- QRD1130

  compatible = "qcom,sxr1130-qrd"



- MSM8952

  compatible = "qcom,msm8952"

arch/arm64/boot/dts/qcom/Makefile

+5 −2
Original line number Diff line number Diff line
@@ -185,7 +185,8 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		sxr1130-usbc-external-codec-mtp-overlay.dtbo \

		sxr1130-usbc-external-codec-pm660a-mtp-overlay.dtbo \

		sxr1130-usbc-mtp-overlay.dtbo \

		sxr1130-usbc-pm660a-mtp-overlay.dtbo

		sxr1130-usbc-pm660a-mtp-overlay.dtbo \

		sxr1130-qrd-overlay.dtbo



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

sdm670-mtp-overlay.dtbo-base := sdm670.dtb
@@ -259,6 +260,7 @@ sxr1130-usbc-external-codec-mtp-overlay.dtbo-base := sxr1130.dtb 
sxr1130-usbc-external-codec-pm660a-mtp-overlay.dtbo-base := sxr1130.dtb

sxr1130-usbc-mtp-overlay.dtbo-base := sxr1130.dtb

sxr1130-usbc-pm660a-mtp-overlay.dtbo-base := sxr1130.dtb

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



else

dtb-$(CONFIG_ARCH_SDM670) += sdm670-rumi.dtb \
@@ -328,7 +330,8 @@ dtb-$(CONFIG_ARCH_SDM670) += sdm670-rumi.dtb \ 
	sxr1130-usbc-external-codec-mtp.dtb \

	sxr1130-usbc-external-codec-pm660a-mtp.dtb \

	sxr1130-usbc-mtp.dtb \

	sxr1130-usbc-pm660a-mtp.dtb

	sxr1130-usbc-pm660a-mtp.dtb \

	sxr1130-qrd.dtb

endif



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

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

0 → 100644
+32 −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-sdm845.h>

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

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

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

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



#include "sxr1130-qrd.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SXR1130 PM660 + PM660L QRD";

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

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

	qcom,board-id = <0x0003000b 0>;

	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,

		       <0x0001001b 0x0102001a 0x0 0x0>,

		       <0x0001001b 0x0201011a 0x0 0x0>;

};

arch/arm64/boot/dts/qcom/sxr1130-qrd.dts

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

#include "sxr1130-qrd.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SXR1130 PM660 + PM660L QRD";

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

	qcom,board-id = <0x0003000b 0>;

	qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,

		       <0x0001001b 0x0102001a 0x0 0x0>,

		       <0x0001001b 0x0201011a 0x0 0x0>;

};

arch/arm64/boot/dts/qcom/sxr1130-qrd.dtsi

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

 */



#include "sdm670-qrd-sku1.dtsi"