[PATCH 0/7] Remove remaining Exynos4212-related dead code

[PATCH 0/7] Remove remaining Exynos4212-related dead code

[Marek Szyprowski]

Hi!

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.

Best regards
Marek Szyprowski
Samsung R&D Institute Poland


Patch summary:

Marek Szyprowski (7):
  ARM: EXYNOS: Remove Exynos4212 related dead code
  soc: samsung: Remove Exynos4212 related dead code
  mmc: sdhci-s3c: Fix driver data for Exynos4 SoCs
  media: exynos4-is: Remove dependency on obsolete SoC support
  clk: samsung: Remove support for Exynos4212 SoCs in Exynos CLKOUT
    driver
  phy: samsung: Remove dependency on obsolete SoC support
  cpufreq: dt: Remove support for Exynos4212 SoCs

 Documentation/devicetree/bindings/arm/samsung/pmu.txt |  1 -
 arch/arm/mach-exynos/Kconfig                          |  5 -----
 arch/arm/mach-exynos/common.h                         | 11 +----------
 arch/arm/mach-exynos/exynos.c                         |  2 --
 arch/arm/mach-exynos/firmware.c                       |  5 -----
 arch/arm/mach-exynos/pm.c                             |  3 +--
 arch/arm/mach-exynos/suspend.c                        |  4 ----
 drivers/clk/samsung/clk-exynos-clkout.c               |  2 --
 drivers/cpufreq/cpufreq-dt-platdev.c                  |  1 -
 drivers/media/platform/exynos4-is/Kconfig             |  2 +-
 drivers/media/platform/exynos4-is/fimc-core.c         |  2 +-
 drivers/media/platform/exynos4-is/fimc-lite.c         |  2 +-
 drivers/mmc/host/sdhci-s3c.c                          | 18 +++++-------------
 drivers/phy/samsung/Kconfig                           |  2 +-
 drivers/soc/samsung/exynos-pmu.c                      |  9 ---------
 drivers/soc/samsung/exynos-pmu.h                      |  2 --
 drivers/soc/samsung/exynos4-pmu.c                     | 13 ++-----------
 17 files changed, 13 insertions(+), 71 deletions(-)

-- 
2.14.2

[PATCH 1/7] ARM: EXYNOS: Remove Exynos4212 related dead code

[Marek Szyprowski]

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>
---
 arch/arm/mach-exynos/Kconfig    |  5 -----
 arch/arm/mach-exynos/common.h   | 11 +----------
 arch/arm/mach-exynos/exynos.c   |  2 --
 arch/arm/mach-exynos/firmware.c |  5 -----
 arch/arm/mach-exynos/pm.c       |  3 +--
 arch/arm/mach-exynos/suspend.c  |  4 ----
 6 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 0a99140b6ba2..44fa753bd79c 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -85,11 +85,6 @@ config CPU_EXYNOS4210
 	default y
 	depends on ARCH_EXYNOS4
 
-config SOC_EXYNOS4212
-	bool "SAMSUNG EXYNOS4212"
-	default y
-	depends on ARCH_EXYNOS4
-
 config SOC_EXYNOS4412
 	bool "SAMSUNG EXYNOS4412"
 	default y
diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h
index 9424a8a9f308..3f715524c9d6 100644
--- a/arch/arm/mach-exynos/common.h
+++ b/arch/arm/mach-exynos/common.h
@@ -18,7 +18,6 @@
 #define EXYNOS3_SOC_MASK	0xFFFFF000
 
 #define EXYNOS4210_CPU_ID	0x43210000
-#define EXYNOS4212_CPU_ID	0x43220000
 #define EXYNOS4412_CPU_ID	0xE4412200
 #define EXYNOS4_CPU_MASK	0xFFFE0000
 
@@ -39,7 +38,6 @@ static inline int is_samsung_##name(void)	\
 
 IS_SAMSUNG_CPU(exynos3250, EXYNOS3250_SOC_ID, EXYNOS3_SOC_MASK)
 IS_SAMSUNG_CPU(exynos4210, EXYNOS4210_CPU_ID, EXYNOS4_CPU_MASK)
-IS_SAMSUNG_CPU(exynos4212, EXYNOS4212_CPU_ID, EXYNOS4_CPU_MASK)
 IS_SAMSUNG_CPU(exynos4412, EXYNOS4412_CPU_ID, EXYNOS4_CPU_MASK)
 IS_SAMSUNG_CPU(exynos5250, EXYNOS5250_SOC_ID, EXYNOS5_SOC_MASK)
 IS_SAMSUNG_CPU(exynos5410, EXYNOS5410_SOC_ID, EXYNOS5_SOC_MASK)
@@ -59,12 +57,6 @@ IS_SAMSUNG_CPU(exynos5800, EXYNOS5800_SOC_ID, EXYNOS5_SOC_MASK)
 # define soc_is_exynos4210()	0
 #endif
 
-#if defined(CONFIG_SOC_EXYNOS4212)
-# define soc_is_exynos4212()	is_samsung_exynos4212()
-#else
-# define soc_is_exynos4212()	0
-#endif
-
 #if defined(CONFIG_SOC_EXYNOS4412)
 # define soc_is_exynos4412()	is_samsung_exynos4412()
 #else
@@ -105,8 +97,7 @@ IS_SAMSUNG_CPU(exynos5800, EXYNOS5800_SOC_ID, EXYNOS5_SOC_MASK)
 # define soc_is_exynos5800()	0
 #endif
 
-#define soc_is_exynos4() (soc_is_exynos4210() || soc_is_exynos4212() || \
-			  soc_is_exynos4412())
+#define soc_is_exynos4() (soc_is_exynos4210() || soc_is_exynos4412())
 #define soc_is_exynos5() (soc_is_exynos5250() || soc_is_exynos5410() || \
 			  soc_is_exynos5420() || soc_is_exynos5800())
 
diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c
index c404c15ad07f..9a9caac1125a 100644
--- a/arch/arm/mach-exynos/exynos.c
+++ b/arch/arm/mach-exynos/exynos.c
@@ -195,7 +195,6 @@ static void __init exynos_dt_machine_init(void)
 		exynos_cpuidle.dev.platform_data = &cpuidle_coupled_exynos_data;
 #endif
 	if (of_machine_is_compatible("samsung,exynos4210") ||
-	    of_machine_is_compatible("samsung,exynos4212") ||
 	    (of_machine_is_compatible("samsung,exynos4412") &&
 	     of_machine_is_compatible("samsung,trats2")) ||
 	    of_machine_is_compatible("samsung,exynos3250") ||
@@ -208,7 +207,6 @@ static char const *const exynos_dt_compat[] __initconst = {
 	"samsung,exynos3250",
 	"samsung,exynos4",
 	"samsung,exynos4210",
-	"samsung,exynos4212",
 	"samsung,exynos4412",
 	"samsung,exynos5",
 	"samsung,exynos5250",
diff --git a/arch/arm/mach-exynos/firmware.c b/arch/arm/mach-exynos/firmware.c
index e81a78b125d9..2a51e4603a6f 100644
--- a/arch/arm/mach-exynos/firmware.c
+++ b/arch/arm/mach-exynos/firmware.c
@@ -70,12 +70,7 @@ static int exynos_cpu_boot(int cpu)
 
 	/*
 	 * The second parameter of SMC_CMD_CPU1BOOT command means CPU id.
-	 * But, Exynos4212 has only one secondary CPU so second parameter
-	 * isn't used for informing secure firmware about CPU id.
 	 */
-	if (soc_is_exynos4212())
-		cpu = 0;
-
 	exynos_smc(SMC_CMD_CPU1BOOT, cpu, 0, 0);
 	return 0;
 }
diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c
index 1a7e5b5d08d8..c9740d96db9e 100644
--- a/arch/arm/mach-exynos/pm.c
+++ b/arch/arm/mach-exynos/pm.c
@@ -167,8 +167,7 @@ void exynos_enter_aftr(void)
 
 	exynos_pm_central_suspend();
 
-	if (of_machine_is_compatible("samsung,exynos4212") ||
-	    of_machine_is_compatible("samsung,exynos4412")) {
+	if (of_machine_is_compatible("samsung,exynos4412")) {
 		/* Setting SEQ_OPTION register */
 		pmu_raw_writel(S5P_USE_STANDBY_WFI0 | S5P_USE_STANDBY_WFE0,
 			       S5P_CENTRAL_SEQ_OPTION);
diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
index b529ba04ed16..370d37ded7e7 100644
--- a/arch/arm/mach-exynos/suspend.c
+++ b/arch/arm/mach-exynos/suspend.c
@@ -225,7 +225,6 @@ static int __init exynos_pmu_irq_init(struct device_node *node,
 
 EXYNOS_PMU_IRQ(exynos3250_pmu_irq, "samsung,exynos3250-pmu");
 EXYNOS_PMU_IRQ(exynos4210_pmu_irq, "samsung,exynos4210-pmu");
-EXYNOS_PMU_IRQ(exynos4212_pmu_irq, "samsung,exynos4212-pmu");
 EXYNOS_PMU_IRQ(exynos4412_pmu_irq, "samsung,exynos4412-pmu");
 EXYNOS_PMU_IRQ(exynos5250_pmu_irq, "samsung,exynos5250-pmu");
 EXYNOS_PMU_IRQ(exynos5420_pmu_irq, "samsung,exynos5420-pmu");
@@ -616,9 +615,6 @@ static const struct of_device_id exynos_pmu_of_device_ids[] __initconst = {
 	}, {
 		.compatible = "samsung,exynos4210-pmu",
 		.data = &exynos4_pm_data,
-	}, {
-		.compatible = "samsung,exynos4212-pmu",
-		.data = &exynos4_pm_data,
 	}, {
 		.compatible = "samsung,exynos4412-pmu",
 		.data = &exynos4_pm_data,
-- 
2.14.2

[PATCH 2/7] soc: samsung: Remove Exynos4212 related dead code

[Marek Szyprowski]

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>
---
 Documentation/devicetree/bindings/arm/samsung/pmu.txt |  1 -
 drivers/soc/samsung/exynos-pmu.c                      |  9 ---------
 drivers/soc/samsung/exynos-pmu.h                      |  2 --
 drivers/soc/samsung/exynos4-pmu.c                     | 13 ++-----------
 4 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/Documentation/devicetree/bindings/arm/samsung/pmu.txt b/Documentation/devicetree/bindings/arm/samsung/pmu.txt
index bf5fc59a6938..87ed95512b63 100644
--- a/Documentation/devicetree/bindings/arm/samsung/pmu.txt
+++ b/Documentation/devicetree/bindings/arm/samsung/pmu.txt
@@ -4,7 +4,6 @@ Properties:
  - compatible : should contain two values. First value must be one from following list:
 		   - "samsung,exynos3250-pmu" - for Exynos3250 SoC,
 		   - "samsung,exynos4210-pmu" - for Exynos4210 SoC,
-		   - "samsung,exynos4212-pmu" - for Exynos4212 SoC,
 		   - "samsung,exynos4412-pmu" - for Exynos4412 SoC,
 		   - "samsung,exynos5250-pmu" - for Exynos5250 SoC,
 		   - "samsung,exynos5260-pmu" - for Exynos5260 SoC.
diff --git a/drivers/soc/samsung/exynos-pmu.c b/drivers/soc/samsung/exynos-pmu.c
index bd4a76f27bc2..938f8ccfcb74 100644
--- a/drivers/soc/samsung/exynos-pmu.c
+++ b/drivers/soc/samsung/exynos-pmu.c
@@ -60,12 +60,6 @@ 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);
-	}
 }
 
 /*
@@ -88,9 +82,6 @@ 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),
diff --git a/drivers/soc/samsung/exynos-pmu.h b/drivers/soc/samsung/exynos-pmu.h
index 40d4229abfb5..86b3f2f8966d 100644
--- a/drivers/soc/samsung/exynos-pmu.h
+++ b/drivers/soc/samsung/exynos-pmu.h
@@ -23,7 +23,6 @@ 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);
@@ -36,7 +35,6 @@ 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;
diff --git a/drivers/soc/samsung/exynos4-pmu.c b/drivers/soc/samsung/exynos4-pmu.c
index bc4fa73bed11..5dbfe4e31f4c 100644
--- a/drivers/soc/samsung/exynos4-pmu.c
+++ b/drivers/soc/samsung/exynos4-pmu.c
@@ -90,7 +90,7 @@ static const struct exynos_pmu_conf exynos4210_pmu_config[] = {
 	{ 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_DIS_IRQ_CORE0,			{ 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_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 } },
@@ -212,11 +208,6 @@ 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		= exynos4x12_pmu_config,
-	.pmu_config_extra	= exynos4412_pmu_config,
+	.pmu_config		= exynos4412_pmu_config,
 };
-- 
2.14.2

[PATCH 3/7] mmc: sdhci-s3c: Fix driver data for Exynos4 SoCs

[Marek Szyprowski]

Support for non-dt based initialization for Exynos SoCs has been removed,
so there is no need to keep driver IDs for this case. While touching this,
replace odd conditional code for instantiating driver data for Exynos4
SoCs with a simple reference and move that driver data under CONFIG_OF.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---
 drivers/mmc/host/sdhci-s3c.c | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
index d328fcf284d1..cda83ccb2702 100644
--- a/drivers/mmc/host/sdhci-s3c.c
+++ b/drivers/mmc/host/sdhci-s3c.c
@@ -761,32 +761,24 @@ static const struct dev_pm_ops sdhci_s3c_pmops = {
 			   NULL)
 };
 
-#if defined(CONFIG_CPU_EXYNOS4210) || defined(CONFIG_SOC_EXYNOS4212)
-static struct sdhci_s3c_drv_data exynos4_sdhci_drv_data = {
-	.no_divider = true,
-};
-#define EXYNOS4_SDHCI_DRV_DATA ((kernel_ulong_t)&exynos4_sdhci_drv_data)
-#else
-#define EXYNOS4_SDHCI_DRV_DATA ((kernel_ulong_t)NULL)
-#endif
-
 static const struct platform_device_id sdhci_s3c_driver_ids[] = {
 	{
 		.name		= "s3c-sdhci",
 		.driver_data	= (kernel_ulong_t)NULL,
-	}, {
-		.name		= "exynos4-sdhci",
-		.driver_data	= EXYNOS4_SDHCI_DRV_DATA,
 	},
 	{ }
 };
 MODULE_DEVICE_TABLE(platform, sdhci_s3c_driver_ids);
 
 #ifdef CONFIG_OF
+static struct sdhci_s3c_drv_data exynos4_sdhci_drv_data = {
+	.no_divider = true,
+};
+
 static const struct of_device_id sdhci_s3c_dt_match[] = {
 	{ .compatible = "samsung,s3c6410-sdhci", },
 	{ .compatible = "samsung,exynos4210-sdhci",
-		.data = (void *)EXYNOS4_SDHCI_DRV_DATA },
+		.data = &exynos4_sdhci_drv_data },
 	{},
 };
 MODULE_DEVICE_TABLE(of, sdhci_s3c_dt_match);
-- 
2.14.2

[PATCH 4/7] media: exynos4-is: Remove dependency on obsolete SoC support

[Marek Szyprowski]

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>
---
 drivers/media/platform/exynos4-is/Kconfig     | 2 +-
 drivers/media/platform/exynos4-is/fimc-core.c | 2 +-
 drivers/media/platform/exynos4-is/fimc-lite.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/media/platform/exynos4-is/Kconfig b/drivers/media/platform/exynos4-is/Kconfig
index 46a7d242a1a5..7b2c49e5a592 100644
--- a/drivers/media/platform/exynos4-is/Kconfig
+++ b/drivers/media/platform/exynos4-is/Kconfig
@@ -41,7 +41,7 @@ config VIDEO_S5P_MIPI_CSIS
 	  To compile this driver as a module, choose M here: the
 	  module will be called s5p-csis.
 
-if SOC_EXYNOS4212 || SOC_EXYNOS4412 || SOC_EXYNOS5250
+if SOC_EXYNOS4412 || SOC_EXYNOS5250
 
 config VIDEO_EXYNOS_FIMC_LITE
 	tristate "EXYNOS FIMC-LITE camera interface driver"
diff --git a/drivers/media/platform/exynos4-is/fimc-core.c b/drivers/media/platform/exynos4-is/fimc-core.c
index 099c735a39b7..7ae239f2b0fd 100644
--- a/drivers/media/platform/exynos4-is/fimc-core.c
+++ b/drivers/media/platform/exynos4-is/fimc-core.c
@@ -1211,7 +1211,7 @@ static const struct fimc_drvdata fimc_drvdata_exynos4210 = {
 	.out_buf_count	= 32,
 };
 
-/* EXYNOS4212, EXYNOS4412 */
+/* EXYNOS4412 */
 static const struct fimc_drvdata fimc_drvdata_exynos4x12 = {
 	.num_entities	= 4,
 	.lclk_frequency	= 166000000UL,
diff --git a/drivers/media/platform/exynos4-is/fimc-lite.c b/drivers/media/platform/exynos4-is/fimc-lite.c
index 4a3c9948ca54..3805a6daa3f4 100644
--- a/drivers/media/platform/exynos4-is/fimc-lite.c
+++ b/drivers/media/platform/exynos4-is/fimc-lite.c
@@ -1646,7 +1646,7 @@ static const struct dev_pm_ops fimc_lite_pm_ops = {
 			   NULL)
 };
 
-/* EXYNOS4212, EXYNOS4412 */
+/* EXYNOS4412 */
 static struct flite_drvdata fimc_lite_drvdata_exynos4 = {
 	.max_width		= 8192,
 	.max_height		= 8192,
-- 
2.14.2

[PATCH 5/7] clk: samsung: Remove support for Exynos4212 SoCs in Exynos CLKOUT driver

[Marek Szyprowski]

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>
---
 drivers/clk/samsung/clk-exynos-clkout.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/clk/samsung/clk-exynos-clkout.c b/drivers/clk/samsung/clk-exynos-clkout.c
index a21aea062bae..f29fb5824005 100644
--- a/drivers/clk/samsung/clk-exynos-clkout.c
+++ b/drivers/clk/samsung/clk-exynos-clkout.c
@@ -144,8 +144,6 @@ static void __init exynos4_clkout_init(struct device_node *node)
 }
 CLK_OF_DECLARE_DRIVER(exynos4210_clkout, "samsung,exynos4210-pmu",
 		exynos4_clkout_init);
-CLK_OF_DECLARE_DRIVER(exynos4212_clkout, "samsung,exynos4212-pmu",
-		exynos4_clkout_init);
 CLK_OF_DECLARE_DRIVER(exynos4412_clkout, "samsung,exynos4412-pmu",
 		exynos4_clkout_init);
 CLK_OF_DECLARE_DRIVER(exynos3250_clkout, "samsung,exynos3250-pmu",
-- 
2.14.2

[PATCH 6/7] phy: samsung: Remove dependency on obsolete SoC support

[Marek Szyprowski]

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>
---
 drivers/phy/samsung/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/phy/samsung/Kconfig b/drivers/phy/samsung/Kconfig
index b7e0645a7bd9..2a5d33cb0e7e 100644
--- a/drivers/phy/samsung/Kconfig
+++ b/drivers/phy/samsung/Kconfig
@@ -49,7 +49,7 @@ config PHY_EXYNOS4210_USB2
 config PHY_EXYNOS4X12_USB2
 	bool
 	depends on PHY_SAMSUNG_USB2
-	default SOC_EXYNOS3250 || SOC_EXYNOS4212 || SOC_EXYNOS4412
+	default SOC_EXYNOS3250 || SOC_EXYNOS4412
 
 config PHY_EXYNOS5250_USB2
 	bool
-- 
2.14.2

[PATCH 7/7] cpufreq: dt: Remove support for Exynos4212 SoCs

[Marek Szyprowski]

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>
---
 drivers/cpufreq/cpufreq-dt-platdev.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/cpufreq/cpufreq-dt-platdev.c b/drivers/cpufreq/cpufreq-dt-platdev.c
index a753c50e9e41..4946ac528b72 100644
--- a/drivers/cpufreq/cpufreq-dt-platdev.c
+++ b/drivers/cpufreq/cpufreq-dt-platdev.c
@@ -48,7 +48,6 @@ static const struct of_device_id whitelist[] __initconst = {
 
 	{ .compatible = "samsung,exynos3250", },
 	{ .compatible = "samsung,exynos4210", },
-	{ .compatible = "samsung,exynos4212", },
 	{ .compatible = "samsung,exynos5250", },
 #ifndef CONFIG_BL_SWITCHER
 	{ .compatible = "samsung,exynos5800", },
-- 
2.14.2

Re: [PATCH 7/7] cpufreq: dt: Remove support for Exynos4212 SoCs

[Viresh Kumar]

On 04-10-17, 08:38, Marek Szyprowski wrote:
> 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>
> ---
>  drivers/cpufreq/cpufreq-dt-platdev.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/cpufreq/cpufreq-dt-platdev.c b/drivers/cpufreq/cpufreq-dt-platdev.c
> index a753c50e9e41..4946ac528b72 100644
> --- a/drivers/cpufreq/cpufreq-dt-platdev.c
> +++ b/drivers/cpufreq/cpufreq-dt-platdev.c
> @@ -48,7 +48,6 @@ static const struct of_device_id whitelist[] __initconst = {
>  
>  	{ .compatible = "samsung,exynos3250", },
>  	{ .compatible = "samsung,exynos4210", },
> -	{ .compatible = "samsung,exynos4212", },
>  	{ .compatible = "samsung,exynos5250", },
>  #ifndef CONFIG_BL_SWITCHER
>  	{ .compatible = "samsung,exynos5800", },

Acked-by: Viresh Kumar <viresh.kumar@linaro.org>

-- 
viresh

Re: [PATCH 3/7] mmc: sdhci-s3c: Fix driver data for Exynos4 SoCs

[Ulf Hansson]

On 4 October 2017 at 08:38, Marek Szyprowski <m.szyprowski@samsung.com> wrote:
> Support for non-dt based initialization for Exynos SoCs has been removed,
> so there is no need to keep driver IDs for this case. While touching this,
> replace odd conditional code for instantiating driver data for Exynos4
> SoCs with a simple reference and move that driver data under CONFIG_OF.
>
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>

Are there some dependency to any other earlier patches in this series,
or is it safe to apply standalone to my mmc tree?

Kind regards
Uffe

> ---
>  drivers/mmc/host/sdhci-s3c.c | 18 +++++-------------
>  1 file changed, 5 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
> index d328fcf284d1..cda83ccb2702 100644
> --- a/drivers/mmc/host/sdhci-s3c.c
> +++ b/drivers/mmc/host/sdhci-s3c.c
> @@ -761,32 +761,24 @@ static const struct dev_pm_ops sdhci_s3c_pmops = {
>                            NULL)
>  };
>
> -#if defined(CONFIG_CPU_EXYNOS4210) || defined(CONFIG_SOC_EXYNOS4212)
> -static struct sdhci_s3c_drv_data exynos4_sdhci_drv_data = {
> -       .no_divider = true,
> -};
> -#define EXYNOS4_SDHCI_DRV_DATA ((kernel_ulong_t)&exynos4_sdhci_drv_data)
> -#else
> -#define EXYNOS4_SDHCI_DRV_DATA ((kernel_ulong_t)NULL)
> -#endif
> -
>  static const struct platform_device_id sdhci_s3c_driver_ids[] = {
>         {
>                 .name           = "s3c-sdhci",
>                 .driver_data    = (kernel_ulong_t)NULL,
> -       }, {
> -               .name           = "exynos4-sdhci",
> -               .driver_data    = EXYNOS4_SDHCI_DRV_DATA,
>         },
>         { }
>  };
>  MODULE_DEVICE_TABLE(platform, sdhci_s3c_driver_ids);
>
>  #ifdef CONFIG_OF
> +static struct sdhci_s3c_drv_data exynos4_sdhci_drv_data = {
> +       .no_divider = true,
> +};
> +
>  static const struct of_device_id sdhci_s3c_dt_match[] = {
>         { .compatible = "samsung,s3c6410-sdhci", },
>         { .compatible = "samsung,exynos4210-sdhci",
> -               .data = (void *)EXYNOS4_SDHCI_DRV_DATA },
> +               .data = &exynos4_sdhci_drv_data },
>         {},
>  };
>  MODULE_DEVICE_TABLE(of, sdhci_s3c_dt_match);
> --
> 2.14.2
>

Re: [PATCH 3/7] mmc: sdhci-s3c: Fix driver data for Exynos4 SoCs

[Marek Szyprowski]

Hi Ulf,

On 2017-10-04 10:08, Ulf Hansson wrote:
> On 4 October 2017 at 08:38, Marek Szyprowski <m.szyprowski@samsung.com> wrote:
>> Support for non-dt based initialization for Exynos SoCs has been removed,
>> so there is no need to keep driver IDs for this case. While touching this,
>> replace odd conditional code for instantiating driver data for Exynos4
>> SoCs with a simple reference and move that driver data under CONFIG_OF.
>>
>> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> Are there some dependency to any other earlier patches in this series,
> or is it safe to apply standalone to my mmc tree?

It is safe to apply it standalone. Other patches in this series are 
cleanup in
other drivers.

>
> Kind regards
> Uffe
>
>> ---
>>   drivers/mmc/host/sdhci-s3c.c | 18 +++++-------------
>>   1 file changed, 5 insertions(+), 13 deletions(-)
>>
>> diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
>> index d328fcf284d1..cda83ccb2702 100644
>> --- a/drivers/mmc/host/sdhci-s3c.c
>> +++ b/drivers/mmc/host/sdhci-s3c.c
>> @@ -761,32 +761,24 @@ static const struct dev_pm_ops sdhci_s3c_pmops = {
>>                             NULL)
>>   };
>>
>> -#if defined(CONFIG_CPU_EXYNOS4210) || defined(CONFIG_SOC_EXYNOS4212)
>> -static struct sdhci_s3c_drv_data exynos4_sdhci_drv_data = {
>> -       .no_divider = true,
>> -};
>> -#define EXYNOS4_SDHCI_DRV_DATA ((kernel_ulong_t)&exynos4_sdhci_drv_data)
>> -#else
>> -#define EXYNOS4_SDHCI_DRV_DATA ((kernel_ulong_t)NULL)
>> -#endif
>> -
>>   static const struct platform_device_id sdhci_s3c_driver_ids[] = {
>>          {
>>                  .name           = "s3c-sdhci",
>>                  .driver_data    = (kernel_ulong_t)NULL,
>> -       }, {
>> -               .name           = "exynos4-sdhci",
>> -               .driver_data    = EXYNOS4_SDHCI_DRV_DATA,
>>          },
>>          { }
>>   };
>>   MODULE_DEVICE_TABLE(platform, sdhci_s3c_driver_ids);
>>
>>   #ifdef CONFIG_OF
>> +static struct sdhci_s3c_drv_data exynos4_sdhci_drv_data = {
>> +       .no_divider = true,
>> +};
>> +
>>   static const struct of_device_id sdhci_s3c_dt_match[] = {
>>          { .compatible = "samsung,s3c6410-sdhci", },
>>          { .compatible = "samsung,exynos4210-sdhci",
>> -               .data = (void *)EXYNOS4_SDHCI_DRV_DATA },
>> +               .data = &exynos4_sdhci_drv_data },
>>          {},
>>   };
>>   MODULE_DEVICE_TABLE(of, sdhci_s3c_dt_match);
>> --
>> 2.14.2
>>
>
>

Best regards
-- 
Marek Szyprowski, PhD
Samsung R&D Institute Poland

Re: [PATCH 3/7] mmc: sdhci-s3c: Fix driver data for Exynos4 SoCs

[Krzysztof Kozlowski]

On Wed, Oct 4, 2017 at 8:38 AM, Marek Szyprowski
<m.szyprowski@samsung.com> wrote:
> Support for non-dt based initialization for Exynos SoCs has been removed,
> so there is no need to keep driver IDs for this case. While touching this,
> replace odd conditional code for instantiating driver data for Exynos4
> SoCs with a simple reference and move that driver data under CONFIG_OF.
>
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> ---
>  drivers/mmc/host/sdhci-s3c.c | 18 +++++-------------
>  1 file changed, 5 insertions(+), 13 deletions(-)
>

Acked-by: Krzysztof Kozlowski <krzk@kernel.org>

Best regards,
Krzysztof

Re: [PATCH 4/7] media: exynos4-is: Remove dependency on obsolete SoC support

[Krzysztof Kozlowski]

On Wed, Oct 4, 2017 at 8:38 AM, Marek Szyprowski
<m.szyprowski@samsung.com> wrote:
> 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>
> ---
>  drivers/media/platform/exynos4-is/Kconfig     | 2 +-
>  drivers/media/platform/exynos4-is/fimc-core.c | 2 +-
>  drivers/media/platform/exynos4-is/fimc-lite.c | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)

Acked-by: Krzysztof Kozlowski <krzk@kernel.org>

Best regards,
Krzysztof

Re: [PATCH 5/7] clk: samsung: Remove support for Exynos4212 SoCs in Exynos CLKOUT driver

[Krzysztof Kozlowski]

On Wed, Oct 4, 2017 at 8:38 AM, Marek Szyprowski
<m.szyprowski@samsung.com> wrote:
> 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>
> ---
>  drivers/clk/samsung/clk-exynos-clkout.c | 2 --
>  1 file changed, 2 deletions(-)

Acked-by: Krzysztof Kozlowski <krzk@kernel.org>

Best regards,
Krzysztof

Re: [PATCH 6/7] phy: samsung: Remove dependency on obsolete SoC support

[Krzysztof Kozlowski]

On Wed, Oct 4, 2017 at 8:38 AM, Marek Szyprowski
<m.szyprowski@samsung.com> wrote:
> 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>
> ---
>  drivers/phy/samsung/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>

Acked-by: Krzysztof Kozlowski <krzk@kernel.org>

Best regards,
Krzysztof

Re: [PATCH 7/7] cpufreq: dt: Remove support for Exynos4212 SoCs

[Krzysztof Kozlowski]

On Wed, Oct 4, 2017 at 8:38 AM, Marek Szyprowski
<m.szyprowski@samsung.com> wrote:
> 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>
> ---
>  drivers/cpufreq/cpufreq-dt-platdev.c | 1 -
>  1 file changed, 1 deletion(-)
>

Acked-by: Krzysztof Kozlowski <krzk@kernel.org>

Best regards,
Krzysztof

Re: [PATCH 6/7] phy: samsung: Remove dependency on obsolete SoC support

[Sylwester Nawrocki]

On 10/04/2017 08:38 AM, Marek Szyprowski wrote:
> 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>

Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>

Re: [PATCH 5/7] clk: samsung: Remove support for Exynos4212 SoCs in Exynos CLKOUT driver

[Sylwester Nawrocki]

On 10/04/2017 08:38 AM, Marek Szyprowski wrote:
> 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>

Applied, thanks.

Re: [PATCH 3/7] mmc: sdhci-s3c: Fix driver data for Exynos4 SoCs

[Sylwester Nawrocki]

On 10/04/2017 08:38 AM, Marek Szyprowski wrote:
> Support for non-dt based initialization for Exynos SoCs has been removed,
> so there is no need to keep driver IDs for this case. While touching this,
> replace odd conditional code for instantiating driver data for Exynos4
> SoCs with a simple reference and move that driver data under CONFIG_OF.
> 
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>

Reviewed-by: Sylwester Nawrocki <m.szyprowski@samsung.com>

Re: [PATCH 3/7] mmc: sdhci-s3c: Fix driver data for Exynos4 SoCs

[Ulf Hansson]

On 4 October 2017 at 08:38, Marek Szyprowski <m.szyprowski@samsung.com> wrote:
> Support for non-dt based initialization for Exynos SoCs has been removed,
> so there is no need to keep driver IDs for this case. While touching this,
> replace odd conditional code for instantiating driver data for Exynos4
> SoCs with a simple reference and move that driver data under CONFIG_OF.
>
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>

Thanks, applied for next!

Kind regards
Uffe

> ---
>  drivers/mmc/host/sdhci-s3c.c | 18 +++++-------------
>  1 file changed, 5 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
> index d328fcf284d1..cda83ccb2702 100644
> --- a/drivers/mmc/host/sdhci-s3c.c
> +++ b/drivers/mmc/host/sdhci-s3c.c
> @@ -761,32 +761,24 @@ static const struct dev_pm_ops sdhci_s3c_pmops = {
>                            NULL)
>  };
>
> -#if defined(CONFIG_CPU_EXYNOS4210) || defined(CONFIG_SOC_EXYNOS4212)
> -static struct sdhci_s3c_drv_data exynos4_sdhci_drv_data = {
> -       .no_divider = true,
> -};
> -#define EXYNOS4_SDHCI_DRV_DATA ((kernel_ulong_t)&exynos4_sdhci_drv_data)
> -#else
> -#define EXYNOS4_SDHCI_DRV_DATA ((kernel_ulong_t)NULL)
> -#endif
> -
>  static const struct platform_device_id sdhci_s3c_driver_ids[] = {
>         {
>                 .name           = "s3c-sdhci",
>                 .driver_data    = (kernel_ulong_t)NULL,
> -       }, {
> -               .name           = "exynos4-sdhci",
> -               .driver_data    = EXYNOS4_SDHCI_DRV_DATA,
>         },
>         { }
>  };
>  MODULE_DEVICE_TABLE(platform, sdhci_s3c_driver_ids);
>
>  #ifdef CONFIG_OF
> +static struct sdhci_s3c_drv_data exynos4_sdhci_drv_data = {
> +       .no_divider = true,
> +};
> +
>  static const struct of_device_id sdhci_s3c_dt_match[] = {
>         { .compatible = "samsung,s3c6410-sdhci", },
>         { .compatible = "samsung,exynos4210-sdhci",
> -               .data = (void *)EXYNOS4_SDHCI_DRV_DATA },
> +               .data = &exynos4_sdhci_drv_data },
>         {},
>  };
>  MODULE_DEVICE_TABLE(of, sdhci_s3c_dt_match);
> --
> 2.14.2
>

Re: [PATCH 3/7] mmc: sdhci-s3c: Fix driver data for Exynos4 SoCs

[Sylwester Nawrocki]

On 10/04/2017 10:39 AM, Sylwester Nawrocki wrote:
> On 10/04/2017 08:38 AM, Marek Szyprowski wrote:
>> Support for non-dt based initialization for Exynos SoCs has been removed,
>> so there is no need to keep driver IDs for this case. While touching this,
>> replace odd conditional code for instantiating driver data for Exynos4
>> SoCs with a simple reference and move that driver data under CONFIG_OF.
>>
>> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>

> Reviewed-by: Sylwester Nawrocki <m.szyprowski@samsung.com>

Oops, this should have been:
Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>

I guess it's too late to fix that since the patch is applied to a stable
branch.

--
Regards,
Sylwester

Re: [PATCH 3/7] mmc: sdhci-s3c: Fix driver data for Exynos4 SoCs

[Ulf Hansson]

On 4 October 2017 at 12:03, Sylwester Nawrocki <s.nawrocki@samsung.com> wrote:
> On 10/04/2017 10:39 AM, Sylwester Nawrocki wrote:
>> On 10/04/2017 08:38 AM, Marek Szyprowski wrote:
>>> Support for non-dt based initialization for Exynos SoCs has been removed,
>>> so there is no need to keep driver IDs for this case. While touching this,
>>> replace odd conditional code for instantiating driver data for Exynos4
>>> SoCs with a simple reference and move that driver data under CONFIG_OF.
>>>
>>> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
>
>> Reviewed-by: Sylwester Nawrocki <m.szyprowski@samsung.com>
>
> Oops, this should have been:
> Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
>
> I guess it's too late to fix that since the patch is applied to a stable
> branch.

I can deal with that, no worries.

Kind regards
Uffe

Re: [PATCH 1/7] ARM: EXYNOS: Remove Exynos4212 related dead code

[Krzysztof Kozlowski]

On Wed, Oct 04, 2017 at 08:38:22AM +0200, Marek Szyprowski wrote:
> 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>
> ---
>  arch/arm/mach-exynos/Kconfig    |  5 -----
>  arch/arm/mach-exynos/common.h   | 11 +----------
>  arch/arm/mach-exynos/exynos.c   |  2 --
>  arch/arm/mach-exynos/firmware.c |  5 -----
>  arch/arm/mach-exynos/pm.c       |  3 +--
>  arch/arm/mach-exynos/suspend.c  |  4 ----
>  6 files changed, 2 insertions(+), 28 deletions(-)
> 

Thanks for the cleanup, much appreciated!

Applied.

Best regards,
Krzysztof

Re: [PATCH 2/7] soc: samsung: Remove Exynos4212 related dead code

[Krzysztof Kozlowski]

On Wed, Oct 04, 2017 at 08:38:23AM +0200, Marek Szyprowski wrote:
> 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>
> ---
>  Documentation/devicetree/bindings/arm/samsung/pmu.txt |  1 -
>  drivers/soc/samsung/exynos-pmu.c                      |  9 ---------
>  drivers/soc/samsung/exynos-pmu.h                      |  2 --
>  drivers/soc/samsung/exynos4-pmu.c                     | 13 ++-----------
>  4 files changed, 2 insertions(+), 23 deletions(-)
> 

Thanks, applied.

Best regards,
Krzysztof

Re: [PATCH 4/7] media: exynos4-is: Remove dependency on obsolete SoC support

[Sylwester Nawrocki]

On 10/04/2017 08:38 AM, Marek Szyprowski wrote:
> 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>

Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>