Merge "msm: socinfo: Add socinfo for msm8929" (584b7596) · Commits · e / devices / android_kernel_sony_msm8994

drivers/soc/qcom/socinfo.c

+12 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2009-2014, The Linux Foundation. All rights reserved.
		/*
		* Copyright (c) 2009-2015, 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
		@@ -506,6 +507,12 @@ static struct msm_soc_info cpu_of_id[] = {
		/* Terbium ID */
		[266] = {MSM_CPU_TERBIUM, "MSMTERBIUM"},

		/* 8929 IDs */
		[268] = {MSM_CPU_8929, "MSM8929"},
		[269] = {MSM_CPU_8929, "MSM8629"},
		[270] = {MSM_CPU_8929, "MSM8229"},
		[271] = {MSM_CPU_8929, "APQ8029"},

		/* Uninitialized IDs are not known to run Linux.
		MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are
		considered as unknown CPU. */
		@@ -1028,6 +1035,10 @@ static void * __init setup_dummy_socinfo(void)
		dummy_socinfo.id = 264;
		strlcpy(dummy_socinfo.build_id, "msmtellurium - ",
		sizeof(dummy_socinfo.build_id));
		} else if (early_machine_is_msm8929()) {
		dummy_socinfo.id = 268;
		strlcpy(dummy_socinfo.build_id, "msm8929 - ",
		sizeof(dummy_socinfo.build_id));
		}

		strlcat(dummy_socinfo.build_id, "Dummy socinfo",

+19 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2009-2014, The Linux Foundation. All rights reserved.
		/*
		* Copyright (c) 2009-2015, 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
		@@ -82,6 +83,8 @@
		of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmterbium")
		#define early_machine_is_msmtellurium() \
		of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msmtellurium")
		#define early_machine_is_msm8929() \
		of_flat_dt_is_compatible(of_get_flat_dt_root(), "qcom,msm8929")
		#else
		#define of_board_is_sim() 0
		#define of_board_is_rumi() 0
		@@ -113,6 +116,7 @@
		#define early_machine_is_fsm9010() 0
		#define early_machine_is_msmtellurium() 0
		#define early_machine_is_msmterbium() 0
		#define early_machine_is_msm8929() 0
		#endif

		#define PLATFORM_SUBTYPE_MDM 1
		@@ -167,6 +171,7 @@ enum msm_cpu {
		FSM_CPU_9010,
		MSM_CPU_TELLURIUM,
		MSM_CPU_TERBIUM,
		MSM_CPU_8929,
		};

		struct msm_soc_info {
		@@ -572,6 +577,18 @@ static inline int cpu_is_msmtellurium(void)

		}

		static inline int cpu_is_msm8929(void)
		{
		#ifdef CONFIG_ARCH_MSM8916
		enum msm_cpu cpu = socinfo_get_msm_cpu();

		BUG_ON(cpu == MSM_CPU_UNKNOWN);
		return cpu == MSM_CPU_8929;
		#else
		return 0;
		#endif
		}

		static inline int cpu_is_msm8226(void)
		{
		#ifdef CONFIG_ARCH_MSM8226