From patchwork Fri Jul 4 07:32:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kim Kukjin X-Patchwork-Id: 4478471 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 10CBDBEECB for ; Fri, 4 Jul 2014 07:34:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1825F20416 for ; Fri, 4 Jul 2014 07:34:33 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1FA65203F1 for ; Fri, 4 Jul 2014 07:34:32 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1X2xzM-0007Js-K4; Fri, 04 Jul 2014 07:32:56 +0000 Received: from mailout4.samsung.com ([203.254.224.34]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X2xzD-0006dW-FK for linux-arm-kernel@lists.infradead.org; Fri, 04 Jul 2014 07:32:49 +0000 Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N8600GNIFLZ7900@mailout4.samsung.com> for linux-arm-kernel@lists.infradead.org; Fri, 04 Jul 2014 16:32:23 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.49]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id 2E.AD.19452.68856B35; Fri, 04 Jul 2014 16:32:22 +0900 (KST) X-AuditID: cbfee68e-b7fb96d000004bfc-a1-53b6588653d4 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 04.DE.05196.68856B35; Fri, 04 Jul 2014 16:32:22 +0900 (KST) Received: from DOKGENEKIM03 ([12.36.165.190]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N8600GE4FLYPLA0@mmp2.samsung.com>; Fri, 04 Jul 2014 16:32:22 +0900 (KST) From: Kukjin Kim To: 'Tomasz Figa' , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org References: <1404163947-3105-1-git-send-email-kgene.kim@samsung.com> <1404163947-3105-12-git-send-email-kgene.kim@samsung.com> <53B55021.9020307@samsung.com> In-reply-to: <53B55021.9020307@samsung.com> Subject: RE: [PATCH 11/17] pwm: samsung: remove s5pc100 related pwm codes Date: Fri, 04 Jul 2014 16:32:22 +0900 Message-id: <02ca01cf975a$1848aaa0$48d9ffe0$@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Outlook 14.0 Thread-index: AQMomaed6KLZ96WD+OIPh1mQFKG6tgIz4fLVAZ+XWBmYvuDN8A== Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrNIsWRmVeSWpSXmKPExsVy+t8zQ922iG3BBhufmFhsenyN1WLG+X1M FutnvGax+LlrHosDi8fOWXfZPTYvqffo27KK0ePzJrkAligum5TUnMyy1CJ9uwSujMdvlQsm qVcsPXqCpYGxT6GLkZNDQsBE4tHbqUwQtpjEhXvr2boYuTiEBJYxSiydcYS5i5EDrOj4H26I +HRGiZ1LW9hAGoQE/jJKnFgWAWKzCWhIHH7/jB3EFhEolHjdOwnMZhbQl2j99p8Ronkho0T7 l81g2zgFtCU+7XsKZgsLeErcbz3NAmKzCKhKbNjTwQ6ymFfAUmLvnUyQMK+AoMSPyfdYIGZq SWze1sQKYctLbF7zlhniAQWJHWdfM0Lc4CTxe8FNqHoRiX0v3oHdICFwil3i76epULsEJL5N PsQC8aSsxKYDUHMkJQ6uuMEygVFiFpLVs5CsnoVk9SwkKxYwsqxiFE0tSC4oTkovMtIrTswt Ls1L10vOz93ECInIvh2MNw9YH2JMBlo/kVlKNDkfGNF5JfGGxmZGFqYmpsZG5pZmpAkrifMu epgUJCSQnliSmp2aWpBaFF9UmpNafIiRiYNTqoExyth0iv2R9wbpwQeiuF9vXfRk1z+jk1LC W9ltDs9SErCKMT8275Hihk9GBorL3J6FpGXaan1d8nVt3oHJulOftje/Oq+dGhY05Y7zYqWW KTuTuvmmiNYb5s9SjORwMbgosyypkveMiNTe4Cv8QYynksWb+MvdtuZprTKuU3C50Sz0o1tE UV2JpTgj0VCLuag4EQDLiMDY3gIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrFIsWRmVeSWpSXmKPExsVy+t9jQd22iG3BBiuOGVhsenyN1WLG+X1M FutnvGax+LlrHosDi8fOWXfZPTYvqffo27KK0ePzJrkAlqgGRpuM1MSU1CKF1Lzk/JTMvHRb Je/geOd4UzMDQ11DSwtzJYW8xNxUWyUXnwBdt8wcoJVKCmWJOaVAoYDE4mIlfTtME0JD3HQt YBojdH1DguB6jAzQQMI6xozHb5ULJqlXLD16gqWBsU+hi5GDQ0LAROL4H+4uRk4gU0ziwr31 bF2MXBxCAtMZJXYubWEDSQgJ/GWUOLEsAsRmE9CQOPz+GTuILSJQKPG6dxKYzSygL9H67T8j RPNCRon2L5uZQBKcAtoSn/Y9BbOFBTwl7reeZgGxWQRUJTbs6WAHOYJXwFJi751MkDCvgKDE j8n3WCBmakls3tbECmHLS2xe85YZ4lAFiR1nXzNC3OAk8XvBTah6EYl9L94xTmAUmoVk1Cwk o2YhGTULScsCRpZVjKKpBckFxUnpuUZ6xYm5xaV56XrJ+bmbGMHx/kx6B+OqBotDjAIcjEo8 vB5FW4OFWBPLiitzDzFKcDArifBWKW0LFuJNSaysSi3Kjy8qzUktPsRoCvToRGYp0eR8YCrK K4k3NDYxM7I0MrMwMjE3VxLnPdhqHSgkkJ5YkpqdmlqQWgTTx8TBKdXAGPVOb8O9/y8DVr/9 LavG8K/Mh7HhsYt/6+tgQVW3pIvnVdl4Z974VFZ05JND8Iu3b+YvrV7Zeb6sNmeFS8iFgOgm qTl5z811BYRfd89Q/m0QeV/kqnDd4xm65Z275RqvMCgIB97YdLJRfZZzzttYg3U2G5/s00u/ oLU3op+LfWkY54R5Ka8OKbEUZyQaajEXFScCAF40FY0NAwAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140704_003247_701342_FADBFC43 X-CRM114-Status: GOOD ( 16.04 ) X-Spam-Score: -5.0 (-----) Cc: 'Thierry Reding' X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 > > Cc: Thierry Reding > > --- > > 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 Signed-off-by: Kukjin Kim Cc: Thierry Reding 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 }, {}, };