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

Commit 7fa60024 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: Change SPM node structure for msm8909w"

parents 535fa1f2 5671ff06

arch/arm/boot/dts/qcom/msm8909-pm8909-pm.dtsi

+101 −27
Original line number Diff line number Diff line
@@ -24,11 +24,26 @@ 
		qcom,saw2-cfg = <0x01>;

		qcom,saw2-spm-dly= <0x3c102800>;

		qcom,saw2-spm-ctl = <0xe>;

		qcom,saw2-spm-cmd-wfi = [60 03 60 0b 0f];

		qcom,saw2-spm-cmd-spc = [20 10 80 30 90 5b 60 03 60 76 76

		qcom,mode0 {

			qcom,label = "qcom,saw2-spm-cmd-wfi";

			qcom,sequence = [60 03 60 0b 0f];

			qcom,spm_en;

		};

		qcom,mode1 {

			qcom,label = "qcom,saw2-spm-cmd-spc";

			qcom,sequence = [20 10 80 30 90 5b 60 03 60 76 76

						0b 94 5b 80 10 26 30 0f];

		qcom,saw2-spm-cmd-pc = [20 10 80 30 90 5b 60 03 60 76 76

			qcom,spm_en;

			qcom,pc_mode;

		};

		qcom,mode2 {

			qcom,label = "qcom,saw2-spm-cmd-pc";

			qcom,sequence = [20 10 80 30 90 5b 60 03 60 76 76

						0b 94 5b 80 10 26 30 0f];

			qcom,spm_en;

			qcom,pc_mode;

			qcom,slp_cmd_mode;

		};

	};



	qcom,spm@b099000 {
@@ -43,11 +58,26 @@ 
		qcom,saw2-cfg = <0x01>;

		qcom,saw2-spm-dly= <0x3c102800>;

		qcom,saw2-spm-ctl = <0xe>;

		qcom,saw2-spm-cmd-wfi = [60 03 60 0b 0f];

		qcom,saw2-spm-cmd-spc = [20 10 80 30 90 5b 60 03 60 76 76

		qcom,mode0 {

			qcom,label = "qcom,saw2-spm-cmd-wfi";

			qcom,sequence = [60 03 60 0b 0f];

			qcom,spm_en;

		};

		qcom,mode1 {

			qcom,label = "qcom,saw2-spm-cmd-spc";

			qcom,sequence = [20 10 80 30 90 5b 60 03 60 76 76

						0b 94 5b 80 10 26 30 0f];

		qcom,saw2-spm-cmd-pc = [20 10 80 30 90 5b 60 03 60 76 76

			qcom,spm_en;

			qcom,pc_mode;

		};

		qcom,mode2 {

			qcom,label = "qcom,saw2-spm-cmd-pc";

			qcom,sequence = [20 10 80 30 90 5b 60 03 60 76 76

						0b 94 5b 80 10 26 30 0f];

			qcom,spm_en;

			qcom,pc_mode;

			qcom,slp_cmd_mode;

		};

	};



	qcom,spm@b0a9000 {
@@ -62,11 +92,26 @@ 
		qcom,saw2-cfg = <0x01>;

		qcom,saw2-spm-dly= <0x3c102800>;

		qcom,saw2-spm-ctl = <0xe>;

		qcom,saw2-spm-cmd-wfi = [60 03 60 0b 0f];

		qcom,saw2-spm-cmd-spc = [20 10 80 30 90 5b 60 03 60 76 76

		qcom,mode0 {

			qcom,label = "qcom,saw2-spm-cmd-wfi";

			qcom,sequence = [60 03 60 0b 0f];

			qcom,spm_en;

		};

		qcom,mode1 {

			qcom,label = "qcom,saw2-spm-cmd-spc";

			qcom,sequence = [20 10 80 30 90 5b 60 03 60 76 76

						0b 94 5b 80 10 26 30 0f];

		qcom,saw2-spm-cmd-pc = [20 10 80 30 90 5b 60 03 60 76 76

			qcom,spm_en;

			qcom,pc_mode;

		};

		qcom,mode2 {

			qcom,label = "qcom,saw2-spm-cmd-pc";

			qcom,sequence = [20 10 80 30 90 5b 60 03 60 76 76

						0b 94 5b 80 10 26 30 0f];

			qcom,spm_en;

			qcom,pc_mode;

			qcom,slp_cmd_mode;

		};

	};



	qcom,spm@b0b9000 {
@@ -81,11 +126,26 @@ 
		qcom,saw2-cfg = <0x01>;

		qcom,saw2-spm-dly= <0x3c102800>;

		qcom,saw2-spm-ctl = <0xe>;

		qcom,saw2-spm-cmd-wfi = [60 03 60 0b 0f];

		qcom,saw2-spm-cmd-spc = [20 10 80 30 90 5b 60 03 60 76 76

		qcom,mode0 {

			qcom,label = "qcom,saw2-spm-cmd-wfi";

			qcom,sequence = [60 03 60 0b 0f];

			qcom,spm_en;

		};

		qcom,mode1 {

			qcom,label = "qcom,saw2-spm-cmd-spc";

			qcom,sequence = [20 10 80 30 90 5b 60 03 60 76 76

						0b 94 5b 80 10 26 30 0f];

		qcom,saw2-spm-cmd-pc = [20 10 80 30 90 5b 60 03 60 76 76

			qcom,spm_en;

			qcom,pc_mode;

		};

		qcom,mode2 {

			qcom,label = "qcom,saw2-spm-cmd-pc";

			qcom,sequence = [20 10 80 30 90 5b 60 03 60 76 76

						0b 94 5b 80 10 26 30 0f];

			qcom,spm_en;

			qcom,pc_mode;

			qcom,slp_cmd_mode;

		};

	};



	qcom,spm@0xb012000 {
@@ -98,12 +158,27 @@ 
		qcom,saw2-cfg = <0x14>;

		qcom,saw2-spm-dly= <0x3c102800>;

		qcom,saw2-spm-ctl = <0xe>;

		qcom,saw2-spm-cmd-ret = [00 03 00 0f];

		qcom,saw2-spm-cmd-gdhs = [00 20 32 6b c0 e0 d0 42 03 50

				4e 02 02 d0 e0 c0 22 6b 02 32 50 0f];

		qcom,saw2-spm-cmd-pc = [00 32 b0 10 e0 d0 6b c0 42 f0

				07 b0 50 4e 02 02 c0 d0 12 e0 6b 02 32

				50 f0 0f]; /*APC_L2RAM_OFF */

		qcom,mode0 {

			qcom,label = "qcom,saw2-spm-cmd-ret";

			qcom,sequence = [00 03 00 0f];

			qcom,spm_en;

		};

		qcom,mode1 {

			qcom,label = "qcom,saw2-spm-cmd-gdhs";

			qcom,sequence = [00 20 32 6b c0 e0 d0 42 03 50 4e

					02 02 d0 e0 c0 22 6b 02 32 50 0f];

			qcom,spm_en;

			qcom,pc_mode;

		};

		qcom,mode2 {

			qcom,label = "qcom,saw2-spm-cmd-pc";

			qcom,sequence = [00 32 b0 10 e0 d0 6b c0 42 f0 07

					b0 50 4e 02 02 c0 d0 12 e0 6b 02

					32 50 f0 0f]; /*APC_L2RAM_OFF */

			qcom,spm_en;

			qcom,pc_mode;

			qcom,slp_cmd_mode;

		};

	};



	qcom,lpm-levels {
@@ -376,7 +451,6 @@ 
			<43  107>,

			<50  47>,

			<51  48>;



	};

arch/arm/boot/dts/qcom/msm8909-pm8916-pm.dtsi

+100 −25
Original line number Diff line number Diff line
@@ -24,11 +24,26 @@ 
		qcom,saw2-cfg = <0x01>;

		qcom,saw2-spm-dly= <0x3c102800>;

		qcom,saw2-spm-ctl = <0xe>;

		qcom,saw2-spm-cmd-wfi = [60 03 60 0b 0f];

		qcom,saw2-spm-cmd-spc = [20 10 80 30 90 5b 60 03 60 3b 76 76

		qcom,mode0 {

			qcom,label = "qcom,saw2-spm-cmd-wfi";

			qcom,sequence = [60 03 60 0b 0f];

			qcom,spm_en;

		};

		qcom,mode1 {

			qcom,label = "qcom,saw2-spm-cmd-spc";

			qcom,sequence = [20 10 80 30 90 5b 60 03 60 3b 76 76

						0b 94 5b 80 10 26 30 0f];

		qcom,saw2-spm-cmd-pc = [20 10 80 30 90 5b 60 03 60 3b 76 76

			qcom,spm_en;

			qcom,pc_mode;

		};

		qcom,mode2 {

			qcom,label = "qcom,saw2-spm-cmd-pc";

			qcom,sequence = [20 10 80 30 90 5b 60 03 60 3b 76 76

						0b 94 5b 80 10 26 30 0f];

			qcom,spm_en;

			qcom,pc_mode;

			qcom,slp_cmd_mode;

		};

	};



	qcom,spm@b099000 {
@@ -43,11 +58,26 @@ 
		qcom,saw2-cfg = <0x01>;

		qcom,saw2-spm-dly= <0x3c102800>;

		qcom,saw2-spm-ctl = <0xe>;

		qcom,saw2-spm-cmd-wfi = [60 03 60 0b 0f];

		qcom,saw2-spm-cmd-spc = [20 10 80 30 90 5b 60 03 60 3b 76 76

		qcom,mode0 {

			qcom,label = "qcom,saw2-spm-cmd-wfi";

			qcom,sequence = [60 03 60 0b 0f];

			qcom,spm_en;

		};

		qcom,mode1 {

			qcom,label = "qcom,saw2-spm-cmd-spc";

			qcom,sequence = [20 10 80 30 90 5b 60 03 60 3b 76 76

						0b 94 5b 80 10 26 30 0f];

		qcom,saw2-spm-cmd-pc = [20 10 80 30 90 5b 60 03 60 3b 76 76

			qcom,spm_en;

			qcom,pc_mode;

		};

		qcom,mode2 {

			qcom,label = "qcom,saw2-spm-cmd-pc";

			qcom,sequence = [20 10 80 30 90 5b 60 03 60 3b 76 76

						0b 94 5b 80 10 26 30 0f];

			qcom,spm_en;

			qcom,pc_mode;

			qcom,slp_cmd_mode;

		};

	};



	qcom,spm@b0a9000 {
@@ -62,11 +92,26 @@ 
		qcom,saw2-cfg = <0x01>;

		qcom,saw2-spm-dly= <0x3c102800>;

		qcom,saw2-spm-ctl = <0xe>;

		qcom,saw2-spm-cmd-wfi = [60 03 60 0b 0f];

		qcom,saw2-spm-cmd-spc = [20 10 80 30 90 5b 60 03 60 3b 76 76

		qcom,mode0 {

			qcom,label = "qcom,saw2-spm-cmd-wfi";

			qcom,sequence = [60 03 60 0b 0f];

			qcom,spm_en;

		};

		qcom,mode1 {

			qcom,label = "qcom,saw2-spm-cmd-spc";

			qcom,sequence = [20 10 80 30 90 5b 60 03 60 3b 76 76

						0b 94 5b 80 10 26 30 0f];

		qcom,saw2-spm-cmd-pc = [20 10 80 30 90 5b 60 03 60 3b 76 76

			qcom,spm_en;

			qcom,pc_mode;

		};

		qcom,mode2 {

			qcom,label = "qcom,saw2-spm-cmd-pc";

			qcom,sequence = [20 10 80 30 90 5b 60 03 60 3b 76 76

						0b 94 5b 80 10 26 30 0f];

			qcom,spm_en;

			qcom,pc_mode;

			qcom,slp_cmd_mode;

		};

	};



	qcom,spm@b0b9000 {
@@ -81,11 +126,26 @@ 
		qcom,saw2-cfg = <0x01>;

		qcom,saw2-spm-dly= <0x3c102800>;

		qcom,saw2-spm-ctl = <0xe>;

		qcom,saw2-spm-cmd-wfi = [60 03 60 0b 0f];

		qcom,saw2-spm-cmd-spc = [20 10 80 30 90 5b 60 03 60 3b 76 76

		qcom,mode0 {

			qcom,label = "qcom,saw2-spm-cmd-wfi";

			qcom,sequence = [60 03 60 0b 0f];

			qcom,spm_en;

		};

		qcom,mode1 {

			qcom,label = "qcom,saw2-spm-cmd-spc";

			qcom,sequence = [20 10 80 30 90 5b 60 03 60 3b 76 76

						0b 94 5b 80 10 26 30 0f];

		qcom,saw2-spm-cmd-pc = [20 10 80 30 90 5b 60 03 60 3b 76 76

			qcom,spm_en;

			qcom,pc_mode;

		};

		qcom,mode2 {

			qcom,label = "qcom,saw2-spm-cmd-pc";

			qcom,sequence = [20 10 80 30 90 5b 60 03 60 3b 76 76

						0b 94 5b 80 10 26 30 0f];

			qcom,spm_en;

			qcom,pc_mode;

			qcom,slp_cmd_mode;

		};

	};



	qcom,spm@0xb012000 {
@@ -102,17 +162,32 @@ 
		qcom,saw2-pmic-data1 = <0x00030000>;

		qcom,saw2-pmic-data4 = <0x00010080>;

		qcom,saw2-pmic-data5 = <0x00010000>;

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

		qcom,vctl-timeout-us = <50>;

		qcom,vctl-port = <0x0>;

		qcom,phase-port = <0x1>;

		qcom,pfm-port = <0x2>;

		qcom,cpu-vctl-mask = <0xf>;

		qcom,saw2-spm-cmd-ret = [00 03 00 0f];

		qcom,saw2-spm-cmd-gdhs = [00 20 32 6b c0 e0 d0 42 03 50

				4e 02 02 d0 e0 c0 22 6b 02 32 50 0f];

		qcom,saw2-spm-cmd-pc = [00 32 b0 10 e0 d0 6b c0 42 f0 51 11

		qcom,mode0 {

			qcom,label = "qcom,saw2-spm-cmd-ret";

			qcom,sequence = [00 03 00 0f];

			qcom,spm_en;

		};

		qcom,mode1 {

			qcom,label = "qcom,saw2-spm-cmd-gdhs";

			qcom,sequence = [00 20 32 6b c0 e0 d0 42 03 50 4e 02

					02 d0 e0 c0 22 6b 02 32 50 0f];

			qcom,spm_en;

			qcom,pc_mode;

		};

		qcom,mode2 {

			qcom,label = "qcom,saw2-spm-cmd-pc";

			qcom,sequence = [00 32 b0 10 e0 d0 6b c0 42 f0 51 11

				07 01 41 b0 50 4e 02 02 c0 d0 12 e0 6b 02 32

				50 f0 0f]; /*APC_L2RAM_OFF */

			qcom,spm_en;

			qcom,pc_mode;

			qcom,slp_cmd_mode;

		};

	};



	qcom,lpm-levels {