From patchwork Mon Jun 30 21:32:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kim Kukjin X-Patchwork-Id: 4449941 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 D5A5C9F319 for ; Mon, 30 Jun 2014 13:19:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EE56820200 for ; Mon, 30 Jun 2014 13:19:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E4A4420328 for ; Mon, 30 Jun 2014 13:19:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753226AbaF3NTR (ORCPT ); Mon, 30 Jun 2014 09:19:17 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:60295 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752872AbaF3NTL (ORCPT ); Mon, 30 Jun 2014 09:19:11 -0400 Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N7Z002TPGZVEA70@mailout3.samsung.com> for linux-samsung-soc@vger.kernel.org; Mon, 30 Jun 2014 22:19:07 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.50]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id AF.CA.13369.BC361B35; Mon, 30 Jun 2014 22:19:07 +0900 (KST) X-AuditID: cbfee690-b7fb56d000003439-5d-53b163cb48a2 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 2B.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 Cc: Kukjin Kim , Kyungmin Park , David Woodhouse , Brian Norris Subject: [PATCH 14/17] mtd: onenand: remove s5pc100 related onenand codes Date: Tue, 01 Jul 2014 06:32:24 +0900 Message-id: <1404163947-3105-15-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+NgFnrLLMWRmVeSWpSXmKPExsVy+t8zI93TyRuDDQ694bY4cmEts8XElZOZ LXoXXGWzONv0ht1i0+NrrBYzzu9jcmDz2DnrLrvH5hVaHpuX1Hv0bVnF6PF5k1wAaxSXTUpq TmZZapG+XQJXxqH+V2wFL2UrDsw6xdLA+Fm8i5GTQ0LAROJP43UmCFtM4sK99WxdjFwcQgLL GCUuHOpmgin6OX0/I0RiEaPEvkMPmSGcHiaJvU9XglWxCWhIHH7/jL2LkYNDRMBbYvk1RZAa ZoFVjBKXHl5hB6kRFvCUWDOhnQ2khkVAVWJZsytImFfAVeLjlQ/MEMsUJI5N/coKUsIJFN90 JAAkLCTgIjFx7y5WiJLJ7BJ/f1aC2CwCAhLfJh9iASmXEJCV2HQAaoqkxMEVN1gmMAovYGRY xSiaWpBcUJyUXmSiV5yYW1yal66XnJ+7iRES1BN2MN47YH2IMRlo3ERmKdHkfGBU5JXEGxqb GVmYmpgaG5lbmpEmrCTOq/YoKUhIID2xJDU7NbUgtSi+qDQntfgQIxMHp1QDI8Pz0tpIxZBi O1GBpG3BC8L7v6/O9f6eI/0jKkltYbmjoMtslbmthkwMqx+eFr3xLEChg/Pf5FsO3yNUjSxC QlunC828vpyZ++CfZ2xb5S8eWhMivv//kqmGHdfEE5SfHpwlG7+mmteW9XXGs/YFU/rSZh+4 fumtodiKtpkNkudr7hbVPt+xR4mlOCPRUIu5qDgRADiGUD+AAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprLIsWRmVeSWpSXmKPExsVy+t9jAd3TyRuDDQ7cZ7c4cmEts8XElZOZ LXoXXGWzONv0ht1i0+NrrBYzzu9jcmDz2DnrLrvH5hVaHpuX1Hv0bVnF6PF5k1wAa1QDo01G amJKapFCal5yfkpmXrqtkndwvHO8qZmBoa6hpYW5kkJeYm6qrZKLT4CuW2YO0AFKCmWJOaVA oYDE4mIlfTtME0JD3HQtYBojdH1DguB6jAzQQMI6xoxD/a/YCl7KVhyYdYqlgfGzeBcjJ4eE gInEz+n7GSFsMYkL99azdTFycQgJLGKU2HfoITOE08MksffpSiaQKjYBDYnD75+xdzFycIgI eEssv6YIUsMssIpR4tLDK+wgNcICnhJrJrSzgdSwCKhKLGt2BQnzCrhKfLzygRlimYLEsalf WUFKOIHim44EgISFBFwkJu7dxTqBkXcBI8MqRtHUguSC4qT0XEO94sTc4tK8dL3k/NxNjOCo eSa1g3Flg8UhRgEORiUeXo1lG4KFWBPLiitzDzFKcDArifDe9NkYLMSbklhZlVqUH19UmpNa fIjRFOimicxSosn5wIjOK4k3NDYxM7I0MrMwMjE3VxLnPdBqHSgkkJ5YkpqdmlqQWgTTx8TB KdXAuMp5w6LJ/3QFWeY1efF8aVxvuZs5juOJ9Mtl3ClxZWueLKo1sznUmLNOPPZC2wapoKn6 R5J88vWU8mROR3091KY1Qe/3iciex9paiU8iJ9iJ8dy34DgiJbo4da2camvrdBOPpinvNx1q 1+Tax/pQwcLx6rnpmrqR02cvLnC91czAWZtd/sJLiaU4I9FQi7moOBEApWv0+bACAAA= 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 s5pc100 related onenand codes because of no more support for S5PC100 SoC in mainline. Signed-off-by: Kukjin Kim Cc: Kyungmin Park Cc: David Woodhouse Cc: Brian Norris --- drivers/mtd/onenand/Kconfig | 4 ++-- drivers/mtd/onenand/samsung.c | 25 +------------------------ 2 files changed, 3 insertions(+), 26 deletions(-) diff --git a/drivers/mtd/onenand/Kconfig b/drivers/mtd/onenand/Kconfig index ab26072..dcae2f6 100644 --- a/drivers/mtd/onenand/Kconfig +++ b/drivers/mtd/onenand/Kconfig @@ -32,10 +32,10 @@ config MTD_ONENAND_OMAP2 config MTD_ONENAND_SAMSUNG tristate "OneNAND on Samsung SOC controller support" - depends on ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS4 + depends on ARCH_S3C64XX || ARCH_S5PV210 || ARCH_EXYNOS4 help Support for a OneNAND flash device connected to an Samsung SOC. - S3C64XX/S5PC100 use command mapping method. + S3C64XX uses command mapping method. S5PC110/S5PC210 use generic OneNAND method. config MTD_ONENAND_OTP diff --git a/drivers/mtd/onenand/samsung.c b/drivers/mtd/onenand/samsung.c index efb819c..19cfb97 100644 --- a/drivers/mtd/onenand/samsung.c +++ b/drivers/mtd/onenand/samsung.c @@ -10,7 +10,7 @@ * published by the Free Software Foundation. * * Implementation: - * S3C64XX and S5PC100: emulate the pseudo BufferRAM + * S3C64XX: emulate the pseudo BufferRAM * S5PC110: use DMA */ @@ -32,7 +32,6 @@ enum soc_type { TYPE_S3C6400, TYPE_S3C6410, - TYPE_S5PC100, TYPE_S5PC110, }; @@ -59,7 +58,6 @@ enum soc_type { #define MAP_11 (0x3) #define S3C64XX_CMD_MAP_SHIFT 24 -#define S5PC100_CMD_MAP_SHIFT 26 #define S3C6400_FBA_SHIFT 10 #define S3C6400_FPA_SHIFT 4 @@ -69,10 +67,6 @@ enum soc_type { #define S3C6410_FPA_SHIFT 6 #define S3C6410_FSA_SHIFT 4 -#define S5PC100_FBA_SHIFT 13 -#define S5PC100_FPA_SHIFT 7 -#define S5PC100_FSA_SHIFT 5 - /* S5PC110 specific definitions */ #define S5PC110_DMA_SRC_ADDR 0x400 #define S5PC110_DMA_SRC_CFG 0x404 @@ -195,11 +189,6 @@ static unsigned int s3c64xx_cmd_map(unsigned type, unsigned val) return (type << S3C64XX_CMD_MAP_SHIFT) | val; } -static unsigned int s5pc1xx_cmd_map(unsigned type, unsigned val) -{ - return (type << S5PC100_CMD_MAP_SHIFT) | val; -} - static unsigned int s3c6400_mem_addr(int fba, int fpa, int fsa) { return (fba << S3C6400_FBA_SHIFT) | (fpa << S3C6400_FPA_SHIFT) | @@ -212,12 +201,6 @@ static unsigned int s3c6410_mem_addr(int fba, int fpa, int fsa) (fsa << S3C6410_FSA_SHIFT); } -static unsigned int s5pc100_mem_addr(int fba, int fpa, int fsa) -{ - return (fba << S5PC100_FBA_SHIFT) | (fpa << S5PC100_FPA_SHIFT) | - (fsa << S5PC100_FSA_SHIFT); -} - static void s3c_onenand_reset(void) { unsigned long timeout = 0x10000; @@ -835,9 +818,6 @@ static void s3c_onenand_setup(struct mtd_info *mtd) } else if (onenand->type == TYPE_S3C6410) { onenand->mem_addr = s3c6410_mem_addr; onenand->cmd_map = s3c64xx_cmd_map; - } else if (onenand->type == TYPE_S5PC100) { - onenand->mem_addr = s5pc100_mem_addr; - onenand->cmd_map = s5pc1xx_cmd_map; } else if (onenand->type == TYPE_S5PC110) { /* Use generic onenand functions */ this->read_bufferram = s5pc110_read_bufferram; @@ -1111,9 +1091,6 @@ static struct platform_device_id s3c_onenand_driver_ids[] = { .name = "s3c6410-onenand", .driver_data = TYPE_S3C6410, }, { - .name = "s5pc100-onenand", - .driver_data = TYPE_S5PC100, - }, { .name = "s5pc110-onenand", .driver_data = TYPE_S5PC110, }, { },