From patchwork Mon Jun 30 21:32:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kim Kukjin X-Patchwork-Id: 4450161 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 ECB73BEEAA for ; Mon, 30 Jun 2014 13:25:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1AAB8202DD for ; Mon, 30 Jun 2014 13:25:53 +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 4BDCB20225 for ; Mon, 30 Jun 2014 13:25:52 +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 1X1bYb-0002lO-Lb; Mon, 30 Jun 2014 13:23:41 +0000 Received: from mailout2.samsung.com ([203.254.224.25]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X1bUl-0006gu-EE for linux-arm-kernel@lists.infradead.org; Mon, 30 Jun 2014 13:19:44 +0000 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 <0N7Z00B85GZVLEB0@mailout2.samsung.com> for linux-arm-kernel@lists.infradead.org; Mon, 30 Jun 2014 22:19:07 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.48]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id D8.39.24374.BC361B35; Mon, 30 Jun 2014 22:19:07 +0900 (KST) X-AuditID: cbfee68d-b7fd46d000005f36-9c-53b163cbc967 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 3D.98.05196.BC361B35; Mon, 30 Jun 2014 22:19:07 +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 Subject: [PATCH 16/17] [media] exynos4-is: removes s5pc100 related fimc codes Date: Tue, 01 Jul 2014 06:32:26 +0900 Message-id: <1404163947-3105-17-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+NgFrrLLMWRmVeSWpSXmKPExsVy+t8zA93TyRuDDeY2CFv0LrjKZrHp8TVW ixnn9zFZXFwnb3H4TTurA6vH5iX1Hn1bVjF6fN4kF8AcxWWTkpqTWZZapG+XwJWx8+5PpoK1 /BUH50o0ML7m6WLk5JAQMJFoP9bGBmGLSVy4tx7MFhJYxijx+rcATE3T5FdAcS6g+CJGid6r 95khnB4mib1PVzKBVLEJaEgcfv+MvYuRg0NEwFti+TVFkBpmgVZGiadPToHVCAv4SiztfwC2 gUVAVeLNiW52EJtXwFWiYechZohtChLHpn5lBZnDCRTfdCQA4iAXiYl7d7FClPxmk5iy1g9i jIDEt8mHWEDKJQRkJTYdgJoiKXFwxQ2WCYzCCxgZVjGKphYkFxQnpRcZ6hUn5haX5qXrJefn bmKEBG3vDsbbB6wPMSYDjZvILCWanA8M+rySeENjMyMLUxNTYyNzSzPShJXEeZMeJgUJCaQn lqRmp6YWpBbFF5XmpBYfYmTi4JRqYJwx5/XWl036R9W6+dovqgl6Rk6XEtlnPfNjuNjLNnaR OIWNC5bMT+dUjFO7cTHZe/8059w1SWvkggIeR++/LFcx0av9zayHdVleN74a2HpOi/qjzaVr 9WPPsrtJAg2dVzKa+dq4chQZ/b60M6Rc/D1rW2tQ1s8Yj/fPQ5lui4ZKzTFY5HB9vhJLcUai oRZzUXEiAFesbXZwAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupjkeLIzCtJLcpLzFFi42I5/e+xgO7p5I3BBmuW8Vv0LrjKZrHp8TVW ixnn9zFZXFwnb3H4TTurA6vH5iX1Hn1bVjF6fN4kF8Ac1cBok5GamJJapJCal5yfkpmXbqvk HRzvHG9qZmCoa2hpYa6kkJeYm2qr5OIToOuWmQO0UUmhLDGnFCgUkFhcrKRvh2lCaIibrgVM Y4Sub0gQXI+RARpIWMeYsfPuT6aCtfwVB+dKNDC+5uli5OSQEDCRaJr8ig3CFpO4cG89kM3F ISSwiFGi9+p9Zginh0li79OVTCBVbAIaEoffP2PvYuTgEBHwllh+TRGkhlmglVHi6ZNTYDXC Ar4SS/sfgE1lEVCVeHOimx3E5hVwlWjYeYgZYpuCxLGpX1lB5nACxTcdCQAJCwm4SEzcu4t1 AiPvAkaGVYyiqQXJBcVJ6blGesWJucWleel6yfm5mxjBcfFMegfjqgaLQ4wCHIxKPLwayzYE C7EmlhVX5h5ilOBgVhLhvemzMViINyWxsiq1KD++qDQntfgQoynQUROZpUST84Exm1cSb2hs YmZkaWRmYWRibq4kznuw1TpQSCA9sSQ1OzW1ILUIpo+Jg1OqgZH7JHOl61/u54W+Wn+cDe8H Fu1yVJzyJcz/NfftJZdvNv7x+Lz6Q+DfUK+Xsn7XU3ivrJhY+tp/06GrtXItOpO3vlaJN1vz W/7HhbqsmtNaLzWmr2tdoCPqs6ZvqsbXf6+7Qh+LBavH56+6Oc/feemhJ10LT7Ysmx/F9s8t emPthcLGj3kqaZ1KLMUZiYZazEXFiQCJbljBoQIAAA== 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-20140630_061943_687982_23D568F3 X-CRM114-Status: GOOD ( 10.60 ) X-Spam-Score: -5.0 (-----) Cc: Kukjin Kim , Sylwester Nawrocki , Mauro Carvalho Chehab 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00, DATE_IN_FUTURE_06_12, 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 s5pc100 related fimc codes because of no more support S5PC100 SoC in mainline. Signed-off-by: Kukjin Kim Cc: Sylwester Nawrocki Cc: Mauro Carvalho Chehab Acked-by: Sylwester Nawrocki --- Documentation/video4linux/fimc.txt | 2 +- drivers/media/platform/exynos4-is/fimc-core.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/Documentation/video4linux/fimc.txt b/Documentation/video4linux/fimc.txt index e0c6b8b..1441fcf 100644 --- a/Documentation/video4linux/fimc.txt +++ b/Documentation/video4linux/fimc.txt @@ -15,7 +15,7 @@ drivers/media/platform/exynos4-is directory. 1. Supported SoCs ================= -S5PC100 (mem-to-mem only), S5PV210, EXYNOS4210 +S5PV210, EXYNOS4210 2. Supported features ===================== diff --git a/drivers/media/platform/exynos4-is/fimc-core.c b/drivers/media/platform/exynos4-is/fimc-core.c index b70fd99..5c800b4 100644 --- a/drivers/media/platform/exynos4-is/fimc-core.c +++ b/drivers/media/platform/exynos4-is/fimc-core.c @@ -1204,18 +1204,6 @@ static const struct fimc_variant fimc2_variant_s5pv210 = { .pix_limit = &s5p_pix_limit[2], }; -/* S5PC100 */ -static const struct fimc_drvdata fimc_drvdata_s5p = { - .variant = { - [0] = &fimc0_variant_s5p, - [1] = &fimc0_variant_s5p, - [2] = &fimc2_variant_s5p, - }, - .num_entities = 3, - .lclk_frequency = 133000000UL, - .out_buf_count = 4, -}; - /* S5PV210, S5PC110 */ static const struct fimc_drvdata fimc_drvdata_s5pv210 = { .variant = { @@ -1251,9 +1239,6 @@ static const struct fimc_drvdata fimc_drvdata_exynos4x12 = { static const struct platform_device_id fimc_driver_ids[] = { { - .name = "s5p-fimc", - .driver_data = (unsigned long)&fimc_drvdata_s5p, - }, { .name = "s5pv210-fimc", .driver_data = (unsigned long)&fimc_drvdata_s5pv210, }, {