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

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

Merge "ARM: qcom: Add board config support for sda450"

parents e05d549d 549992d6

arch/arm/mach-qcom/board-sdm450.c

+2 −1
Original line number Original line Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

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

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * 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

 * it under the terms of the GNU General Public License version 2 and
@@ -17,6 +17,7 @@ 




static const char *sdm450_dt_match[] __initconst = {

static const char *sdm450_dt_match[] __initconst = {

	"qcom,sdm450",

	"qcom,sdm450",

	"qcom,sda450",

	NULL

	NULL

};

};

drivers/soc/qcom/socinfo.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -1597,6 +1597,10 @@ static void * __init setup_dummy_socinfo(void) 
		dummy_socinfo.id = 338;

		dummy_socinfo.id = 338;

		strlcpy(dummy_socinfo.build_id, "sdm450 - ",

		strlcpy(dummy_socinfo.build_id, "sdm450 - ",

			sizeof(dummy_socinfo.build_id));

			sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sda450()) {

		dummy_socinfo.id = 351;

		strlcpy(dummy_socinfo.build_id, "sda450 - ",

			sizeof(dummy_socinfo.build_id));

	} else if (early_machine_is_sdm632()) {

	} else if (early_machine_is_sdm632()) {

		dummy_socinfo.id = 349;

		dummy_socinfo.id = 349;

		strlcpy(dummy_socinfo.build_id, "sdm632 - ",

		strlcpy(dummy_socinfo.build_id, "sdm632 - ",

include/soc/qcom/socinfo.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -124,6 +124,8 @@ 
	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,mdm9607")

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,mdm9607")

#define early_machine_is_sdm450()	\

#define early_machine_is_sdm450()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm450")

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm450")

#define early_machine_is_sda450()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sda450")

#define early_machine_is_sdm632()	\

#define early_machine_is_sdm632()	\

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm632")

	of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,sdm632")

#define early_machine_is_sdm439()	\

#define early_machine_is_sdm439()	\
@@ -188,6 +190,7 @@ 
#define early_machine_is_msm8937()	0

#define early_machine_is_msm8937()	0

#define early_machine_is_msm8917()	0

#define early_machine_is_msm8917()	0

#define early_machine_is_sdm450()	0

#define early_machine_is_sdm450()	0

#define early_machine_is_sda450()	0

#define early_machine_is_sdm632()	0

#define early_machine_is_sdm632()	0

#define early_machine_is_sdm439()	0

#define early_machine_is_sdm439()	0

#define early_machine_is_sdm429()	0

#define early_machine_is_sdm429()	0
@@ -265,6 +268,7 @@ enum msm_cpu { 
	MSM_CPU_SXR1120,

	MSM_CPU_SXR1120,

	MSM_CPU_8953,

	MSM_CPU_8953,

	MSM_CPU_SDM450,

	MSM_CPU_SDM450,

	MSM_CPU_SDA450,

	MSM_CPU_SDM632,

	MSM_CPU_SDM632,

	MSM_CPU_SDA632,

	MSM_CPU_SDA632,

	MSM_CPU_8937,

	MSM_CPU_8937,