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

Commit 7d4b754a 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: Report GPU chipID as A615 on SDM710"

parents b75c18f7 b0a7b865

arch/arm64/boot/dts/qcom/Makefile

+62 −2
Original line number Diff line number Diff line
@@ -143,7 +143,27 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		qcs605-mtp-overlay.dtbo \

		qcs605-360camera-overlay.dtbo \

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

		qcs605-lc-mtp-overlay.dtbo

		qcs605-lc-mtp-overlay.dtbo \

		sdm710-cdp-overlay.dtbo \

		sdm710-mtp-overlay.dtbo \

		sdm710-qrd-overlay.dtbo \

		sdm710-qrd-sku2-overlay.dtbo \

		sdm710-pm660a-cdp-overlay.dtbo \

		sdm710-pm660a-mtp-overlay.dtbo \

		sdm710-external-codec-cdp-overlay.dtbo \

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

		sdm710-external-codec-pm660a-cdp-overlay.dtbo \

		sdm710-external-codec-pm660a-mtp-overlay.dtbo \

		sdm710-usbc-cdp-overlay.dtbo \

		sdm710-usbc-mtp-overlay.dtbo \

		sdm710-usbc-pm660a-cdp-overlay.dtbo \

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

		sdm710-usbc-external-codec-cdp-overlay.dtbo \

		sdm710-usbc-external-codec-mtp-overlay.dtbo \

		sdm710-usbc-external-codec-pm660a-cdp-overlay.dtbo \

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

		sdm710-tasha-codec-cdp-overlay.dtbo \

		sdm710-pm660a-tasha-codec-cdp-overlay.dtbo



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

sdm670-mtp-overlay.dtbo-base := sdm670.dtb
@@ -175,6 +195,26 @@ 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

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

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

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

sdm710-qrd-sku2-overlay.dtbo-base := sdm710.dtb

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

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

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

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

sdm710-external-codec-pm660a-cdp-overlay.dtbo-base := sdm710.dtb

sdm710-external-codec-pm660a-mtp-overlay.dtbo-base := sdm710.dtb

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

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

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

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

sdm710-usbc-external-codec-cdp-overlay.dtbo-base := sdm710.dtb

sdm710-usbc-external-codec-mtp-overlay.dtbo-base := sdm710.dtb

sdm710-usbc-external-codec-pm660a-cdp-overlay.dtbo-base := sdm710.dtb

sdm710-usbc-external-codec-pm660a-mtp-overlay.dtbo-base := sdm710.dtb

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

sdm710-pm660a-tasha-codec-cdp-overlay.dtbo-base := sdm710.dtb



else

dtb-$(CONFIG_ARCH_SDM670) += sdm670-rumi.dtb \
@@ -206,7 +246,27 @@ dtb-$(CONFIG_ARCH_SDM670) += sdm670-rumi.dtb \ 
	qcs605-mtp.dtb \

	qcs605-cdp.dtb \

	qcs605-external-codec-mtp.dtb \

	qcs605-lc-mtp.dtb

	qcs605-lc-mtp.dtb \

	sdm710-mtp.dtb \

	sdm710-cdp.dtb \

	sdm710-qrd.dtb \

	sdm710-qrd-sku2.dtb \

	sdm710-pm660a-mtp.dtb \

	sdm710-pm660a-cdp.dtb \

	sdm710-external-codec-cdp.dtb \

	sdm710-external-codec-mtp.dtb \

	sdm710-external-codec-pm660a-cdp.dtb \

	sdm710-external-codec-pm660a-mtp.dtb \

	sdm710-usbc-cdp.dtb \

	sdm710-usbc-external-codec-cdp.dtb \

	sdm710-usbc-external-codec-mtp.dtb \

	sdm710-usbc-external-codec-pm660a-cdp.dtb \

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

	sdm710-usbc-mtp.dtb \

	sdm710-usbc-pm660a-cdp.dtb \

	sdm710-usbc-pm660a-mtp.dtb \

	sdm710-tasha-codec-cdp.dtb \

	sdm710-pm660a-tasha-codec-cdp.dtb

endif



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

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

0 → 100644
+34 −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-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 "sdm670-cdp.dtsi"

#include "sdm670-audio-overlay.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM710 PM660 + PM660L CDP";

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

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

	qcom,board-id = <1 0>;

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

		       <0x0001001b 0x0102001a 0x0 0x0>,

		       <0x0001001b 0x0201011a 0x0 0x0>;

};

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



#include "sdm710.dtsi"

#include "sdm670-cdp.dtsi"

#include "sdm670-audio-overlay.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM710 PM660 + PM660L CDP";

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

	qcom,board-id = <1 0>;

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

		       <0x0001001b 0x0102001a 0x0 0x0>,

		       <0x0001001b 0x0201011a 0x0 0x0>;

};

arch/arm64/boot/dts/qcom/sdm710-external-codec-cdp-overlay.dts

0 → 100644
+37 −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-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 "sdm670-cdp.dtsi"

#include "sdm670-external-codec.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM710 PM660 + PM660L Ext. Audio Codec CDP";

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

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

	qcom,board-id = <1 1>;

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

		       <0x0001001b 0x0102001a 0x0 0x0>,

		       <0x0001001b 0x0201011a 0x0 0x0>;

};



&tavil_snd {

	qcom,us-euro-gpios = <&tavil_us_euro_sw>;

};

arch/arm64/boot/dts/qcom/sdm710-external-codec-cdp.dts

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

#include "sdm670-cdp.dtsi"

#include "sdm670-external-codec.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM 710 PM660 + PM660L Ext. Audio Codec CDP";

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

	qcom,board-id = <1 1>;

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

		       <0x0001001b 0x0102001a 0x0 0x0>,

		       <0x0001001b 0x0201011a 0x0 0x0>;

};



&tavil_snd {

	qcom,us-euro-gpios = <&tavil_us_euro_sw>;

};