Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

soc: samsung: Remove Exynos4212 related dead code

Support for Exynos4212 SoCs has been removed by commit bca9085e0ae9 ("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: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

authored by

Marek Szyprowski and committed by
Krzysztof Kozlowski
c4061019 2bd6bf03

+2 -23
-1
Documentation/devicetree/bindings/arm/samsung/pmu.txt
··· 4 4 - compatible : should contain two values. First value must be one from following list: 5 5 - "samsung,exynos3250-pmu" - for Exynos3250 SoC, 6 6 - "samsung,exynos4210-pmu" - for Exynos4210 SoC, 7 - - "samsung,exynos4212-pmu" - for Exynos4212 SoC, 8 7 - "samsung,exynos4412-pmu" - for Exynos4412 SoC, 9 8 - "samsung,exynos5250-pmu" - for Exynos5250 SoC, 10 9 - "samsung,exynos5260-pmu" - for Exynos5260 SoC.
-9
drivers/soc/samsung/exynos-pmu.c
··· 60 60 61 61 if (pmu_data->powerdown_conf_extra) 62 62 pmu_data->powerdown_conf_extra(mode); 63 - 64 - if (pmu_data->pmu_config_extra) { 65 - for (i = 0; pmu_data->pmu_config_extra[i].offset != PMU_TABLE_END; i++) 66 - pmu_raw_writel(pmu_data->pmu_config_extra[i].val[mode], 67 - pmu_data->pmu_config_extra[i].offset); 68 - } 69 63 } 70 64 71 65 /* ··· 82 88 }, { 83 89 .compatible = "samsung,exynos4210-pmu", 84 90 .data = exynos_pmu_data_arm_ptr(exynos4210_pmu_data), 85 - }, { 86 - .compatible = "samsung,exynos4212-pmu", 87 - .data = exynos_pmu_data_arm_ptr(exynos4212_pmu_data), 88 91 }, { 89 92 .compatible = "samsung,exynos4412-pmu", 90 93 .data = exynos_pmu_data_arm_ptr(exynos4412_pmu_data),
-2
drivers/soc/samsung/exynos-pmu.h
··· 23 23 24 24 struct exynos_pmu_data { 25 25 const struct exynos_pmu_conf *pmu_config; 26 - const struct exynos_pmu_conf *pmu_config_extra; 27 26 28 27 void (*pmu_init)(void); 29 28 void (*powerdown_conf)(enum sys_powerdown); ··· 35 36 /* list of all exported SoC specific data */ 36 37 extern const struct exynos_pmu_data exynos3250_pmu_data; 37 38 extern const struct exynos_pmu_data exynos4210_pmu_data; 38 - extern const struct exynos_pmu_data exynos4212_pmu_data; 39 39 extern const struct exynos_pmu_data exynos4412_pmu_data; 40 40 extern const struct exynos_pmu_data exynos5250_pmu_data; 41 41 extern const struct exynos_pmu_data exynos5420_pmu_data;
+2 -11
drivers/soc/samsung/exynos4-pmu.c
··· 90 90 { PMU_TABLE_END,}, 91 91 }; 92 92 93 - static const struct exynos_pmu_conf exynos4x12_pmu_config[] = { 93 + static const struct exynos_pmu_conf exynos4412_pmu_config[] = { 94 94 { S5P_ARM_CORE0_LOWPWR, { 0x0, 0x0, 0x2 } }, 95 95 { S5P_DIS_IRQ_CORE0, { 0x0, 0x0, 0x0 } }, 96 96 { S5P_DIS_IRQ_CENTRAL0, { 0x0, 0x0, 0x0 } }, ··· 195 195 { S5P_GPS_ALIVE_LOWPWR, { 0x7, 0x0, 0x0 } }, 196 196 { S5P_CMU_SYSCLK_ISP_LOWPWR, { 0x1, 0x0, 0x0 } }, 197 197 { S5P_CMU_SYSCLK_GPS_LOWPWR, { 0x1, 0x0, 0x0 } }, 198 - { PMU_TABLE_END,}, 199 - }; 200 - 201 - static const struct exynos_pmu_conf exynos4412_pmu_config[] = { 202 198 { S5P_ARM_CORE2_LOWPWR, { 0x0, 0x0, 0x2 } }, 203 199 { S5P_DIS_IRQ_CORE2, { 0x0, 0x0, 0x0 } }, 204 200 { S5P_DIS_IRQ_CENTRAL2, { 0x0, 0x0, 0x0 } }, ··· 208 212 .pmu_config = exynos4210_pmu_config, 209 213 }; 210 214 211 - const struct exynos_pmu_data exynos4212_pmu_data = { 212 - .pmu_config = exynos4x12_pmu_config, 213 - }; 214 - 215 215 const struct exynos_pmu_data exynos4412_pmu_data = { 216 - .pmu_config = exynos4x12_pmu_config, 217 - .pmu_config_extra = exynos4412_pmu_config, 216 + .pmu_config = exynos4412_pmu_config, 218 217 };