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

Commit d90306cf 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: Add support for SDM455 soc-id"

parents 80791689 8cfbfe24

Documentation/devicetree/bindings/arm/msm/msm.txt

+6 −0
Original line number Diff line number Diff line
@@ -95,6 +95,9 @@ SoCs: 
- SDM660

  compatible = "qcom,sdm660"



- SDM455

  compatible = "qcom,sdm455"



- SDA658

  compatible = "qcom,sda658"
@@ -292,6 +295,9 @@ compatible = "qcom,sdm660-cdp" 
compatible = "qcom,sdm660-mtp"

compatible = "qcom,sdm660-qrd"

compatible = "qcom,sda660-qrd"

compatible = "qcom,sdm455-mtp"

compatible = "qcom,sdm455-qrd"

compatible = "qcom,sdm455-cdp"

compatible = "qcom,sda658-mtp"

compatible = "qcom,sda658-cdp"

compatible = "qcom,sda660-mtp"

drivers/soc/qcom/socinfo.c

+8 −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
@@ -570,6 +570,9 @@ static struct msm_soc_info cpu_of_id[] = { 
	[345] = {MSM_CPU_636, "SDM636"},

	[346] = {MSM_CPU_636, "SDA636"},



	/* 455 ID */

	[385] = {MSM_CPU_455, "SDM455"},



	/* Uninitialized IDs are not known to run Linux.

	   MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are

	   considered as unknown CPU. */
@@ -1277,6 +1280,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 324;

		strlcpy(dummy_socinfo.build_id, "sda660 - ",

			sizeof(dummy_socinfo.build_id));

	}  else if (early_machine_is_sdm455()) {

		dummy_socinfo.id = 385;

		strlcpy(dummy_socinfo.build_id, "sdm455 - ",

			sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sdm658()) {

		dummy_socinfo.id = 325;

		strlcpy(dummy_socinfo.build_id, "sdm658 - ",

include/soc/qcom/socinfo.h

+5 −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
@@ -96,6 +96,8 @@ 
	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")

#define early_machine_is_sdm455()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm455")

#define early_machine_is_sdm636()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm636")

#define early_machine_is_sda636()	\
@@ -146,6 +148,7 @@ 
#define early_machine_is_msmhamster()	0

#define early_machine_is_sdm660()	0

#define early_machine_is_sda660()	0

#define early_machine_is_sdm455()	0

#define early_machine_is_sdm636()	0

#define early_machine_is_sda636()	0

#define early_machine_is_sdm658()	0
@@ -211,6 +214,7 @@ enum msm_cpu { 
	MSM_CPU_8998,

	MSM_CPU_HAMSTER,

	MSM_CPU_660,

	MSM_CPU_455,

	MSM_CPU_630,

	MSM_CPU_636,

};