From patchwork Fri Nov 20 22:32:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 7671711 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 732269F1C2 for ; Fri, 20 Nov 2015 22:35:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3388E204AE for ; Fri, 20 Nov 2015 22:35:31 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DB7A62047D for ; Fri, 20 Nov 2015 22:35: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 1ZzuFA-0007K3-1t; Fri, 20 Nov 2015 22:33:24 +0000 Received: from mail-pa0-x22b.google.com ([2607:f8b0:400e:c03::22b]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZzuF3-0007Fa-51; Fri, 20 Nov 2015 22:33:18 +0000 Received: by padhx2 with SMTP id hx2so128996525pad.1; Fri, 20 Nov 2015 14:32:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=m3VRZOBGQxpXfHW/zqV5fFF7laUHjo5TIQxhJ+LWyFM=; b=YYJ8BUkt7lthzdRL69T2WI+oawoWy9Mjf/PjFAV5AsnH8JPDiUQZJldPGx9QKzZ6Np rdY1cQBWgU578LVZZq9H3FGwKEkAOozmVd1HRpormotmC6Cl5lhtQ+IQzDCcPZWpSVcB frDUC93oxq5j0KghAO6NZ9udWZYGJP8xrk08FmuuO3d8f39GfLfFLjy+A8nftpJ401dg inO771pAh0l26bbzl0w9rRN8hXVmgjSnOWpadC25KKaLBP0JDQxbNnghOZ3RNwkeE831 x3uu8qgnPuTyekAekHE9uXS4imeEvYYjE4dZnTafk9wBrtXii+iJsMxFCRUbK6Zdg7SV 1WfA== X-Received: by 10.66.122.145 with SMTP id ls17mr22255213pab.11.1448058776522; Fri, 20 Nov 2015 14:32:56 -0800 (PST) Received: from ban.mtv.corp.google.com ([172.22.64.120]) by smtp.gmail.com with ESMTPSA id qk7sm979674pbb.80.2015.11.20.14.32.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 Nov 2015 14:32:55 -0800 (PST) From: Brian Norris To: Subject: [PATCH] mtd: maps: kill DC21285 driver Date: Fri, 20 Nov 2015 14:32:35 -0800 Message-Id: <1448058755-45834-1-git-send-email-computersforpeace@gmail.com> X-Mailer: git-send-email 2.6.0.rc2.230.g3dd15c0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151120_143317_247373_302F7740 X-CRM114-Status: GOOD ( 19.82 ) X-Spam-Score: -2.7 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Brian Norris , Russell King , Nicolas Pitre , linux-arm-kernel@lists.infradead.org, =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 driver wouldn't build for over 5 years, between commit: bd31b85960a7 ("locking, ARM: Annotate low level hw locks as raw") and e5babdf928e5 ("mtd: dc21285: use raw spinlock functions for nw_gpio_lock") Also, it's unsafe to build into arbitrary kernels, as it might just start probing around memory, whether or not there's a compatible flash there. See comments here, last time someone tried to enable it: http://lists.infradead.org/pipermail/linux-arm-kernel/2015-May/347133.html So, let's kill it. I bet no one will notice. Signed-off-by: Brian Norris Cc: Uwe Kleine-König Cc: Russell King Cc: Nicolas Pitre --- drivers/mtd/maps/Kconfig | 8 -- drivers/mtd/maps/Makefile | 1 - drivers/mtd/maps/dc21285.c | 231 --------------------------------------------- 3 files changed, 240 deletions(-) delete mode 100644 drivers/mtd/maps/dc21285.c diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index 7c95a656f9e4..ddad3645f481 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig @@ -262,14 +262,6 @@ config MTD_SA1100 the SA1100 and SA1110, including the Assabet and the Compaq iPAQ. If you have such a board, say 'Y'. -config MTD_DC21285 - tristate "CFI Flash device mapped on DC21285 Footbridge" - depends on MTD_CFI && ARCH_FOOTBRIDGE && MTD_COMPLEX_MAPPINGS - help - This provides a driver for the flash accessed using Intel's - 21285 bridge used with Intel's StrongARM processors. More info at - . - config MTD_IXP4XX tristate "CFI Flash device mapped on Intel IXP4xx based systems" depends on MTD_CFI && MTD_COMPLEX_MAPPINGS && ARCH_IXP4XX diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile index 141c91a5b24c..c67fcf03c3ce 100644 --- a/drivers/mtd/maps/Makefile +++ b/drivers/mtd/maps/Makefile @@ -8,7 +8,6 @@ endif # Chip mappings obj-$(CONFIG_MTD_CFI_FLAGADM) += cfi_flagadm.o -obj-$(CONFIG_MTD_DC21285) += dc21285.o obj-$(CONFIG_MTD_L440GX) += l440gx.o obj-$(CONFIG_MTD_AMD76XROM) += amd76xrom.o obj-$(CONFIG_MTD_ESB2ROM) += esb2rom.o diff --git a/drivers/mtd/maps/dc21285.c b/drivers/mtd/maps/dc21285.c deleted file mode 100644 index 70a3db3ab856..000000000000 --- a/drivers/mtd/maps/dc21285.c +++ /dev/null @@ -1,231 +0,0 @@ -/* - * MTD map driver for flash on the DC21285 (the StrongARM-110 companion chip) - * - * (C) 2000 Nicolas Pitre - * - * This code is GPL - */ -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include -#include -#include - - -static struct mtd_info *dc21285_mtd; - -#ifdef CONFIG_ARCH_NETWINDER -/* - * This is really ugly, but it seams to be the only - * realiable way to do it, as the cpld state machine - * is unpredictible. So we have a 25us penalty per - * write access. - */ -static void nw_en_write(void) -{ - unsigned long flags; - - /* - * we want to write a bit pattern XXX1 to Xilinx to enable - * the write gate, which will be open for about the next 2ms. - */ - raw_spin_lock_irqsave(&nw_gpio_lock, flags); - nw_cpld_modify(CPLD_FLASH_WR_ENABLE, CPLD_FLASH_WR_ENABLE); - raw_spin_unlock_irqrestore(&nw_gpio_lock, flags); - - /* - * let the ISA bus to catch on... - */ - udelay(25); -} -#else -#define nw_en_write() do { } while (0) -#endif - -static map_word dc21285_read8(struct map_info *map, unsigned long ofs) -{ - map_word val; - val.x[0] = *(uint8_t*)(map->virt + ofs); - return val; -} - -static map_word dc21285_read16(struct map_info *map, unsigned long ofs) -{ - map_word val; - val.x[0] = *(uint16_t*)(map->virt + ofs); - return val; -} - -static map_word dc21285_read32(struct map_info *map, unsigned long ofs) -{ - map_word val; - val.x[0] = *(uint32_t*)(map->virt + ofs); - return val; -} - -static void dc21285_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len) -{ - memcpy(to, (void*)(map->virt + from), len); -} - -static void dc21285_write8(struct map_info *map, const map_word d, unsigned long adr) -{ - if (machine_is_netwinder()) - nw_en_write(); - *CSR_ROMWRITEREG = adr & 3; - adr &= ~3; - *(uint8_t*)(map->virt + adr) = d.x[0]; -} - -static void dc21285_write16(struct map_info *map, const map_word d, unsigned long adr) -{ - if (machine_is_netwinder()) - nw_en_write(); - *CSR_ROMWRITEREG = adr & 3; - adr &= ~3; - *(uint16_t*)(map->virt + adr) = d.x[0]; -} - -static void dc21285_write32(struct map_info *map, const map_word d, unsigned long adr) -{ - if (machine_is_netwinder()) - nw_en_write(); - *(uint32_t*)(map->virt + adr) = d.x[0]; -} - -static void dc21285_copy_to_32(struct map_info *map, unsigned long to, const void *from, ssize_t len) -{ - while (len > 0) { - map_word d; - d.x[0] = *((uint32_t*)from); - dc21285_write32(map, d, to); - from += 4; - to += 4; - len -= 4; - } -} - -static void dc21285_copy_to_16(struct map_info *map, unsigned long to, const void *from, ssize_t len) -{ - while (len > 0) { - map_word d; - d.x[0] = *((uint16_t*)from); - dc21285_write16(map, d, to); - from += 2; - to += 2; - len -= 2; - } -} - -static void dc21285_copy_to_8(struct map_info *map, unsigned long to, const void *from, ssize_t len) -{ - map_word d; - d.x[0] = *((uint8_t*)from); - dc21285_write8(map, d, to); - from++; - to++; - len--; -} - -static struct map_info dc21285_map = { - .name = "DC21285 flash", - .phys = NO_XIP, - .size = 16*1024*1024, - .copy_from = dc21285_copy_from, -}; - -/* Partition stuff */ -static const char * const probes[] = { "RedBoot", "cmdlinepart", NULL }; - -static int __init init_dc21285(void) -{ - /* Determine bankwidth */ - switch (*CSR_SA110_CNTL & (3<<14)) { - case SA110_CNTL_ROMWIDTH_8: - dc21285_map.bankwidth = 1; - dc21285_map.read = dc21285_read8; - dc21285_map.write = dc21285_write8; - dc21285_map.copy_to = dc21285_copy_to_8; - break; - case SA110_CNTL_ROMWIDTH_16: - dc21285_map.bankwidth = 2; - dc21285_map.read = dc21285_read16; - dc21285_map.write = dc21285_write16; - dc21285_map.copy_to = dc21285_copy_to_16; - break; - case SA110_CNTL_ROMWIDTH_32: - dc21285_map.bankwidth = 4; - dc21285_map.read = dc21285_read32; - dc21285_map.write = dc21285_write32; - dc21285_map.copy_to = dc21285_copy_to_32; - break; - default: - printk (KERN_ERR "DC21285 flash: undefined bankwidth\n"); - return -ENXIO; - } - printk (KERN_NOTICE "DC21285 flash support (%d-bit bankwidth)\n", - dc21285_map.bankwidth*8); - - /* Let's map the flash area */ - dc21285_map.virt = ioremap(DC21285_FLASH, 16*1024*1024); - if (!dc21285_map.virt) { - printk("Failed to ioremap\n"); - return -EIO; - } - - if (machine_is_ebsa285()) { - dc21285_mtd = do_map_probe("cfi_probe", &dc21285_map); - } else { - dc21285_mtd = do_map_probe("jedec_probe", &dc21285_map); - } - - if (!dc21285_mtd) { - iounmap(dc21285_map.virt); - return -ENXIO; - } - - dc21285_mtd->owner = THIS_MODULE; - - mtd_device_parse_register(dc21285_mtd, probes, NULL, NULL, 0); - - if(machine_is_ebsa285()) { - /* - * Flash timing is determined with bits 19-16 of the - * CSR_SA110_CNTL. The value is the number of wait cycles, or - * 0 for 16 cycles (the default). Cycles are 20 ns. - * Here we use 7 for 140 ns flash chips. - */ - /* access time */ - *CSR_SA110_CNTL = ((*CSR_SA110_CNTL & ~0x000f0000) | (7 << 16)); - /* burst time */ - *CSR_SA110_CNTL = ((*CSR_SA110_CNTL & ~0x00f00000) | (7 << 20)); - /* tristate time */ - *CSR_SA110_CNTL = ((*CSR_SA110_CNTL & ~0x0f000000) | (7 << 24)); - } - - return 0; -} - -static void __exit cleanup_dc21285(void) -{ - mtd_device_unregister(dc21285_mtd); - map_destroy(dc21285_mtd); - iounmap(dc21285_map.virt); -} - -module_init(init_dc21285); -module_exit(cleanup_dc21285); - - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Nicolas Pitre "); -MODULE_DESCRIPTION("MTD map driver for DC21285 boards");