This patch removes supporting s5pc100 related pwm codes. Signed-off-by: Kukjin Kim <kgene.kim@xxxxxxxxxxx> Cc: Thierry Reding <thierry.reding@xxxxxxxxx> --- Documentation/devicetree/bindings/pwm/pwm-samsung.txt | 2 -- drivers/clocksource/samsung_pwm_timer.c | 12 ------------ drivers/pwm/pwm-samsung.c | 8 -------- 3 files changed, 22 deletions(-) diff --git a/Documentation/devicetree/bindings/pwm/pwm-samsung.txt b/Documentation/devicetree/bindings/pwm/pwm-samsung.txt index 43925d3..82c7f6b 100644 --- a/Documentation/devicetree/bindings/pwm/pwm-samsung.txt +++ b/Documentation/devicetree/bindings/pwm/pwm-samsung.txt @@ -11,8 +11,6 @@ Required properties: - compatible : should be one of following: samsung,s3c2410-pwm - for 16-bit timers present on S3C24xx SoCs samsung,s3c6400-pwm - for 32-bit timers present on S3C64xx SoCs - samsung,s5pc100-pwm - for 32-bit timers present on S5PC100, S5PV210, - Exynos4210 rev0 SoCs samsung,exynos4210-pwm - for 32-bit timers present on Exynos4210, Exynos4x12, Exynos5250 and Exynos5420 SoCs - reg: base address and size of register area diff --git a/drivers/clocksource/samsung_pwm_timer.c b/drivers/clocksource/samsung_pwm_timer.c index e35a9b7..d846caa 100644 --- a/drivers/clocksource/samsung_pwm_timer.c +++ b/drivers/clocksource/samsung_pwm_timer.c @@ -480,16 +480,4 @@ static void __init s3c64xx_pwm_clocksource_init(struct device_node *np) } CLOCKSOURCE_OF_DECLARE(s3c6400_pwm, "samsung,s3c6400-pwm", s3c64xx_pwm_clocksource_init); -static const struct samsung_pwm_variant s5p_variant = { - .bits = 32, - .div_base = 0, - .has_tint_cstat = true, - .tclk_mask = (1 << 5), -}; - -static void __init s5p_pwm_clocksource_init(struct device_node *np) -{ - samsung_pwm_alloc(np, &s5p_variant); -} -CLOCKSOURCE_OF_DECLARE(s5pc100_pwm, "samsung,s5pc100-pwm", s5p_pwm_clocksource_init); #endif diff --git a/drivers/pwm/pwm-samsung.c b/drivers/pwm/pwm-samsung.c index 68f3471..d40364a 100644 --- a/drivers/pwm/pwm-samsung.c +++ b/drivers/pwm/pwm-samsung.c @@ -411,17 +411,9 @@ static const struct samsung_pwm_variant exynos4210_variant = { .tclk_mask = 0, }; -static const struct samsung_pwm_variant s5pc100_variant = { - .bits = 32, - .div_base = 0, - .has_tint_cstat = true, - .tclk_mask = BIT(5), -}; - static const struct of_device_id samsung_pwm_matches[] = { { .compatible = "samsung,s3c2410-pwm", .data = &s3c24xx_variant }, { .compatible = "samsung,s3c6400-pwm", .data = &s3c64xx_variant }, - { .compatible = "samsung,s5pc100-pwm", .data = &s5pc100_variant }, { .compatible = "samsung,exynos4210-pwm", .data = &exynos4210_variant }, {}, }; -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html