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

Commit 69233b78 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 support for variants of qcs405"

parents 22448dfb 11ce89f0

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

+7 −2
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ SoCs: 
- QCS405

  compatible = "qcom,qcs405"



- QCS403

  compatible = "qcom,qcs403"



- SDXPRAIRIE

  compatible = "qcom,sdxprairie"
@@ -100,6 +103,8 @@ Generic board variants: 
- RUMI device:

  compatible = "qcom,rumi"



- IOT device:

  compatible = "qcom,iot"





Boards (SoC type + board variant):
@@ -156,8 +161,8 @@ compatible = "qcom,sm6150-cdp" 
compatible = "qcom,sm6150-qrd"

compatible = "qcom,sm6150-idp"

compatible = "qcom,qcs405-rumi"

compatible = "qcom,qcs405-mtp"

compatible = "qcom,qcs405-cdp"

compatible = "qcom,qcs405-iot"

compatible = "qcom,qcs403-iot"

compatible = "qcom,sm8150-auto-adp-star"

compatible = "qcom,auto-adp-star"

compatible = "qcom,sdxprairie-rumi"

arch/arm64/boot/dts/qcom/Makefile

+10 −2
Original line number Diff line number Diff line
@@ -7,8 +7,16 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8992-bullhead-rev-101.dtb 
dtb-$(CONFIG_ARCH_QCOM)	+= msm8994-angler-rev-101.dtb

dtb-$(CONFIG_ARCH_QCOM)	+= msm8996-mtp.dtb

dtb-$(CONFIG_ARCH_QCS405) += qcs405-rumi.dtb \

		qcs405-mtp.dtb \

		qcs405-cdp.dtb

		qcs405-iot-sku1.dtb \

		qcs405-iot-sku2.dtb \

		qcs405-iot-sku3.dtb \

		qcs405-iot-sku4.dtb \

		qcs405-iot-sku5.dtb \

		qcs405-iot-sku6.dtb \

		qcs405-iot-sku7.dtb \

		qcs405-iot-sku8.dtb \

		qcs403-iot-sku1.dtb \

		qcs403-iot-sku2.dtb



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

	dtbo-$(CONFIG_ARCH_SM8150) += \

arch/arm64/boot/dts/qcom/qcs403-iot-sku1.dts

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



/ {

	model = "Qualcomm Technologies, Inc. QCS403 EVB2 1000 IOT";

	compatible = "qcom,qcs403-iot", "qcom,qcs403", "qcom,iot";

	qcom,board-id = <0x010020 0x3>;



	cpus {

		/delete-node/ cpu@102;

		/delete-node/ cpu@103;



		cpu-map {

			cluster1 {

				/delete-node/ core2;

				/delete-node/ core3;

			};

		};

	};

};



&soc {

	cpuss_dump {

		/delete-node/ qcom,l1_i_cache102;

		/delete-node/ qcom,l1_i_cache103;

		/delete-node/ qcom,l1_d_cache102;

		/delete-node/ qcom,l1_d_cache103;

	};



	qcom,spm@b012000 {

		qcom,cpu-vctl-list = <&CPU0 &CPU1>;

	};



	qcom,lpm-levels {

		qcom,pm-cluster@0{

			qcom,pm-cpu {

				qcom,cpu = <&CPU0 &CPU1>;

			};

		};

	};



	/delete-node/ cti@61ba000;

	/delete-node/ cti@61bb000;

	/delete-node/ etm@61be000;

	/delete-node/ etm@61bf000;

	funnel@61a1000 {

		ports {

			/delete-node/ port@3;

			/delete-node/ port@4;

		};

	};

};



&thermal_zones {

	cpuss-max-step {

		cooling-maps {

			/delete-node/ cpu2_cdev;

			/delete-node/ cpu3_cdev;

		};

	};



	/delete-node/ cpuss-2-step;

	/delete-node/ cpuss-3-step;

};

arch/arm64/boot/dts/qcom/qcs403-iot-sku2.dts

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



/ {

	model = "Qualcomm Technologies, Inc. QCS403 RCM IOT";

	compatible = "qcom,qcs403-iot", "qcom,qcs403", "qcom,iot";

	qcom,board-id = <0x010015 0x0>;



	cpus {

		/delete-node/ cpu@102;

		/delete-node/ cpu@103;



		cpu-map {

			cluster1 {

				/delete-node/ core2;

				/delete-node/ core3;

			};

		};

	};

};



&soc {

	cpuss_dump {

		/delete-node/ qcom,l1_i_cache102;

		/delete-node/ qcom,l1_i_cache103;

		/delete-node/ qcom,l1_d_cache102;

		/delete-node/ qcom,l1_d_cache103;

	};



	qcom,spm@b012000 {

		qcom,cpu-vctl-list = <&CPU0 &CPU1>;

	};



	qcom,lpm-levels {

		qcom,pm-cluster@0{

			qcom,pm-cpu {

				qcom,cpu = <&CPU0 &CPU1>;

			};

		};

	};



	/delete-node/ cti@61ba000;

	/delete-node/ cti@61bb000;

	/delete-node/ etm@61be000;

	/delete-node/ etm@61bf000;

	funnel@61a1000 {

		ports {

			/delete-node/ port@3;

			/delete-node/ port@4;

		};

	};

};



&thermal_zones {

	cpuss-max-step {

		cooling-maps {

			/delete-node/ cpu2_cdev;

			/delete-node/ cpu3_cdev;

		};

	};



	/delete-node/ cpuss-2-step;

	/delete-node/ cpuss-3-step;

};

arch/arm64/boot/dts/qcom/qcs405-mtp.dtsi→arch/arm64/boot/dts/qcom/qcs403.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -10,4 +10,11 @@ 
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include "qcs405.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. QCS403";

	qcom,msm-name = "QCS403";

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

};