From patchwork Mon Jun 30 21:32:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kim Kukjin X-Patchwork-Id: 4450121 Return-Path: X-Original-To: patchwork-linux-arm@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 233A39F319 for ; Mon, 30 Jun 2014 13:24:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 34F3F202DD for ; Mon, 30 Jun 2014 13:24:31 +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 7553720225 for ; Mon, 30 Jun 2014 13:24:29 +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 1X1bXP-0001Lu-BL; Mon, 30 Jun 2014 13:22:27 +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 1X1bUh-0006gu-SN for linux-arm-kernel@lists.infradead.org; Mon, 30 Jun 2014 13:19:41 +0000 Received: from epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N7Z00B83GZULEB0@mailout2.samsung.com> for linux-arm-kernel@lists.infradead.org; Mon, 30 Jun 2014 22:19:06 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.50]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id FA.AD.14704.AC361B35; Mon, 30 Jun 2014 22:19:06 +0900 (KST) X-AuditID: cbfee68f-b7fef6d000003970-c5-53b163ca2f01 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 7B.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 Subject: [PATCH 06/17] video: fbdev: s3c-fb: remove s5p64x0 related fimd codes Date: Tue, 01 Jul 2014 06:32:16 +0900 Message-id: <1404163947-3105-7-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+NgFrrHLMWRmVeSWpSXmKPExsVy+t8zI91TyRuDDfa9ULboXXCVzWLT42us FjPO72OyWD//FpsDi8fmJfUefVtWMXocv7GdyePzJrkAligum5TUnMyy1CJ9uwSujP8tnWwF h8UqFneJNzDOEupi5OSQEDCRmHlmISuELSZx4d56ti5GLg4hgWWMEuf7zzHCFDXf/sYCkVjE KPFy6gEop4dJYu/TlUwgVWwCGhKH3z9j72Lk4BAR8JZYfk0RJMws4Cex7lcLWIkwkD1nQTMb iM0ioCoxe/t+VpByXgEXid2P/SF2KUgcm/oVLMwp4Cqx6UgASFgIqGLi3l2sIFslBL6zSbya c4oRYoyAxLfJh1hA6iUEZCU2HWCGGCMpcXDFDZYJjMILGBlWMYqmFiQXFCelFxnrFSfmFpfm pesl5+duYoSEbf8OxrsHrA8xJgONm8gsJZqcDwz7vJJ4Q2MzIwtTE1NjI3NLM9KElcR57z9M ChISSE8sSc1OTS1ILYovKs1JLT7EyMTBKdXAmFu+88lEhQb3sHNffN66SyTNPibYNPf049kc 5bHfnvCLnU5//mGKm0CQjeAz2TYtqxvCXsztT0xFF3lvv6RvzZ3B+OdyeJ+QXmnDzLklIrU8 fznkYy1NHv8p0ly8bsoRzi8nt59svb6rsTw/Ye6F0vXT56cyi4Wv37Zj0QXNsOvHWDiYXlRP VmIpzkg01GIuKk4EALtx5O9xAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuplkeLIzCtJLcpLzFFi42I5/e+xgO6p5I3BBssmK1j0LrjKZrHp8TVW ixnn9zFZrJ9/i82BxWPzknqPvi2rGD2O39jO5PF5k1wAS1QDo01GamJKapFCal5yfkpmXrqt kndwvHO8qZmBoa6hpYW5kkJeYm6qrZKLT4CuW2YO0EolhbLEnFKgUEBicbGSvh2mCaEhbroW MI0Rur4hQXA9RgZoIGEdY8b/lk62gsNiFYu7xBsYZwl1MXJySAiYSDTf/sYCYYtJXLi3nq2L kYtDSGARo8TLqQdYIJweJom9T1cygVSxCWhIHH7/jL2LkYNDRMBbYvk1RZAws4CfxLpfLWAl wkD2nAXNbCA2i4CqxOzt+1lBynkFXCR2P/aH2KUgcWzqV7Awp4CrxKYjASBhIaCKiXt3sU5g 5F3AyLCKUTS1ILmgOCk910ivODG3uDQvXS85P3cTIzgqnknvYFzVYHGIUYCDUYmHV2PZhmAh 1sSy4srcQ4wSHMxKIrw3fTYGC/GmJFZWpRblxxeV5qQWH2I0BbppIrOUaHI+MGLzSuINjU3M jCyNzCyMTMzNlcR5D7ZaBwoJpCeWpGanphakFsH0MXFwSjUw6ug4Opy/PrHFbu+3a3+dZYLm h659rDvlc9qna9duidnZXFW9vX73o7lfV3TN+/4xZLfiZUU1/V7HKxe/MO3ZtDNLUCkv/svb 76/SJt5Ii9ulIBy1+WtW+tNbeZ77N892XCWs5JJo8ENfjUezY45lhOH07xL+p+ZIPIiW5khq 7T9UdvlTsF2KvxJLcUaioRZzUXEiAFzN0B6gAgAA 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_061940_110284_30C14DA1 X-CRM114-Status: GOOD ( 13.36 ) X-Spam-Score: -5.0 (-----) Cc: Tomi Valkeinen , Kukjin Kim 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 fimd codes for s5p6440 and s5p6450 SoCs. Signed-off-by: Kukjin Kim Cc: Tomi Valkeinen Acked-by: Jingoo Han Acked-by: Tomi Valkeinen --- .../devicetree/bindings/video/samsung-fimd.txt | 1 - drivers/video/fbdev/Kconfig | 2 +- drivers/video/fbdev/s3c-fb.c | 30 -------------------- 3 files changed, 1 insertion(+), 32 deletions(-) diff --git a/Documentation/devicetree/bindings/video/samsung-fimd.txt b/Documentation/devicetree/bindings/video/samsung-fimd.txt index 2dad41b..741f4a6 100644 --- a/Documentation/devicetree/bindings/video/samsung-fimd.txt +++ b/Documentation/devicetree/bindings/video/samsung-fimd.txt @@ -8,7 +8,6 @@ Required properties: - compatible: value should be one of the following "samsung,s3c2443-fimd"; /* for S3C24XX SoCs */ "samsung,s3c6400-fimd"; /* for S3C64XX SoCs */ - "samsung,s5p6440-fimd"; /* for S5P64X0 SoCs */ "samsung,s5pc100-fimd"; /* for S5PC100 SoC */ "samsung,s5pv210-fimd"; /* for S5PV210 SoC */ "samsung,exynos4210-fimd"; /* for Exynos4 SoCs */ diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index 59c98bfd..11506e5 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -2018,7 +2018,7 @@ config FB_TMIO_ACCELL config FB_S3C tristate "Samsung S3C framebuffer support" - depends on FB && (CPU_S3C2416 || ARCH_S3C64XX || ARCH_S5P64X0 || \ + depends on FB && (CPU_S3C2416 || ARCH_S3C64XX || \ ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS) select FB_CFB_FILLRECT select FB_CFB_COPYAREA diff --git a/drivers/video/fbdev/s3c-fb.c b/drivers/video/fbdev/s3c-fb.c index 62acae2..a0cde41 100644 --- a/drivers/video/fbdev/s3c-fb.c +++ b/drivers/video/fbdev/s3c-fb.c @@ -1970,33 +1970,6 @@ static struct s3c_fb_driverdata s3c_fb_data_s3c2443 = { }, }; -static struct s3c_fb_driverdata s3c_fb_data_s5p64x0 = { - .variant = { - .nr_windows = 3, - .vidtcon = VIDTCON0, - .wincon = WINCON(0), - .winmap = WINxMAP(0), - .keycon = WKEYCON, - .osd = VIDOSD_BASE, - .osd_stride = 16, - .buf_start = VIDW_BUF_START(0), - .buf_size = VIDW_BUF_SIZE(0), - .buf_end = VIDW_BUF_END(0), - - .palette = { - [0] = 0x2400, - [1] = 0x2800, - [2] = 0x2c00, - }, - - .has_blendcon = 1, - .has_fixvclk = 1, - }, - .win[0] = &s3c_fb_data_s5p_wins[0], - .win[1] = &s3c_fb_data_s5p_wins[1], - .win[2] = &s3c_fb_data_s5p_wins[2], -}; - static struct platform_device_id s3c_fb_driver_ids[] = { { .name = "s3c-fb", @@ -2016,9 +1989,6 @@ static struct platform_device_id s3c_fb_driver_ids[] = { }, { .name = "s3c2443-fb", .driver_data = (unsigned long)&s3c_fb_data_s3c2443, - }, { - .name = "s5p64x0-fb", - .driver_data = (unsigned long)&s3c_fb_data_s5p64x0, }, {}, };