From patchwork Thu Mar 14 22:12:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 15365 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id DD7D723E39 for ; Thu, 14 Mar 2013 22:17:30 +0000 (UTC) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by fiordland.canonical.com (Postfix) with ESMTP id 99307A185FA for ; Thu, 14 Mar 2013 22:17:30 +0000 (UTC) Received: by mail-ve0-f177.google.com with SMTP id m1so2118002ves.8 for ; Thu, 14 Mar 2013 15:17:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-provags-id:x-gm-message-state; bh=SB0XnY7vO3Rhm+7DdjX7wUw0tFQm4NcAE9PXitXgtk4=; b=E4zooZ60LgaEQkkXllWxDwcN1+foKfzsmoJ0vLk9jaLGZ1rDSsAGUdzBnv/opq8YYl x/25tzrH4bGj7XzgTRxZ2YTL8X7WlkPxeV8+tHnAu/+7ZD9PufXyhtv/iE2ZlrmKaRpH TdKAPYwpcmLsQDpX6V7/lgsahnTvCFEyuGyaFo+zttwpcCXrZnUw28Ei0ICqg7ATDcBE vIezwbR+cEJ/Gy7KXPUKya524ppERMF6JOniIlgovOjlC5djaXTLX+KfiGEalwbQ3MFK snSRSjm53a71XmkYKL0MgJsF1vLj2aC68ae37hHHr0k8uXHX/nEhZVPPlr8mLtYxCjaX 5gRQ== X-Received: by 10.221.0.199 with SMTP id nn7mr3628618vcb.14.1363299450134; Thu, 14 Mar 2013 15:17:30 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp94012veb; Thu, 14 Mar 2013 15:17:29 -0700 (PDT) X-Received: by 10.14.215.193 with SMTP id e41mr11273298eep.32.1363299449084; Thu, 14 Mar 2013 15:17:29 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.126.186]) by mx.google.com with ESMTPS id f9si7477596eep.57.2013.03.14.15.17.28 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 14 Mar 2013 15:17:29 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.126.186 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.126.186; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.126.186 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) smtp.mail=arnd@arndb.de Received: from wuerfel.lan (HSI-KBW-46-223-90-92.hsi.kabel-badenwuerttemberg.de [46.223.90.92]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0MPsu6-1UK7zi0OiA-004V0n; Thu, 14 Mar 2013 23:12:12 +0100 From: Arnd Bergmann To: linux-arm-kernel@vger.kernel.org Cc: patches@linaro.org, Olof Johansson , linux-kernel@vger.kernel.org, Arnd Bergmann , linux-mtd@lists.infradead.org, Artem Bityutskiy , David Woodhouse Subject: [PATCH 6/6] mtd: remove h720x flash support Date: Thu, 14 Mar 2013 23:12:08 +0100 Message-Id: <1363299128-8192-7-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1363299128-8192-1-git-send-email-arnd@arndb.de> References: <1363299128-8192-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:hcwXTxzN2waKxed5i5KOAsM0Jcq8BoQS98E7ualOmmj eWxNAVEDoMlNk6ANwjBoxHDt91ufMSlWcVFyexSIdYPPJv7ktn volz5pX53x8vwqv1nwQJc+F0dzlOEee1avhOVmO41+qYo1iP05 Jasud7+JBm1B2DURYWal5QmG+PemCgXxrWXMvi71P/IzRH+x+O EGvFUzw7cyY+MEm7iMShDs/WzQaGrDTvZYFzUd0epIpgLwe0dy XA7qMXOmznE/W8eg1bnlwyD/IotuNNDH6MI+RcjhX8qnVYBMq0 0NKEP/utuwVWxE0+TveVf+DhIgsp+azv6Z1bWNT8OuevJBEWPz KXWPAJSfVeLzr81Pk/dzYVpZfLx0IfvKZxThba631 X-Gm-Message-State: ALoCoQmFVFg0oHLUAGb3etiHLRMEh9DZSN+ZoFksL8omzy38wYisuO5KdF85Q9qq6hOsAtQqmhm4 The h720x platform support is going away in linux-3.10, so the MTD driver will also not be needed any more. Signed-off-by: Arnd Bergmann Cc: linux-mtd@lists.infradead.org Cc: Artem Bityutskiy Cc: David Woodhouse --- drivers/mtd/maps/Kconfig | 7 --- drivers/mtd/maps/Makefile | 1 - drivers/mtd/maps/h720x-flash.c | 120 ----------------------------------------- 3 files changed, 128 deletions(-) delete mode 100644 drivers/mtd/maps/h720x-flash.c diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index 3ed17c4..2b108f2 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig @@ -372,13 +372,6 @@ config MTD_IMPA7 This enables access to the NOR Flash on the impA7 board of implementa GmbH. If you have such a board, say 'Y' here. -config MTD_H720X - tristate "Hynix evaluation board mappings" - depends on MTD_CFI && ( ARCH_H7201 || ARCH_H7202 ) - help - This enables access to the flash chips on the Hynix evaluation boards. - If you have such a board, say 'Y'. - # This needs CFI or JEDEC, depending on the cards found. config MTD_PCI tristate "PCI MTD driver" diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile index 4ded287..74587a0 100644 --- a/drivers/mtd/maps/Makefile +++ b/drivers/mtd/maps/Makefile @@ -42,7 +42,6 @@ obj-$(CONFIG_MTD_IMPA7) += impa7.o obj-$(CONFIG_MTD_UCLINUX) += uclinux.o obj-$(CONFIG_MTD_NETtel) += nettel.o obj-$(CONFIG_MTD_SCB2_FLASH) += scb2_flash.o -obj-$(CONFIG_MTD_H720X) += h720x-flash.o obj-$(CONFIG_MTD_IXP4XX) += ixp4xx.o obj-$(CONFIG_MTD_IXP2000) += ixp2000.o obj-$(CONFIG_MTD_DMV182) += dmv182.o diff --git a/drivers/mtd/maps/h720x-flash.c b/drivers/mtd/maps/h720x-flash.c deleted file mode 100644 index 8ed6cb4..0000000 --- a/drivers/mtd/maps/h720x-flash.c +++ /dev/null @@ -1,120 +0,0 @@ -/* - * Flash memory access on Hynix GMS30C7201/HMS30C7202 based - * evaluation boards - * - * (C) 2002 Jungjun Kim - * 2003 Thomas Gleixner - */ - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -static struct mtd_info *mymtd; - -static struct map_info h720x_map = { - .name = "H720X", - .bankwidth = 4, - .size = H720X_FLASH_SIZE, - .phys = H720X_FLASH_PHYS, -}; - -static struct mtd_partition h720x_partitions[] = { - { - .name = "ArMon", - .size = 0x00080000, - .offset = 0, - .mask_flags = MTD_WRITEABLE - },{ - .name = "Env", - .size = 0x00040000, - .offset = 0x00080000, - .mask_flags = MTD_WRITEABLE - },{ - .name = "Kernel", - .size = 0x00180000, - .offset = 0x000c0000, - .mask_flags = MTD_WRITEABLE - },{ - .name = "Ramdisk", - .size = 0x00400000, - .offset = 0x00240000, - .mask_flags = MTD_WRITEABLE - },{ - .name = "jffs2", - .size = MTDPART_SIZ_FULL, - .offset = MTDPART_OFS_APPEND - } -}; - -#define NUM_PARTITIONS ARRAY_SIZE(h720x_partitions) - -/* - * Initialize FLASH support - */ -static int __init h720x_mtd_init(void) -{ - h720x_map.virt = ioremap(h720x_map.phys, h720x_map.size); - - if (!h720x_map.virt) { - printk(KERN_ERR "H720x-MTD: ioremap failed\n"); - return -EIO; - } - - simple_map_init(&h720x_map); - - // Probe for flash bankwidth 4 - printk (KERN_INFO "H720x-MTD probing 32bit FLASH\n"); - mymtd = do_map_probe("cfi_probe", &h720x_map); - if (!mymtd) { - printk (KERN_INFO "H720x-MTD probing 16bit FLASH\n"); - // Probe for bankwidth 2 - h720x_map.bankwidth = 2; - mymtd = do_map_probe("cfi_probe", &h720x_map); - } - - if (mymtd) { - mymtd->owner = THIS_MODULE; - - mtd_device_parse_register(mymtd, NULL, NULL, - h720x_partitions, NUM_PARTITIONS); - return 0; - } - - iounmap((void *)h720x_map.virt); - return -ENXIO; -} - -/* - * Cleanup - */ -static void __exit h720x_mtd_cleanup(void) -{ - - if (mymtd) { - mtd_device_unregister(mymtd); - map_destroy(mymtd); - } - - if (h720x_map.virt) { - iounmap((void *)h720x_map.virt); - h720x_map.virt = 0; - } -} - - -module_init(h720x_mtd_init); -module_exit(h720x_mtd_cleanup); - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Thomas Gleixner "); -MODULE_DESCRIPTION("MTD map driver for Hynix evaluation boards");