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

Commit 21be4bc5 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: socinfo: Added support for MDM9150"

parents 271f6cf2 740f9c50

drivers/soc/qcom/socinfo.c

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

 * Copyright (c) 2009-2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2009-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
@@ -597,6 +597,9 @@ static struct msm_soc_info cpu_of_id[] = { 
	/* MSM8940 IDs */

	[313] = {MSM_CPU_8940, "MSM8940"},



	/* MDM9150 IDs */

	[359] = {MSM_CPU_9150, "MDM9150"},



	/* Uninitialized IDs are not known to run Linux.

	   MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are

	   considered as unknown CPU. */

include/soc/qcom/socinfo.h

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

 * Copyright (c) 2009-2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2009-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
@@ -215,6 +215,7 @@ enum msm_cpu { 
	MSM_CPU_9650,

	MSM_CPU_COBALT,

	SDX_CPU_20,

	MSM_CPU_9150,

};



struct msm_soc_info {