From patchwork Mon Jun 30 21:32:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kim Kukjin X-Patchwork-Id: 4449951 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DAE929F390 for ; Mon, 30 Jun 2014 13:19:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0281520200 for ; Mon, 30 Jun 2014 13:19:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EE9E120225 for ; Mon, 30 Jun 2014 13:19:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753338AbaF3NTS (ORCPT ); Mon, 30 Jun 2014 09:19:18 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:62589 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752888AbaF3NTQ (ORCPT ); Mon, 30 Jun 2014 09:19:16 -0400 Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N7Z00903GZU2IE0@mailout2.samsung.com> for linux-samsung-soc@vger.kernel.org; Mon, 30 Jun 2014 22:19:06 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.51]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id E7.39.24374.AC361B35; Mon, 30 Jun 2014 22:19:06 +0900 (KST) X-AuditID: cbfee68d-b7fd46d000005f36-89-53b163ca108b Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 2B.98.05196.AC361B35; Mon, 30 Jun 2014 22:19:06 +0900 (KST) Received: from kindness.dsn.sec.samsung.com ([12.36.165.106]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N7Z005Y2GZRAH00@mmp1.samsung.com>; Mon, 30 Jun 2014 22:19:06 +0900 (KST) From: Kukjin Kim To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Cc: Kukjin Kim , Thierry Reding Subject: [PATCH 05/17] pwm: samsung: remove s5p64x0 related pwm codes Date: Tue, 01 Jul 2014 06:32:15 +0900 Message-id: <1404163947-3105-6-git-send-email-kgene.kim@samsung.com> X-Mailer: git-send-email 1.7.4.4 In-reply-to: <1404163947-3105-1-git-send-email-kgene.kim@samsung.com> References: <1404163947-3105-1-git-send-email-kgene.kim@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrALMWRmVeSWpSXmKPExsVy+t8zY91TyRuDDWY/krHoXXCVzWLT42us FjPO72Oy+LlrHosDi8fOWXfZPTYvqffo27KK0ePzJrkAligum5TUnMyy1CJ9uwSujBuPF7AW LJatWPPpDlsD4zGJLkZODgkBE4k5F9czQdhiEhfurWfrYuTiEBJYxiix7dRtNpiiOz+/MUIk FjFKvD66jQnC6WGS2Pt0JVg7m4CGxOH3z9i7GDk4RAS8JZZfUwQJMwsES6zZ0MYCYgsLuEo8 nfqcFcRmEVCV2L74I1grr4CLxLV536GWKUgcm/qVFWQMJ1D9piMBIGEhoJKJe3exgqyVEPjP JvFg5zMWiDkCEt8mH2IBqZcQkJXYdIAZYoykxMEVN1gmMAovYGRYxSiaWpBcUJyUXmSoV5yY W1yal66XnJ+7iRESur07GG8fsD7EmAw0biKzlGhyPjD080riDY3NjCxMTUyNjcwtzUgTVhLn TXqYFCQkkJ5YkpqdmlqQWhRfVJqTWnyIkYmDU6qBUWlLX736Z/ZVwlZ/9B12yerw3LZbdy77 otgbI+05NjJvI+9Z7PAQvfLYsNtc9Me8xvhVd3R3uZ2eHBbb6Nu6stTgEafi2wlMyuwfAh9W pFp5nHPwerecZf5x9s9XS3Tf7+yQXNN90F7DWsXU0VJi2yshPqFFcb2zp25mXH6lMym/LLJu ee5yJZbijERDLeai4kQAU5dAJ3MCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupnkeLIzCtJLcpLzFFi42I5/e+xgO6p5I3BBp2vJCx6F1xls9j0+Bqr xYzz+5gsfu6ax+LA4rFz1l12j81L6j36tqxi9Pi8SS6AJaqB0SYjNTEltUghNS85PyUzL91W yTs43jne1MzAUNfQ0sJcSSEvMTfVVsnFJ0DXLTMHaKWSQlliTilQKCCxuFhJ3w7ThNAQN10L mMYIXd+QILgeIwM0kLCOMePG4wWsBYtlK9Z8usPWwHhMoouRk0NCwETizs9vjBC2mMSFe+vZ uhi5OIQEFjFKvD66jQnC6WGS2Pt0JRNIFZuAhsTh98/Yuxg5OEQEvCWWX1MECTMLBEus2dDG AmILC7hKPJ36nBXEZhFQldi++CNYK6+Ai8S1ed/ZIJYpSByb+pUVZAwnUP2mIwEgYSGgkol7 d7FOYORdwMiwilE0tSC5oDgpPddIrzgxt7g0L10vOT93EyM4Mp5J72Bc1WBxiFGAg1GJh1dj 2YZgIdbEsuLK3EOMEhzMSiK8N302BgvxpiRWVqUW5ccXleakFh9iNAU6aiKzlGhyPjBq80ri DY1NzIwsjcwsjEzMzZXEeQ+2WgcKCaQnlqRmp6YWpBbB9DFxcEo1MCqnLXuRtM7+7b/Pq5Z3 z79fwi450fN7hpedHdMN27WH5t0yPbnP4ChTxNxKiZkT6ro1f2RVLT9qd/XzR75/fBPChDs+ bcjc6389XX7Tu+txXbsW3MlIWraodeLU4ywT0mZ4lykazJFOiZTZOTWRdZl+U0hjyvGqnz2R ogc6PwoHzpXxWy7FL6DEUpyRaKjFXFScCABC0X3CogIAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00, DATE_IN_FUTURE_06_12, RCVD_IN_DNSWL_HI, 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 This patch removes supporting s5p64x0 related pwm codes because of no more support for S5P6440 and S5P6450 SoCs. And this patch changes the name of s5p6440-pwm to exynos-pwm instead. Signed-off-by: Kukjin Kim Cc: Thierry Reding --- Documentation/devicetree/bindings/pwm/pwm-samsung.txt | 1 - arch/arm/boot/dts/exynos4210-universal_c210.dts | 2 +- drivers/clocksource/samsung_pwm_timer.c | 13 ------------- drivers/pwm/pwm-samsung.c | 5 ++--- 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/Documentation/devicetree/bindings/pwm/pwm-samsung.txt b/Documentation/devicetree/bindings/pwm/pwm-samsung.txt index 5538de9..43925d3 100644 --- a/Documentation/devicetree/bindings/pwm/pwm-samsung.txt +++ b/Documentation/devicetree/bindings/pwm/pwm-samsung.txt @@ -11,7 +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,s5p6440-pwm - for 32-bit timers present on S5P64x0 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, diff --git a/arch/arm/boot/dts/exynos4210-universal_c210.dts b/arch/arm/boot/dts/exynos4210-universal_c210.dts index d50eb3a..0ca26e0 100644 --- a/arch/arm/boot/dts/exynos4210-universal_c210.dts +++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts @@ -461,7 +461,7 @@ }; pwm@139D0000 { - compatible = "samsung,s5p6440-pwm"; + compatible = "samsung,exynos4210-pwm"; status = "okay"; }; diff --git a/drivers/clocksource/samsung_pwm_timer.c b/drivers/clocksource/samsung_pwm_timer.c index 5645cfc..e35a9b7 100644 --- a/drivers/clocksource/samsung_pwm_timer.c +++ b/drivers/clocksource/samsung_pwm_timer.c @@ -480,19 +480,6 @@ 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 s5p64x0_variant = { - .bits = 32, - .div_base = 0, - .has_tint_cstat = true, - .tclk_mask = 0, -}; - -static void __init s5p64x0_pwm_clocksource_init(struct device_node *np) -{ - samsung_pwm_alloc(np, &s5p64x0_variant); -} -CLOCKSOURCE_OF_DECLARE(s5p6440_pwm, "samsung,s5p6440-pwm", s5p64x0_pwm_clocksource_init); - static const struct samsung_pwm_variant s5p_variant = { .bits = 32, .div_base = 0, diff --git a/drivers/pwm/pwm-samsung.c b/drivers/pwm/pwm-samsung.c index ba6b650..68f3471 100644 --- a/drivers/pwm/pwm-samsung.c +++ b/drivers/pwm/pwm-samsung.c @@ -404,7 +404,7 @@ static const struct samsung_pwm_variant s3c64xx_variant = { .tclk_mask = BIT(7) | BIT(6) | BIT(5), }; -static const struct samsung_pwm_variant s5p64x0_variant = { +static const struct samsung_pwm_variant exynos4210_variant = { .bits = 32, .div_base = 0, .has_tint_cstat = true, @@ -421,9 +421,8 @@ static const struct samsung_pwm_variant s5pc100_variant = { 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,s5p6440-pwm", .data = &s5p64x0_variant }, { .compatible = "samsung,s5pc100-pwm", .data = &s5pc100_variant }, - { .compatible = "samsung,exynos4210-pwm", .data = &s5p64x0_variant }, + { .compatible = "samsung,exynos4210-pwm", .data = &exynos4210_variant }, {}, };