| Message ID | 20171004063828.22068-1-m.szyprowski@samsung.com |
|---|---|
| Headers | show |
| Series | Remove remaining Exynos4212-related dead code | expand |
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 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 > -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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> -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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> -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 > -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html