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

Commit c4061019 authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Krzysztof Kozlowski
Browse files

soc: samsung: Remove Exynos4212 related dead code 



Support for Exynos4212 SoCs has been removed by commit bca9085e ("ARM:
dts: exynos: remove Exynos4212 support (dead code)"), so there is no need
to keep remaining dead code related to this SoC version.

Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
parent 2bd6bf03

Documentation/devicetree/bindings/arm/samsung/pmu.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,6 @@ Properties: 
 - compatible : should contain two values. First value must be one from following list:

 - compatible : should contain two values. First value must be one from following list:

		   - "samsung,exynos3250-pmu" - for Exynos3250 SoC,

		   - "samsung,exynos3250-pmu" - for Exynos3250 SoC,

		   - "samsung,exynos4210-pmu" - for Exynos4210 SoC,

		   - "samsung,exynos4210-pmu" - for Exynos4210 SoC,

		   - "samsung,exynos4212-pmu" - for Exynos4212 SoC,

		   - "samsung,exynos4412-pmu" - for Exynos4412 SoC,

		   - "samsung,exynos4412-pmu" - for Exynos4412 SoC,

		   - "samsung,exynos5250-pmu" - for Exynos5250 SoC,

		   - "samsung,exynos5250-pmu" - for Exynos5250 SoC,

		   - "samsung,exynos5260-pmu" - for Exynos5260 SoC.

		   - "samsung,exynos5260-pmu" - for Exynos5260 SoC.

drivers/soc/samsung/exynos-pmu.c

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




	if (pmu_data->powerdown_conf_extra)

	if (pmu_data->powerdown_conf_extra)

		pmu_data->powerdown_conf_extra(mode);

		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);

	}

}

}





/*

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

	}, {

		.compatible = "samsung,exynos4210-pmu",

		.compatible = "samsung,exynos4210-pmu",

		.data = exynos_pmu_data_arm_ptr(exynos4210_pmu_data),

		.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",

		.compatible = "samsung,exynos4412-pmu",

		.data = exynos_pmu_data_arm_ptr(exynos4412_pmu_data),

		.data = exynos_pmu_data_arm_ptr(exynos4412_pmu_data),

drivers/soc/samsung/exynos-pmu.h

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




struct exynos_pmu_data {

struct exynos_pmu_data {

	const struct exynos_pmu_conf *pmu_config;

	const struct exynos_pmu_conf *pmu_config;

	const struct exynos_pmu_conf *pmu_config_extra;





	void (*pmu_init)(void);

	void (*pmu_init)(void);

	void (*powerdown_conf)(enum sys_powerdown);

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

/* list of all exported SoC specific data */

extern const struct exynos_pmu_data exynos3250_pmu_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 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 exynos4412_pmu_data;

extern const struct exynos_pmu_data exynos5250_pmu_data;

extern const struct exynos_pmu_data exynos5250_pmu_data;

extern const struct exynos_pmu_data exynos5420_pmu_data;

extern const struct exynos_pmu_data exynos5420_pmu_data;

drivers/soc/samsung/exynos4-pmu.c

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

	{ PMU_TABLE_END,},

};

};





static const struct exynos_pmu_conf exynos4x12_pmu_config[] = {

static const struct exynos_pmu_conf exynos4412_pmu_config[] = {

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

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

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

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

	{ S5P_DIS_IRQ_CENTRAL0,			{ 0x0, 0x0, 0x0 } },

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

	{ S5P_GPS_ALIVE_LOWPWR,			{ 0x7, 0x0, 0x0 } },

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

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

	{ S5P_CMU_SYSCLK_GPS_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_ARM_CORE2_LOWPWR,			{ 0x0, 0x0, 0x2 } },

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

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

	{ S5P_DIS_IRQ_CENTRAL2,			{ 0x0, 0x0, 0x0 } },

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

	.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 = {

const struct exynos_pmu_data exynos4412_pmu_data = {

	.pmu_config		= exynos4x12_pmu_config,

	.pmu_config		= exynos4412_pmu_config,

	.pmu_config_extra	= exynos4412_pmu_config,

};
 
};