Commit 514a935f authored by Artur Weber's avatar Artur Weber Committed by Krzysztof Kozlowski
Browse files

soc: samsung: exynos-pmu: Re-introduce Exynos4212 support 



Support for the Exynos4212 SoC was originally dropped as there were
no boards using it. We will be adding a device that uses it, so add
it back.

This reverts commit c4061019.

Signed-off-by: default avatarArtur Weber <aweber.kernel@gmail.com>
Link: https://lore.kernel.org/r/20230501195525.6268-5-aweber.kernel@gmail.com


Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
parent 8a19d4a1

drivers/soc/samsung/exynos-pmu.c

+9 −0
Original line number Diff line number Diff line
@@ -57,6 +57,12 @@ void exynos_sys_powerdown_conf(enum sys_powerdown mode) 


	if (pmu_data->powerdown_conf_extra)

		pmu_data->powerdown_conf_extra(mode);



	if (pmu_data->pmu_config_extra) {

		for (i = 0; pmu_data->pmu_config_extra[i].offset != PMU_TABLE_END; i++)

			pmu_raw_writel(pmu_data->pmu_config_extra[i].val[mode],

				       pmu_data->pmu_config_extra[i].offset);

	}

}



/*
@@ -79,6 +85,9 @@ static const struct of_device_id exynos_pmu_of_device_ids[] = { 
	}, {

		.compatible = "samsung,exynos4210-pmu",

		.data = exynos_pmu_data_arm_ptr(exynos4210_pmu_data),

	}, {

		.compatible = "samsung,exynos4212-pmu",

		.data = exynos_pmu_data_arm_ptr(exynos4212_pmu_data),

	}, {

		.compatible = "samsung,exynos4412-pmu",

		.data = exynos_pmu_data_arm_ptr(exynos4412_pmu_data),

drivers/soc/samsung/exynos-pmu.h

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ struct exynos_pmu_conf { 


struct exynos_pmu_data {

	const struct exynos_pmu_conf *pmu_config;

	const struct exynos_pmu_conf *pmu_config_extra;



	void (*pmu_init)(void);

	void (*powerdown_conf)(enum sys_powerdown);
@@ -32,6 +33,7 @@ extern void __iomem *pmu_base_addr; 
/* list of all exported SoC specific data */

extern const struct exynos_pmu_data exynos3250_pmu_data;

extern const struct exynos_pmu_data exynos4210_pmu_data;

extern const struct exynos_pmu_data exynos4212_pmu_data;

extern const struct exynos_pmu_data exynos4412_pmu_data;

extern const struct exynos_pmu_data exynos5250_pmu_data;

extern const struct exynos_pmu_data exynos5420_pmu_data;

drivers/soc/samsung/exynos4-pmu.c

+11 −2
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static const struct exynos_pmu_conf exynos4210_pmu_config[] = { 
	{ PMU_TABLE_END,},

};



static const struct exynos_pmu_conf exynos4412_pmu_config[] = {

static const struct exynos_pmu_conf exynos4x12_pmu_config[] = {

	{ S5P_ARM_CORE0_LOWPWR,			{ 0x0, 0x0, 0x2 } },

	{ S5P_DIS_IRQ_CORE0,			{ 0x0, 0x0, 0x0 } },

	{ S5P_DIS_IRQ_CENTRAL0,			{ 0x0, 0x0, 0x0 } },
@@ -191,6 +191,10 @@ static const struct exynos_pmu_conf exynos4412_pmu_config[] = { 
	{ S5P_GPS_ALIVE_LOWPWR,			{ 0x7, 0x0, 0x0 } },

	{ S5P_CMU_SYSCLK_ISP_LOWPWR,		{ 0x1, 0x0, 0x0 } },

	{ S5P_CMU_SYSCLK_GPS_LOWPWR,		{ 0x1, 0x0, 0x0 } },

	{ PMU_TABLE_END,},

};



static const struct exynos_pmu_conf exynos4412_pmu_config[] = {

	{ S5P_ARM_CORE2_LOWPWR,			{ 0x0, 0x0, 0x2 } },

	{ S5P_DIS_IRQ_CORE2,			{ 0x0, 0x0, 0x0 } },

	{ S5P_DIS_IRQ_CENTRAL2,			{ 0x0, 0x0, 0x0 } },
@@ -204,6 +208,11 @@ const struct exynos_pmu_data exynos4210_pmu_data = { 
	.pmu_config	= exynos4210_pmu_config,

};



const struct exynos_pmu_data exynos4212_pmu_data = {

	.pmu_config	= exynos4x12_pmu_config,

};



const struct exynos_pmu_data exynos4412_pmu_data = {

	.pmu_config		= exynos4412_pmu_config,

	.pmu_config		= exynos4x12_pmu_config,

	.pmu_config_extra	= exynos4412_pmu_config,

};