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

Commit 5766230c authored by Matt Wagantall's avatar Matt Wagantall Committed by Stephen Boyd
Browse files

msm: acpuclock-8960: Migrate 8960 support to use acpuclock-krait 



Leverage the optimized code of the new acpuclock-krait driver for
8960. The newer driver is simpler and more efficient than the existing
acpuclock-8960 code, but drops support for Krait v1 processors (which
were not commercialized anyway).

Change-Id: I5cc875446f02a9f169c9997b716e0464a3a20ee1
Signed-off-by: default avatarMatt Wagantall <mattw@codeaurora.org>
parent 67049c88

arch/arm/mach-msm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ obj-$(CONFIG_MACH_MSM7X25_SURF) += board-msm7x27.o devices-msm7x25.o 
obj-$(CONFIG_MACH_MSM7X25_FFA) += board-msm7x27.o devices-msm7x25.o

obj-$(CONFIG_ARCH_MSM8960) += clock-local.o clock-dss-8960.o clock-8960.o clock-rpm.o clock-pll.o

obj-$(CONFIG_ARCH_MSM8960) += footswitch-8x60.o

obj-$(CONFIG_ARCH_MSM8960) += acpuclock-8960.o

obj-$(CONFIG_ARCH_MSM8960) += acpuclock-krait.o acpuclock-8960.o

obj-$(CONFIG_ARCH_MSM8960) += memory_topology.o

obj-$(CONFIG_ARCH_MSM8960) += saw-regulator.o

obj-$(CONFIG_ARCH_MSM8960) += devices-8960.o

arch/arm/mach-msm/acpuclock-8960.c

+69 −1082

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-msm/board-8960-regulator.c

+26 −2
Original line number Diff line number Diff line
@@ -181,11 +181,11 @@ VREG_CONSUMERS(S4) = { 
};

VREG_CONSUMERS(S5) = {

	REGULATOR_SUPPLY("8921_s5",		NULL),

	REGULATOR_SUPPLY("krait0",		NULL),

	REGULATOR_SUPPLY("krait0",		"acpuclk-8960"),

};

VREG_CONSUMERS(S6) = {

	REGULATOR_SUPPLY("8921_s6",		NULL),

	REGULATOR_SUPPLY("krait1",		NULL),

	REGULATOR_SUPPLY("krait1",		"acpuclk-8960"),

};

VREG_CONSUMERS(S7) = {

	REGULATOR_SUPPLY("8921_s7",		NULL),
@@ -561,10 +561,34 @@ msm_rpm_regulator_init_data[] = { 
int msm_pm8921_regulator_pdata_len =

	ARRAY_SIZE(msm_pm8921_regulator_pdata);



#define RPM_REG_MAP(_id, _sleep_also, _voter, _supply, _dev_name) \

	{ \

		.vreg_id = RPM_VREG_ID_PM8921_##_id, \

		.sleep_also = _sleep_also, \

		.voter = _voter, \

		.supply = _supply, \

		.dev_name = _dev_name, \

	}

static struct rpm_regulator_consumer_mapping

	      msm_rpm_regulator_consumer_mapping[] = {

	RPM_REG_MAP(L23, 0, 1, "krait0_l23", "acpuclk-8960"),

	RPM_REG_MAP(L23, 0, 2, "krait1_l23", "acpuclk-8960"),

	RPM_REG_MAP(L23, 0, 6, "l2_l23",     "acpuclk-8960"),

	RPM_REG_MAP(L24, 0, 1, "krait0_mem", "acpuclk-8960"),

	RPM_REG_MAP(L24, 0, 2, "krait1_mem", "acpuclk-8960"),

	RPM_REG_MAP(S3,  0, 1, "krait0_dig", "acpuclk-8960"),

	RPM_REG_MAP(S3,  0, 2, "krait1_dig", "acpuclk-8960"),

	RPM_REG_MAP(S8,  0, 1, "krait0_s8",  "acpuclk-8960"),

	RPM_REG_MAP(S8,  0, 2, "krait1_s8",  "acpuclk-8960"),

	RPM_REG_MAP(S8,  0, 6, "l2_s8",      "acpuclk-8960"),

};



struct rpm_regulator_platform_data msm_rpm_regulator_pdata = {

	.init_data		= msm_rpm_regulator_init_data,

	.num_regulators		= ARRAY_SIZE(msm_rpm_regulator_init_data),

	.version		= RPM_VREG_VERSION_8960,

	.vreg_id_vdd_mem	= RPM_VREG_ID_PM8921_L24,

	.vreg_id_vdd_dig	= RPM_VREG_ID_PM8921_S3,

	.consumer_map		= msm_rpm_regulator_consumer_mapping,

	.consumer_map_len = ARRAY_SIZE(msm_rpm_regulator_consumer_mapping),

};