From: Kukjin Kim <kgene.kim@samsung.com> To: 'Tomasz Figa' <t.figa@samsung.com>, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Cc: 'Thierry Reding' <thierry.reding@gmail.com> Subject: RE: [PATCH 11/17] pwm: samsung: remove s5pc100 related pwm codes Date: Fri, 04 Jul 2014 16:32:22 +0900 [thread overview] Message-ID: <02ca01cf975a$1848aaa0$48d9ffe0$@samsung.com> (raw) In-Reply-To: <53B55021.9020307@samsung.com> Tomasz Figa wrote: > > Hi Kukjin, > Hi, > On 30.06.2014 23:32, Kukjin Kim wrote: > > This patch removes supporting s5pc100 related pwm codes. > > > > Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> > > Cc: Thierry Reding <thierry.reding@gmail.com> > > --- > > 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 > > As you can see here, this variant is used for more than S5PC100. It is > needed for S5PV210 and Exynos4210 rev0 SoCs as well. So this patch > should be dropped. Oh, I just now checked its datasheets and s5pv210 and early exynos4210 are using BIT(5) for tclk_mask. You're right. But I couldn't its usage in mainline when I created the patch. Anyway it can be used for s5pv210 so how about following? pwm: samsung: change s5pc100-pwm to s5pv210-pwm for support s5pv210 SoC Reported-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Cc: Thierry Reding <thierry.reding@gmail.com> --- diff --git a/Documentation/devicetree/bindings/pwm/pwm-samsung.txt b/Documentation/devicetree/bindings/pwm/pwm-samsung.txt index 43925d3..ce005c0 100644 --- a/Documentation/devicetree/bindings/pwm/pwm-samsung.txt +++ b/Documentation/devicetree/bindings/pwm/pwm-samsung.txt @@ -11,8 +11,8 @@ 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,s5pv210-pwm - for 32-bit timers present on S5PV210 and + 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..f0a5918 100644 --- a/drivers/clocksource/samsung_pwm_timer.c +++ b/drivers/clocksource/samsung_pwm_timer.c @@ -480,16 +480,16 @@ 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 = { +static const struct samsung_pwm_variant s5pv210_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) +static void __init s5pv210_pwm_clocksource_init(struct device_node *np) { - samsung_pwm_alloc(np, &s5p_variant); + samsung_pwm_alloc(np, &s5pv210_variant); } -CLOCKSOURCE_OF_DECLARE(s5pc100_pwm, "samsung,s5pc100-pwm", s5p_pwm_clocksource_init); +CLOCKSOURCE_OF_DECLARE(s5pv210_pwm, "samsung,s5pv210-pwm", s5pv210_pwm_clocksource_init); #endif diff --git a/drivers/pwm/pwm-samsung.c b/drivers/pwm/pwm-samsung.c index 68f3471..a2bafc9 100644 --- a/drivers/pwm/pwm-samsung.c +++ b/drivers/pwm/pwm-samsung.c @@ -404,24 +404,24 @@ static const struct samsung_pwm_variant s3c64xx_variant = { .tclk_mask = BIT(7) | BIT(6) | BIT(5), }; -static const struct samsung_pwm_variant exynos4210_variant = { +static const struct samsung_pwm_variant s5pv210_variant = { .bits = 32, .div_base = 0, .has_tint_cstat = true, - .tclk_mask = 0, + .tclk_mask = BIT(5), }; -static const struct samsung_pwm_variant s5pc100_variant = { +static const struct samsung_pwm_variant exynos4210_variant = { .bits = 32, .div_base = 0, .has_tint_cstat = true, - .tclk_mask = BIT(5), + .tclk_mask = 0, }; 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,s5pv210-pwm", .data = &s5pv210_variant }, { .compatible = "samsung,exynos4210-pwm", .data = &exynos4210_variant }, {}, };
WARNING: multiple messages have this Message-ID (diff)
From: kgene.kim@samsung.com (Kukjin Kim) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 11/17] pwm: samsung: remove s5pc100 related pwm codes Date: Fri, 04 Jul 2014 16:32:22 +0900 [thread overview] Message-ID: <02ca01cf975a$1848aaa0$48d9ffe0$@samsung.com> (raw) In-Reply-To: <53B55021.9020307@samsung.com> Tomasz Figa wrote: > > Hi Kukjin, > Hi, > On 30.06.2014 23:32, Kukjin Kim wrote: > > This patch removes supporting s5pc100 related pwm codes. > > > > Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> > > Cc: Thierry Reding <thierry.reding@gmail.com> > > --- > > 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 > > As you can see here, this variant is used for more than S5PC100. It is > needed for S5PV210 and Exynos4210 rev0 SoCs as well. So this patch > should be dropped. Oh, I just now checked its datasheets and s5pv210 and early exynos4210 are using BIT(5) for tclk_mask. You're right. But I couldn't its usage in mainline when I created the patch. Anyway it can be used for s5pv210 so how about following? pwm: samsung: change s5pc100-pwm to s5pv210-pwm for support s5pv210 SoC Reported-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Cc: Thierry Reding <thierry.reding@gmail.com> --- diff --git a/Documentation/devicetree/bindings/pwm/pwm-samsung.txt b/Documentation/devicetree/bindings/pwm/pwm-samsung.txt index 43925d3..ce005c0 100644 --- a/Documentation/devicetree/bindings/pwm/pwm-samsung.txt +++ b/Documentation/devicetree/bindings/pwm/pwm-samsung.txt @@ -11,8 +11,8 @@ 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,s5pv210-pwm - for 32-bit timers present on S5PV210 and + 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..f0a5918 100644 --- a/drivers/clocksource/samsung_pwm_timer.c +++ b/drivers/clocksource/samsung_pwm_timer.c @@ -480,16 +480,16 @@ 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 = { +static const struct samsung_pwm_variant s5pv210_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) +static void __init s5pv210_pwm_clocksource_init(struct device_node *np) { - samsung_pwm_alloc(np, &s5p_variant); + samsung_pwm_alloc(np, &s5pv210_variant); } -CLOCKSOURCE_OF_DECLARE(s5pc100_pwm, "samsung,s5pc100-pwm", s5p_pwm_clocksource_init); +CLOCKSOURCE_OF_DECLARE(s5pv210_pwm, "samsung,s5pv210-pwm", s5pv210_pwm_clocksource_init); #endif diff --git a/drivers/pwm/pwm-samsung.c b/drivers/pwm/pwm-samsung.c index 68f3471..a2bafc9 100644 --- a/drivers/pwm/pwm-samsung.c +++ b/drivers/pwm/pwm-samsung.c @@ -404,24 +404,24 @@ static const struct samsung_pwm_variant s3c64xx_variant = { .tclk_mask = BIT(7) | BIT(6) | BIT(5), }; -static const struct samsung_pwm_variant exynos4210_variant = { +static const struct samsung_pwm_variant s5pv210_variant = { .bits = 32, .div_base = 0, .has_tint_cstat = true, - .tclk_mask = 0, + .tclk_mask = BIT(5), }; -static const struct samsung_pwm_variant s5pc100_variant = { +static const struct samsung_pwm_variant exynos4210_variant = { .bits = 32, .div_base = 0, .has_tint_cstat = true, - .tclk_mask = BIT(5), + .tclk_mask = 0, }; 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,s5pv210-pwm", .data = &s5pv210_variant }, { .compatible = "samsung,exynos4210-pwm", .data = &exynos4210_variant }, {}, };
next prev parent reply other threads:[~2014-07-04 7:32 UTC|newest] Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-06-30 21:32 [PATCH 00/17] ARM: S5P64X0, S5PC100: no more support in mainline Kukjin Kim 2014-06-30 21:32 ` Kukjin Kim 2014-06-30 13:34 ` Arnd Bergmann 2014-06-30 13:34 ` Arnd Bergmann 2014-06-30 14:22 ` Thierry Reding 2014-06-30 14:22 ` Thierry Reding 2014-06-30 14:31 ` Arnd Bergmann 2014-06-30 14:31 ` Arnd Bergmann 2014-07-01 2:08 ` Kukjin Kim 2014-07-01 2:08 ` Kukjin Kim 2014-06-30 15:31 ` Tushar Behera 2014-06-30 15:31 ` Tushar Behera 2014-07-01 2:08 ` Kukjin Kim 2014-07-01 2:08 ` Kukjin Kim 2014-06-30 21:32 ` [PATCH 02/17] gpio: samsung: remove s5p64x0 related gpio codes Kukjin Kim 2014-06-30 21:32 ` Kukjin Kim 2014-07-07 16:05 ` Linus Walleij 2014-07-07 16:05 ` Linus Walleij 2014-06-30 21:32 ` [PATCH 03/17] spi: s3c64xx: remove s5p64x0 related spi codes Kukjin Kim 2014-06-30 21:32 ` Kukjin Kim 2014-06-30 21:32 ` [PATCH 04/17] ASoC: samsung: no more support for S5P6440 and S5P6450 SoCs Kukjin Kim 2014-06-30 21:32 ` Kukjin Kim 2014-06-30 21:32 ` [PATCH 05/17] pwm: samsung: remove s5p64x0 related pwm codes Kukjin Kim 2014-06-30 21:32 ` Kukjin Kim 2014-07-04 8:10 ` Tomasz Figa 2014-07-04 8:10 ` Tomasz Figa 2014-07-07 22:23 ` Kukjin Kim 2014-07-07 22:23 ` Kukjin Kim 2014-07-08 15:43 ` Tomasz Figa 2014-07-08 15:43 ` Tomasz Figa 2014-06-30 21:32 ` [PATCH 06/17] video: fbdev: s3c-fb: remove s5p64x0 related fimd codes Kukjin Kim 2014-06-30 21:32 ` Kukjin Kim 2014-07-01 2:04 ` Jingoo Han 2014-07-01 2:04 ` Jingoo Han 2014-07-01 6:25 ` Tomi Valkeinen 2014-07-01 6:25 ` Tomi Valkeinen 2014-06-30 21:32 ` [PATCH 07/17] serial: samsung: no more support for S5P6440 and S5P6450 SoCs Kukjin Kim 2014-06-30 21:32 ` Kukjin Kim 2014-06-30 21:32 ` [PATCH 09/17] gpio: samsung: remov s5pc100 related gpio codes Kukjin Kim 2014-06-30 21:32 ` Kukjin Kim 2014-07-07 16:05 ` Linus Walleij 2014-07-07 16:05 ` Linus Walleij 2014-06-30 21:32 ` [PATCH 10/17] spi: s3c64xx: remove s5pc100 related spi codes Kukjin Kim 2014-06-30 21:32 ` Kukjin Kim 2014-06-30 21:32 ` [PATCH 11/17] pwm: samsung: remove s5pc100 related pwm codes Kukjin Kim 2014-06-30 21:32 ` Kukjin Kim 2014-07-03 12:44 ` Tomasz Figa 2014-07-03 12:44 ` Tomasz Figa 2014-07-04 7:32 ` Kukjin Kim [this message] 2014-07-04 7:32 ` Kukjin Kim 2014-07-04 8:07 ` Tomasz Figa 2014-07-04 8:07 ` Tomasz Figa 2014-06-30 21:32 ` [PATCH 12/17] serial: samsung: no more support for S5PC100 SoC Kukjin Kim 2014-06-30 21:32 ` Kukjin Kim 2014-06-30 21:32 ` [PATCH 13/17] ata: pata_samsung_cf: removes s5pc100 related ata codes Kukjin Kim 2014-06-30 21:32 ` Kukjin Kim 2014-06-30 14:49 ` Tejun Heo 2014-06-30 14:49 ` Tejun Heo 2014-06-30 21:32 ` [PATCH 14/17] mtd: onenand: remove s5pc100 related onenand codes Kukjin Kim 2014-06-30 21:32 ` Kukjin Kim 2014-07-12 7:12 ` Brian Norris 2014-07-12 7:12 ` Brian Norris 2014-07-12 7:12 ` Brian Norris 2014-06-30 21:32 ` [PATCH 15/17] video: fbdev: s3c-fb: remove s5pc100 related fimd and fb codes Kukjin Kim 2014-06-30 21:32 ` Kukjin Kim 2014-07-01 2:05 ` Jingoo Han 2014-07-01 2:05 ` Jingoo Han 2014-06-30 21:32 ` [PATCH 16/17] [media] exynos4-is: removes s5pc100 related fimc codes Kukjin Kim 2014-06-30 21:32 ` Kukjin Kim 2014-06-30 14:03 ` Sylwester Nawrocki 2014-06-30 14:03 ` Sylwester Nawrocki 2014-06-30 21:32 ` [PATCH 17/17] ASoC: Samsung: remove s5pc100 related codes Kukjin Kim 2014-06-30 21:32 ` Kukjin Kim 2014-07-14 18:05 ` Mark Brown 2014-07-14 18:05 ` Mark Brown 2014-07-02 18:02 ` [PATCH 00/17] ARM: S5P64X0, S5PC100: no more support in mainline Tomasz Figa 2014-07-02 18:02 ` Tomasz Figa 2014-07-02 22:46 ` Kukjin Kim 2014-07-02 22:46 ` Kukjin Kim 2014-07-03 3:35 ` Sachin Kamat 2014-07-03 3:35 ` Sachin Kamat 2014-07-04 8:43 ` Kukjin Kim 2014-07-04 8:43 ` Kukjin Kim
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to='02ca01cf975a$1848aaa0$48d9ffe0$@samsung.com' \ --to=kgene.kim@samsung.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=t.figa@samsung.com \ --cc=thierry.reding@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.