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

Commit d445ef04 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: Add support for SDA660 into socinfo driver"

parents 8ccd6f7a 8e649add

drivers/soc/qcom/socinfo.c

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

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

 * Copyright (c) 2009-2020, 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
@@ -441,6 +441,7 @@ static struct msm_soc_info cpu_of_id[] = { 


	/* SDM660 ID */

	[317] = {MSM_CPU_SDM660, "SDM660"},

	[324] = {MSM_CPU_SDA660, "SDA660"},



	/* Uninitialized IDs are not known to run Linux.

	 * MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are
@@ -1442,6 +1443,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 317;

		strlcpy(dummy_socinfo.build_id, "sdm660 - ",

		sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sda660()) {

		dummy_socinfo.id = 324;

		strlcpy(dummy_socinfo.build_id, "sda660 - ",

		sizeof(dummy_socinfo.build_id));

	} else

		strlcat(dummy_socinfo.build_id, "Dummy socinfo",

			sizeof(dummy_socinfo.build_id));

include/soc/qcom/socinfo.h

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

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

 * Copyright (c) 2009-2020, 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
@@ -111,6 +111,8 @@ 
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,atoll-ab")

#define early_machine_is_sdm660()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm660")

#define early_machine_is_sda660()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sda660")

#else

#define of_board_is_sim()		0

#define of_board_is_rumi()		0
@@ -155,6 +157,7 @@ 
#define early_machine_is_atoll()	0

#define early_machine_is_atollp()	0

#define early_machine_is_sdm660()	0

#define early_machine_is_sda660()	0

#endif



#define PLATFORM_SUBTYPE_MDM	1
@@ -202,6 +205,7 @@ enum msm_cpu { 
	MSM_CPU_ATOLLP,

	MSM_CPU_ATOLL_AB,

	MSM_CPU_SDM660,

	MSM_CPU_SDA660,

};



struct msm_soc_info {