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

Commit f93f6306 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: msm8610: Add support for 8510/8512"

parents 0b53dbff f228b3e2

arch/arm/boot/dts/msm8610-v1.dtsi

+3 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
/include/ "msm8610-v1-pm.dtsi"



/ {

	qcom,msm-id = <147 0>, <165 0>, <161 0>, <162 0>,

			<163 0>, <164 0>, <166 0>;

	qcom,msm-id = <147 1000>, <165 1000>, <161 1000>, <162 1000>,

		      <163 1000>, <164 1000>, <166 1000>, <225 1000>,

                      <226 1000>;

};

arch/arm/boot/dts/msm8610-v2.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -21,5 +21,6 @@ 


/ {

	qcom,msm-id = <147 0x10001>, <165 0x10001>, <161 0x10001>, <162 0x10001>,

				  <163 0x10001>, <164 0x10001>, <166 0x10001>;

				  <163 0x10001>, <164 0x10001>, <166 0x10001>,

                                  <225 0x10001>, <226 0x10001>;

};

arch/arm/mach-msm/socinfo.c

+2 −0
Original line number Diff line number Diff line
@@ -397,6 +397,8 @@ static enum msm_cpu cpu_of_id[] = { 
	[164] = MSM_CPU_8610,

	[165] = MSM_CPU_8610,

	[166] = MSM_CPU_8610,

	[225] = MSM_CPU_8610,

	[226] = MSM_CPU_8610,



	/* 8064AB IDs */

	[153] = MSM_CPU_8064AB,