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

Commit 1f5fa0c6 authored by Matt Wagantall's avatar Matt Wagantall
Browse files

soc: qcom: socinfo: remove APIs without any clients 



socinfo exports a number of APIs left over from the days before
device tree, for targets which are no longer supported in the
current kernel. Remove these unused APIs:
 get_core_count()
 read_msm_cpu_type()
 cpu_is_*()
 soc_class_is_*()

Change-Id: I2fb23c44649f0582fb0e2523a0235470f76a3da9
Signed-off-by: default avatarMatt Wagantall <mattw@codeaurora.org>
parent 53a321ea

drivers/soc/qcom/socinfo.c

+0 −99
Original line number Diff line number Diff line
@@ -1330,102 +1330,3 @@ int __init socinfo_init(void) 
	return 0;

}

subsys_initcall(socinfo_init);
 


const int get_core_count(void)

{

	if (!(read_cpuid_mpidr() & BIT(31)))

		return 1;



	if (read_cpuid_mpidr() & BIT(30))

		return 1;



	/* 1 + the PART[1:0] field of MIDR */

	return ((read_cpuid_id() >> 4) & 3) + 1;

}



const int read_msm_cpu_type(void)

{

	if (socinfo_get_msm_cpu() != MSM_CPU_UNKNOWN)

		return socinfo_get_msm_cpu();



	switch (read_cpuid_id()) {

	case 0x510F02D0:

	case 0x510F02D2:

	case 0x510F02D4:

		return MSM_CPU_8X60;



	case 0x510F04D0:

	case 0x510F04D1:

	case 0x510F04D2:

	case 0x511F04D0:

	case 0x512F04D0:

		return MSM_CPU_8960;



	case 0x51404D11: /* We can't get here unless we are in bringup */

		return MSM_CPU_8930;



	case 0x510F06F0:

		return MSM_CPU_8064;



	case 0x511F06F1:

	case 0x511F06F2:

	case 0x512F06F0:

		return MSM_CPU_8974;



	default:

		return MSM_CPU_UNKNOWN;

	};

}



const int cpu_is_krait(void)

{

	return ((read_cpuid_id() & 0xFF00FC00) == 0x51000400);

}



const int cpu_is_krait_v1(void)

{

	switch (read_cpuid_id()) {

	case 0x510F04D0:

	case 0x510F04D1:

	case 0x510F04D2:

		return 1;



	default:

		return 0;

	};

}



const int cpu_is_krait_v2(void)

{

	switch (read_cpuid_id()) {

	case 0x511F04D0:

	case 0x511F04D1:

	case 0x511F04D2:

	case 0x511F04D3:

	case 0x511F04D4:



	case 0x510F06F0:

	case 0x510F06F1:

	case 0x510F06F2:

		return 1;



	default:

		return 0;

	};

}



const int cpu_is_krait_v3(void)

{

	switch (read_cpuid_id()) {

	case 0x512F04D0:

	case 0x511F06F0:

	case 0x511F06F1:

	case 0x511F06F2:

	case 0x510F05D0:

	case 0x510F07F0:

		return 1;



	default:

		return 0;

	};

}

include/soc/qcom/socinfo.h

+0 −427
Original line number Diff line number Diff line
@@ -210,432 +210,5 @@ uint32_t socinfo_get_platform_version(void); 
enum pmic_model socinfo_get_pmic_model(void);

uint32_t socinfo_get_pmic_die_revision(void);

int __init socinfo_init(void) __must_check;

const int read_msm_cpu_type(void);

const int get_core_count(void);

const int cpu_is_krait(void);

const int cpu_is_krait_v1(void);

const int cpu_is_krait_v2(void);

const int cpu_is_krait_v3(void);



static inline int cpu_is_msm7x01(void)

{

#ifdef CONFIG_ARCH_MSM7X01A

	enum msm_cpu cpu = socinfo_get_msm_cpu();



	BUG_ON(cpu == MSM_CPU_UNKNOWN);

	return cpu == MSM_CPU_7X01;

#else

	return 0;

#endif

}



static inline int cpu_is_msm7x25(void)

{

#ifdef CONFIG_ARCH_MSM7X25

	enum msm_cpu cpu = socinfo_get_msm_cpu();



	BUG_ON(cpu == MSM_CPU_UNKNOWN);

	return cpu == MSM_CPU_7X25;

#else

	return 0;

#endif

}



static inline int cpu_is_msm7x27(void)

{

#if defined(CONFIG_ARCH_MSM7X27) && !defined(CONFIG_ARCH_MSM7X27A)

	enum msm_cpu cpu = socinfo_get_msm_cpu();



	BUG_ON(cpu == MSM_CPU_UNKNOWN);

	return cpu == MSM_CPU_7X27;

#else

	return 0;

#endif

}



static inline int cpu_is_msm7x27a(void)

{

#ifdef CONFIG_ARCH_MSM7X27A

	enum msm_cpu cpu = socinfo_get_msm_cpu();



	BUG_ON(cpu == MSM_CPU_UNKNOWN);

	return cpu == MSM_CPU_7X27A;

#else

	return 0;

#endif

}



static inline int cpu_is_msm7x27aa(void)

{

#ifdef CONFIG_ARCH_MSM7X27A

	enum msm_cpu cpu = socinfo_get_msm_cpu();



	BUG_ON(cpu == MSM_CPU_UNKNOWN);

	return cpu == MSM_CPU_7X27AA;

#else

	return 0;

#endif

}



static inline int cpu_is_msm7x25a(void)

{

#ifdef CONFIG_ARCH_MSM7X27A

	enum msm_cpu cpu = socinfo_get_msm_cpu();



	BUG_ON(cpu == MSM_CPU_UNKNOWN);

	return cpu == MSM_CPU_7X25A;

#else

	return 0;

#endif

}



static inline int cpu_is_msm7x25aa(void)

{

#ifdef CONFIG_ARCH_MSM7X27A

	enum msm_cpu cpu = socinfo_get_msm_cpu();



	BUG_ON(cpu == MSM_CPU_UNKNOWN);

	return cpu == MSM_CPU_7X25AA;

#else

	return 0;

#endif

}



static inline int cpu_is_msm7x25ab(void)

{

#ifdef CONFIG_ARCH_MSM7X27A

	enum msm_cpu cpu = socinfo_get_msm_cpu();



	BUG_ON(cpu == MSM_CPU_UNKNOWN);

	return cpu == MSM_CPU_7X25AB;

#else

	return 0;

#endif

}



static inline int cpu_is_msm7x30(void)

{

#ifdef CONFIG_ARCH_MSM7X30

	enum msm_cpu cpu = socinfo_get_msm_cpu();



	BUG_ON(cpu == MSM_CPU_UNKNOWN);

	return cpu == MSM_CPU_7X30;

#else

	return 0;

#endif

}



static inline int cpu_is_qsd8x50(void)

{

#ifdef CONFIG_ARCH_QSD8X50

	enum msm_cpu cpu = socinfo_get_msm_cpu();



	BUG_ON(cpu == MSM_CPU_UNKNOWN);

	return cpu == MSM_CPU_8X50;

#else

	return 0;

#endif

}



static inline int cpu_is_msm8x55(void)

{

#ifdef CONFIG_ARCH_MSM7X30

	enum msm_cpu cpu = socinfo_get_msm_cpu();



	BUG_ON(cpu == MSM_CPU_UNKNOWN);

	return cpu == MSM_CPU_8X55;

#else

	return 0;

#endif

}



static inline int cpu_is_msm8x60(void)

{

#ifdef CONFIG_ARCH_MSM8X60

	return read_msm_cpu_type() == MSM_CPU_8X60;

#else

	return 0;

#endif

}



static inline int cpu_is_msm8960(void)

{

	return 0;

}



static inline int cpu_is_msm8960ab(void)

{

	return 0;

}



static inline int cpu_is_apq8064(void)

{

#ifdef CONFIG_ARCH_APQ8064

	return read_msm_cpu_type() == MSM_CPU_8064;

#else

	return 0;

#endif

}



static inline int cpu_is_apq8064ab(void)

{

#ifdef CONFIG_ARCH_APQ8064

	return read_msm_cpu_type() == MSM_CPU_8064AB;

#else

	return 0;

#endif

}



static inline int cpu_is_apq8064aa(void)

{

#ifdef CONFIG_ARCH_APQ8064

	return read_msm_cpu_type() == MSM_CPU_8064AA;

#else

	return 0;

#endif

}



static inline int cpu_is_msm8930(void)

{

#ifdef CONFIG_ARCH_MSM8930

	return read_msm_cpu_type() == MSM_CPU_8930;

#else

	return 0;

#endif

}



static inline int cpu_is_msm8930aa(void)

{

#ifdef CONFIG_ARCH_MSM8930

	return read_msm_cpu_type() == MSM_CPU_8930AA;

#else

	return 0;

#endif

}



static inline int cpu_is_msm8930ab(void)

{

#ifdef CONFIG_ARCH_MSM8930

	return read_msm_cpu_type() == MSM_CPU_8930AB;

#else

	return 0;

#endif

}



static inline int cpu_is_msm8627(void)

{

/* 8930 and 8627 will share the same CONFIG_ARCH type unless otherwise needed */

#ifdef CONFIG_ARCH_MSM8930

	return read_msm_cpu_type() == MSM_CPU_8627;

#else

	return 0;

#endif

}



static inline int cpu_is_fsm9xxx(void)

{

#ifdef CONFIG_ARCH_FSM9XXX

	enum msm_cpu cpu = socinfo_get_msm_cpu();



	BUG_ON(cpu == MSM_CPU_UNKNOWN);

	return cpu == FSM_CPU_9XXX;

#else

	return 0;

#endif

}



static inline int cpu_is_msm9615(void)

{

#ifdef CONFIG_ARCH_MSM9615

	enum msm_cpu cpu = socinfo_get_msm_cpu();



	BUG_ON(cpu == MSM_CPU_UNKNOWN);

	return cpu == MSM_CPU_9615;

#else

	return 0;

#endif

}



static inline int cpu_is_msm8625(void)

{

#ifdef CONFIG_ARCH_MSM8625

	enum msm_cpu cpu = socinfo_get_msm_cpu();



	BUG_ON(cpu == MSM_CPU_UNKNOWN);

	return cpu == MSM_CPU_8625;

#else

	return 0;

#endif

}



static inline int cpu_is_msm8974(void)

{

#ifdef CONFIG_ARCH_MSM8974

	enum msm_cpu cpu = socinfo_get_msm_cpu();



	BUG_ON(cpu == MSM_CPU_UNKNOWN);

	return cpu == MSM_CPU_8974;

#else

	return 0;

#endif

}



static inline int cpu_is_msm8974pro_aa(void)

{

#ifdef CONFIG_ARCH_MSM8974

	enum msm_cpu cpu = socinfo_get_msm_cpu();



	BUG_ON(cpu == MSM_CPU_UNKNOWN);

	return cpu == MSM_CPU_8974PRO_AA;

#else

	return 0;

#endif

}



static inline int cpu_is_msm8974pro_ab(void)

{

#ifdef CONFIG_ARCH_MSM8974

	enum msm_cpu cpu = socinfo_get_msm_cpu();



	BUG_ON(cpu == MSM_CPU_UNKNOWN);

	return cpu == MSM_CPU_8974PRO_AB;

#else

	return 0;

#endif

}



static inline int cpu_is_msm8974pro_ac(void)

{

#ifdef CONFIG_ARCH_MSM8974

	enum msm_cpu cpu = socinfo_get_msm_cpu();



	BUG_ON(cpu == MSM_CPU_UNKNOWN);

	return cpu == MSM_CPU_8974PRO_AC;

#else

	return 0;

#endif

}



static inline int cpu_is_msm8916(void)

{

#ifdef CONFIG_ARCH_MSM8916

	enum msm_cpu cpu = socinfo_get_msm_cpu();



	BUG_ON(cpu == MSM_CPU_UNKNOWN);

	return cpu == MSM_CPU_8916;

#else

	return 0;

#endif



}



static inline int cpu_is_msm8936(void)

{

#ifdef CONFIG_ARCH_MSM8916

	enum msm_cpu cpu = socinfo_get_msm_cpu();



	BUG_ON(cpu == MSM_CPU_UNKNOWN);

	return cpu == MSM_CPU_8936;

#else

	return 0;

#endif



}



static inline int cpu_is_msm8939(void)

{

#ifdef CONFIG_ARCH_MSM8916

	enum msm_cpu cpu = socinfo_get_msm_cpu();



	BUG_ON(cpu == MSM_CPU_UNKNOWN);

	return cpu == MSM_CPU_8939;

#else

	return 0;

#endif



}



static inline int cpu_is_msmtellurium(void)

{

#ifdef CONFIG_ARCH_MSM8916

	enum msm_cpu cpu = socinfo_get_msm_cpu();



	BUG_ON(cpu == MSM_CPU_UNKNOWN);

	return cpu == MSM_CPU_TELLURIUM;

#else

	return 0;

#endif



}



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

	enum msm_cpu cpu = socinfo_get_msm_cpu();



	BUG_ON(cpu == MSM_CPU_UNKNOWN);

	return cpu == MSM_CPU_8226;

#else

	return 0;

#endif

}



static inline int cpu_is_msm8610(void)

{

#ifdef CONFIG_ARCH_MSM8610

	enum msm_cpu cpu = socinfo_get_msm_cpu();



	BUG_ON(cpu == MSM_CPU_UNKNOWN);

	return cpu == MSM_CPU_8610;

#else

	return 0;

#endif

}



static inline int cpu_is_msm8625q(void)

{

#ifdef CONFIG_ARCH_MSM8625

	enum msm_cpu cpu = socinfo_get_msm_cpu();



	BUG_ON(cpu == MSM_CPU_UNKNOWN);

	return cpu == MSM_CPU_8625Q;

#else

	return 0;

#endif

}



static inline int soc_class_is_msm8960(void)

{

	return cpu_is_msm8960() || cpu_is_msm8960ab();

}



static inline int soc_class_is_apq8064(void)

{

	return cpu_is_apq8064() || cpu_is_apq8064ab() || cpu_is_apq8064aa();

}



static inline int soc_class_is_msm8930(void)

{

	return cpu_is_msm8930() || cpu_is_msm8930aa() || cpu_is_msm8930ab() ||

	       cpu_is_msm8627();

}



static inline int soc_class_is_msm8974(void)

{

	return cpu_is_msm8974() || cpu_is_msm8974pro_aa() ||

	       cpu_is_msm8974pro_ab() || cpu_is_msm8974pro_ac();

}



#endif