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

Commit 09c963fc authored by Avaneesh Kumar Dwivedi's avatar Avaneesh Kumar Dwivedi
Browse files

ARM: dts: msm: Add device tree support for board variants of QCS403 



Add board specific dts files of qcs403 variants and while at it
also reorganize soc specific changes.

Change-Id: I4687fa1b1dae4df932fcee40c7ee7eed5c89b8b8
Signed-off-by: default avatarAvaneesh Kumar Dwivedi <akdwived@codeaurora.org>
parent 16cd8a76

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

+8 −0
Original line number Diff line number Diff line
@@ -62,6 +62,12 @@ SoCs: 
- QCS401

  compatible = "qcom,qcs401"



- QCS404

  compatible = "qcom,qcs404"



- QCS407

  compatible = "qcom,qcs407"



- SDXPRAIRIE

  compatible = "qcom,sdxprairie"
@@ -195,6 +201,8 @@ compatible = "qcom,qcs405-rumi" 
compatible = "qcom,qcs405-iot"

compatible = "qcom,qcs403-iot"

compatible = "qcom,qcs401-iot"

compatible = "qcom,qcs404-iot"

compatible = "qcom,qcs407-iot"

compatible = "qcom,sa8155-adp-star"

compatible = "qcom,sa8155p-adp-star"

compatible = "qcom,sa8195p-adp-star"

arch/arm64/boot/dts/qcom/Makefile

+15 −17
Original line number Diff line number Diff line
@@ -6,27 +6,25 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8916-mtp.dtb 
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

ifeq ($(CONFIG_ARM64),y)

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

		qcs405-iot-sku1.dtb \

		qcs405-iot-sku2.dtb \



dtb-$(CONFIG_ARCH_QCS403) += qcs403-iot-sku1.dtb \

			qcs403-iot-sku3.dtb \

			qcs403-iot-sku5.dtb \

			qcs404-iot-sku3.dtb \

			qcs404-iot-sku5.dtb \

			qcs404-iot-sku6.dtb



dtb-$(CONFIG_ARCH_QCS405) += qcs405-iot-sku1.dtb \

		qcs407-iot-sku1.dtb \

		qcs405-iot-sku3.dtb \

		qcs407-iot-sku3.dtb \

		qcs405-iot-sku4.dtb \

		qcs405-iot-sku5.dtb \

		qcs407-iot-sku4.dtb \

		qcs405-iot-sku6.dtb \

		qcs405-iot-sku7.dtb \

		qcs405-iot-sku8.dtb \

		qcs405-iot-sku9.dtb \

		qcs405-iot-sku10.dtb \

		qcs405-iot-sku11.dtb \

		qcs407-iot-sku6.dtb \

		qcs407-iot-sku9.dtb \

		qcs405-iot-sku12.dtb \

		qcs401-iot-sku1.dtb

else

dtb-$(CONFIG_ARCH_QCS405) += qcs403-iot-sku1.dtb \

			qcs403-iot-sku2.dtb \

			qcs403-iot-sku3.dtb \

			qcs403-iot-sku4.dtb

endif

		qcs407-iot-sku12.dtb



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

	dtbo-$(CONFIG_ARCH_SM8150) += \

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

+1 −56
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018-2019, 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
@@ -22,61 +22,6 @@ 
	compatible = "qcom,qcs403-iot", "qcom,qcs403", "qcom,iot";

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



	cpus {

		/delete-node/ cpu@102;

		/delete-node/ cpu@103;



		cpu-map {

			cluster0 {

				/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;

};



&qnand_1 {

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

+0 −55
Original line number Diff line number Diff line
@@ -22,61 +22,6 @@ 
	compatible = "qcom,qcs403-iot", "qcom,qcs403", "qcom,iot";

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



	cpus {

		/delete-node/ cpu@102;

		/delete-node/ cpu@103;



		cpu-map {

			cluster0 {

				/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;

};



#include "qcs405-mdss-panels.dtsi"

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

+0 −53
Original line number Diff line number Diff line
@@ -22,50 +22,9 @@ 
	compatible = "qcom,qcs403-iot", "qcom,qcs403", "qcom,iot";

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



	cpus {

		/delete-node/ cpu@102;

		/delete-node/ cpu@103;



		cpu-map {

			cluster0 {

				/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;

		};

	};



	spi@78b5000 {

		status = "ok";

		spi@0 {
@@ -82,18 +41,6 @@ 
	};

};



&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;

};



&qnand_1 {

	status = "ok";

};