From patchwork Mon Jun 30 21:32:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kim Kukjin X-Patchwork-Id: 4450131 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 2C06B9F319 for ; Mon, 30 Jun 2014 13:24:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3B8CD202DD for ; Mon, 30 Jun 2014 13:24:46 +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 4A40F20225 for ; Mon, 30 Jun 2014 13:24:45 +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 1X1bXe-0001jk-Py; Mon, 30 Jun 2014 13:22:42 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X1bUh-0006h5-NA 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 mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N7Z000DDGZVSZ90@mailout3.samsung.com> for linux-arm-kernel@lists.infradead.org; Mon, 30 Jun 2014 22:19:07 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.50]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id CC.AD.14704.BC361B35; Mon, 30 Jun 2014 22:19:07 +0900 (KST) X-AuditID: cbfee68f-b7fef6d000003970-d6-53b163cbe33e Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 7B.93.04943.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 15/17] video: fbdev: s3c-fb: remove s5pc100 related fimd and fb codes Date: Tue, 01 Jul 2014 06:32:25 +0900 Message-id: <1404163947-3105-16-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+NgFrrPLMWRmVeSWpSXmKPExsVy+t8zI93TyRuDDSZ+ErLoXXCVzWLT42us FjPO72OyWD//FpsDi8fmJfUefVtWMXocv7GdyePzJrkAligum5TUnMyy1CJ9uwSujG2H1rAX 7JKp+HviEnMD40+xLkZODgkBE4lzn48yQ9hiEhfurWcDsYUEljFKdM8UhKmZee0JUxcjF1B8 EaPE87YJbBBOD5PE3qcrmUCq2AQ0JA6/f8bexcjBISLgLbH8miJImFnAT2LdrxawEmGBcIkp Mw+zgtgsAqoSvR2fWEBsXgFXiesfO1gglilIHJv6lRVkDCdQfNORAIh7XCQm7t3FCrJWQuA3 m8SNQ2uYIOYISHybfIgFpF5CQFZi0wGoXyQlDq64wTKBUXgBI8MqRtHUguSC4qT0ImO94sTc 4tK8dL3k/NxNjJDA7d/BePeA9SHGZKBxE5mlRJPzgYGfVxJvaGxmZGFqYmpsZG5pRpqwkjjv /YdJQUIC6YklqdmpqQWpRfFFpTmpxYcYmTg4pRoY9a9sCZu/9mPM4Y6KbfvkHHnnSVyIjUgy PC15RjOr4bCm77f5VZ1bRVzfvvzXeGnFhe9aoevU1jeuOnHjYXOGec9cLru4nFLWt2ybDp1L cL9+9fotfdPS9qvv/aYdKvwmsub4QSapDSVzCm4nzzkx6fBShp9M8ov89n7d1bs15pacoZJ2 nVcMpxJLcUaioRZzUXEiAA/UqJByAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupnkeLIzCtJLcpLzFFi42I5/e+xgO7p5I3BBmcn8lv0LrjKZrHp8TVW ixnn9zFZrJ9/i82BxWPzknqPvi2rGD2O39jO5PF5k1wAS1QDo01GamJKapFCal5yfkpmXrqt kndwvHO8qZmBoa6hpYW5kkJeYm6qrZKLT4CuW2YO0EolhbLEnFKgUEBicbGSvh2mCaEhbroW MI0Rur4hQXA9RgZoIGEdY8a2Q2vYC3bJVPw9cYm5gfGnWBcjJ4eEgInEzGtPmCBsMYkL99az dTFycQgJLGKUeN42AcrpYZLY+3QlWBWbgIbE4ffP2LsYOThEBLwlll9TBAkzC/hJrPvVAlYi LBAuMWXmYVYQm0VAVaK34xMLiM0r4Cpx/WMHC8QyBYljU7+ygozhBIpvOhIAEhYScJGYuHcX 6wRG3gWMDKsYRVMLkguKk9JzDfWKE3OLS/PS9ZLzczcxgiPjmdQOxpUNFocYBTgYlXh4NZZt CBZiTSwrrsw9xCjBwawkwnvTZ2OwEG9KYmVValF+fFFpTmrxIUZToKMmMkuJJucDozavJN7Q 2MTMyNLIzMLIxNxcSZz3QKt1oJBAemJJanZqakFqEUwfEwenVAMjW77o8u1XFBfUnPf1T1p1 vTDkF5dhFP9LhV6jl5Pecm/93Rkgf+zCzRszgiL4pi+8fa+xefP+CWv/L/mw/v8eWzvBlXpG V3viRU9w7z2/92TegdPHs4oZVj45LDO3cJlr/XWR3qN39YOM58jlySwRPrFLf9Ojyvi0bcoT tzssid/xTmPzpMAD95RYijMSDbWYi4oTAQ0slSyiAgAA 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_133213_FA08C29F X-CRM114-Status: GOOD ( 13.58 ) 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 and fb codes for s5pc100 SoC. Signed-off-by: Kukjin Kim Cc: Tomi Valkeinen Acked-by: Jingoo Han --- .../devicetree/bindings/video/samsung-fimd.txt | 1 - drivers/video/fbdev/Kconfig | 2 +- drivers/video/fbdev/s3c-fb.c | 35 -------------------- include/video/samsung_fimd.h | 2 +- 4 files changed, 2 insertions(+), 38 deletions(-) diff --git a/Documentation/devicetree/bindings/video/samsung-fimd.txt b/Documentation/devicetree/bindings/video/samsung-fimd.txt index 741f4a6..7794260 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,s5pc100-fimd"; /* for S5PC100 SoC */ "samsung,s5pv210-fimd"; /* for S5PV210 SoC */ "samsung,exynos4210-fimd"; /* for Exynos4 SoCs */ "samsung,exynos5250-fimd"; /* for Exynos5 SoCs */ diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index 11506e5..79708b2 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -2019,7 +2019,7 @@ config FB_TMIO_ACCELL config FB_S3C tristate "Samsung S3C framebuffer support" depends on FB && (CPU_S3C2416 || ARCH_S3C64XX || \ - ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS) + ARCH_S5PV210 || ARCH_EXYNOS) select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT diff --git a/drivers/video/fbdev/s3c-fb.c b/drivers/video/fbdev/s3c-fb.c index a0cde41..b33abb0 100644 --- a/drivers/video/fbdev/s3c-fb.c +++ b/drivers/video/fbdev/s3c-fb.c @@ -1805,38 +1805,6 @@ static struct s3c_fb_driverdata s3c_fb_data_64xx = { .win[4] = &s3c_fb_data_64xx_wins[4], }; -static struct s3c_fb_driverdata s3c_fb_data_s5pc100 = { - .variant = { - .nr_windows = 5, - .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, - [3] = 0x3000, - [4] = 0x3400, - }, - - .has_prtcon = 1, - .has_blendcon = 1, - .has_clksel = 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], - .win[3] = &s3c_fb_data_s5p_wins[3], - .win[4] = &s3c_fb_data_s5p_wins[4], -}; - static struct s3c_fb_driverdata s3c_fb_data_s5pv210 = { .variant = { .nr_windows = 5, @@ -1975,9 +1943,6 @@ static struct platform_device_id s3c_fb_driver_ids[] = { .name = "s3c-fb", .driver_data = (unsigned long)&s3c_fb_data_64xx, }, { - .name = "s5pc100-fb", - .driver_data = (unsigned long)&s3c_fb_data_s5pc100, - }, { .name = "s5pv210-fb", .driver_data = (unsigned long)&s3c_fb_data_s5pv210, }, { diff --git a/include/video/samsung_fimd.h b/include/video/samsung_fimd.h index b039320..8af0c61 100644 --- a/include/video/samsung_fimd.h +++ b/include/video/samsung_fimd.h @@ -107,7 +107,7 @@ #define VIDCON2_ORGYCbCr (1 << 8) #define VIDCON2_YUVORDCrCb (1 << 7) -/* PRTCON (S3C6410, S5PC100) +/* PRTCON (S3C6410) * Might not be present in the S3C6410 documentation, * but tests prove it's there almost for sure; shouldn't hurt in any case. */