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

Commit 37668160 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: Add new soc ids for mdmfermium"

parents a3085d64 b1aab95a

arch/arm/boot/dts/qcom/mdmfermium.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ 
/ {

	model = "Qualcomm Technologies, Inc. MDM FERMIUM";

	compatible = "qcom,mdmfermium";

	qcom,msm-id = <290 0x10000>;

	qcom,msm-id = <290 0x10000>, <296 0x10000>, <297 0x10000>,

		      <298 0x10000>, <299 0x10000>;

	interrupt-parent = <&intc>;



	aliases {

drivers/soc/qcom/socinfo.c

+5 −0
Original line number Diff line number Diff line
@@ -517,6 +517,11 @@ static struct msm_soc_info cpu_of_id[] = { 
	[293] = {MSM_CPU_TITANIUM, "MSMTITANIUM"},

	/* FERMIUM ID */

	[290] = {MSM_CPU_FERMIUM, "MDMFERMIUM"},

	[296] = {MSM_CPU_FERMIUM, "MDMFERMIUM"},

	[297] = {MSM_CPU_FERMIUM, "MDMFERMIUM"},

	[298] = {MSM_CPU_FERMIUM, "MDMFERMIUM"},

	[299] = {MSM_CPU_FERMIUM, "MDMFERMIUM"},



	/* Californium IDs */

	[283] = {MSM_CPU_CALIFORNIUM, "MDMCALIFORNIUM"},

	[284] = {MSM_CPU_CALIFORNIUM, "MDMCALIFORNIUM"},