From patchwork Fri Oct 18 15:41:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 176873 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1031765ill; Fri, 18 Oct 2019 08:44:02 -0700 (PDT) X-Google-Smtp-Source: APXvYqzbdBv3QjnTJuI3VD13oo0ELYLfjEmXFJq67wSlFQGFLl7x32HzpUaN3MOdFlT54QyKUEMz X-Received: by 2002:a17:906:6bcd:: with SMTP id t13mr9258056ejs.133.1571413442166; Fri, 18 Oct 2019 08:44:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571413442; cv=none; d=google.com; s=arc-20160816; b=MPuuUzFcYr7+10bv0b3TUp8UyIqajLtqfPM/S5qjUtWsgzoewclYfYpwv/dsnIspX5 Cpg1IaexRzUxISVfGBjiiOOS1Ya9ptQmDOZoVNgX8rp5vf4i/e/uw6cByKQhzHDU2AUZ 1s6/5mxSSaX/GER83QR/jokH10WS/l8Tmu8v6q+SFwTP/ffo2tpa9PL2+TOLOSi+n7Ll lPJF2e7nZsrpTcEmwRB5j6K5mF1rXX9tcBbSXjQY87tSyAoAPXcU2mZ8TYXoFaGkLngp 5y1cAH69iTlLw1+XHVc3LhVH233X2FaSkUFUJqS8TchKy7g+nVABRWQdTLud6DH3578Z iaag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=3zNDqoR21iiDlrvH61Y9d+R74PA0ir7d0cvN8AwAN3A=; b=JWraUG0TOHKnCvNfKS7zf8qqItT6v4aEPM6mxjMUwpDf4gzqX9Ut6hB/Nq1c8OlWUw Ugf+VOK9LN8GmUIKJx1/mCefeOj6kdu9eLlV2sCTEtO0nd34XTSBpDrbWYRN/75GTnou Fs36tQ50gM/gZHRpGm2HbMsClsdEbEa+ul1yJGfFIuSvGbK/5Y5OCeo0pmkg18VtCvLm iupxGaGBJAyIp2kRevDgE6FbRrYU78euxALIxIO+wJ54bHl1iPfDtsPCpsaziT4SefX4 QjrN2mC4WpraCs0F7V88L5//ZfUDBn1J8UKNsiLgD5oJ9F3i/Qkcdjt/uo67AIb9ta+J cJgQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y13si4394136ede.219.2019.10.18.08.44.01; Fri, 18 Oct 2019 08:44:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2502101AbfJRPn7 (ORCPT + 26 others); Fri, 18 Oct 2019 11:43:59 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:56659 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2505192AbfJRPmo (ORCPT ); Fri, 18 Oct 2019 11:42:44 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.145]) with ESMTPA (Nemesis) id 1MnJZ4-1heU8G45uW-00jFeL; Fri, 18 Oct 2019 17:42:37 +0200 From: Arnd Bergmann To: Daniel Mack , Haojian Zhuang , Robert Jarzmik Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Linus Walleij , Arnd Bergmann , Lubomir Rintel Subject: [PATCH 44/46] ARM: mmp: remove tavorevb board support Date: Fri, 18 Oct 2019 17:41:59 +0200 Message-Id: <20191018154201.1276638-44-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20191018154052.1276506-1-arnd@arndb.de> References: <20191018154052.1276506-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:y7jfEvjTLo4pTZYmZ7+Kwb0GbtokFQyw9nT4Q8thdVUDgZEqLai kYUJ22LKQiw34r7mZjKIfEMQ179OUSE4H6wahEtjMQ/n6sUP7QPBoRs7FWIFxJmgy1vszL4 d3C3GoeKRsN02viG5z2R5MuEUvUs77CWO+wnJEptznToF7y/0Pd+Rc/iuyztnQQ0xAooYwB 6sf0Z3PnpyPwhCkVppnrw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:zXNHNBbGRJA=:3eLOkhGGq/04MUXSvwVhzf orGo7MwbjtoXptBsbS7kZX+VkRtNYlyRyAog+zwhLMx27XPSI2AtYiVj+xsEFkbwDCNvXwtqj W4q4S8KF0aYf5V1A7SU3VaFaBy86zQL6ZcUFQhBRV9PUiQpk9sUBGn/Ik5Clz4ivmw80L4eWJ JMGRtE5sbku1s5qEZcB4B6REeTJWdak40Du26wlEN7Qyfa3mlsrJinCzyPgZUhHINMyYd5DFj qDu21Y4u+Jot+bQ3zjRPgqZ+/Opbpe4KvBYoiLb9tPQVed7WSp/d9jLvwi8G+dyduMsvbQtpM 3lBkBplG/Q895dpxNipn5xsYksBq7jM3UjFoR0A3FFpBOd+51rJ/7QWuYHprm9W+l7v++Y1S1 hl6xDX2stm0SIGeDv/BsEPtVjTA5CosNkwEVgzf7WuQY0/udXjVjJKJGRpAU2Zab7fMrja5+v 3h2iHFX5vQmZ19tsFSwYpdQMAlMHnUjPK0E9O2FaSpecJVFFb2U2hJ6qr5vcijL7QtYrZzW9O WA15ssRHLPrRGHnROym1YiuBqT6yEDeXXKxKAKj9vJJkD6nn4UcFAJ9NiSVFimJlDt8w/Qulu VvBqzcTgKHjz9hxPtCFtSt9o4zQytABBbIzc2BitS27g4+donqpuYAUX6yCcW1le0W/IW1Cr1 7zUjw58NT0ukVJbO2maoqFASAuTroDLGU3gkFyLlAJ3lLJtj/OHzCb1ODp0MO85+DuoRss4aI 8fm1D3j+wsaIfQBxjl7VXkivFXX7SN688e2TBh7drEt+1vrAy03m62CGWciMP76Uo3J6QRGfg cSicPDmII80XqNOt72SD7wx5+m9yvhTWbZdgbiVfVfqdzGqKy9rA08CrxatC9iGxOV9sKlABJ pEC+zDkEM17umT87QyqA== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There are two tavorevb boards in the kernel, one using a PXA930 chip in mach-pxa, and one using the later PXA910 chip in mach-mmp. They use the same board number, which is generally a bad idea, and in a multiplatform kernel, we can end up with funny link errors like this one resulting from two boards gettting controlled by the same Kconfig symbol: arch/arm/mach-mmp/tavorevb.o: In function `tavorevb_init': tavorevb.c:(.init.text+0x4c): undefined reference to `pxa910_device_uart1' tavorevb.c:(.init.text+0x50): undefined reference to `pxa910_device_gpio' tavorevb.o:(.arch.info.init+0x54): undefined reference to `pxa910_init_irq' tavorevb.o:(.arch.info.init+0x58): undefined reference to `pxa910_timer_init' The mach-pxa TavorEVB seems much more complete than the mach-mmp one that supports only uart, gpio and ethernet. Further, I could find no information about the board on the internet aside from references to the Linux kernel, so I assume this was never available outside of Marvell and can be removed entirely. There is a third board named TavorEVB in the Kconfig description, but this refers to the "TTC_DKB" machine. The two are clearly related, so I change the Kconfig description to just list both names. Cc: Lubomir Rintel Signed-off-by: Arnd Bergmann Reviewed-by: Lubomir Rintel --- arch/arm/mach-mmp/Kconfig | 10 +--- arch/arm/mach-mmp/Makefile | 1 - arch/arm/mach-mmp/tavorevb.c | 113 ----------------------------------- 3 files changed, 1 insertion(+), 123 deletions(-) delete mode 100644 arch/arm/mach-mmp/tavorevb.c -- 2.20.0 diff --git a/arch/arm/mach-mmp/Kconfig b/arch/arm/mach-mmp/Kconfig index 0440109e973b..fc8cbe0064ae 100644 --- a/arch/arm/mach-mmp/Kconfig +++ b/arch/arm/mach-mmp/Kconfig @@ -39,16 +39,8 @@ config MACH_AVENGERS_LITE Say 'Y' here if you want to support the Marvell PXA168-based Avengers Lite Development Board. -config MACH_TAVOREVB - bool "Marvell's PXA910 TavorEVB Development Board" - depends on ARCH_MULTI_V5 - select CPU_PXA910 - help - Say 'Y' here if you want to support the Marvell PXA910-based - TavorEVB Development Board. - config MACH_TTC_DKB - bool "Marvell's PXA910 TavorEVB Development Board" + bool "Marvell's PXA910 TavorEVB/TTC_DKB Development Board" depends on ARCH_MULTI_V5 select CPU_PXA910 help diff --git a/arch/arm/mach-mmp/Makefile b/arch/arm/mach-mmp/Makefile index 8f267c7bc6e8..0dc07e1f3196 100644 --- a/arch/arm/mach-mmp/Makefile +++ b/arch/arm/mach-mmp/Makefile @@ -27,7 +27,6 @@ endif obj-$(CONFIG_MACH_ASPENITE) += aspenite.o obj-$(CONFIG_MACH_ZYLONITE2) += aspenite.o obj-$(CONFIG_MACH_AVENGERS_LITE)+= avengers_lite.o -obj-$(CONFIG_MACH_TAVOREVB) += tavorevb.o obj-$(CONFIG_MACH_TTC_DKB) += ttc_dkb.o obj-$(CONFIG_MACH_BROWNSTONE) += brownstone.o obj-$(CONFIG_MACH_FLINT) += flint.o diff --git a/arch/arm/mach-mmp/tavorevb.c b/arch/arm/mach-mmp/tavorevb.c deleted file mode 100644 index 3261d2322198..000000000000 --- a/arch/arm/mach-mmp/tavorevb.c +++ /dev/null @@ -1,113 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * linux/arch/arm/mach-mmp/tavorevb.c - * - * Support for the Marvell PXA910-based TavorEVB Development Platform. - */ -#include -#include -#include -#include -#include -#include - -#include -#include -#include "addr-map.h" -#include "mfp-pxa910.h" -#include "pxa910.h" -#include "irqs.h" - -#include "common.h" - -static unsigned long tavorevb_pin_config[] __initdata = { - /* UART2 */ - GPIO47_UART2_RXD, - GPIO48_UART2_TXD, - - /* SMC */ - SM_nCS0_nCS0, - SM_ADV_SM_ADV, - SM_SCLK_SM_SCLK, - SM_SCLK_SM_SCLK, - SM_BE0_SM_BE0, - SM_BE1_SM_BE1, - - /* DFI */ - DF_IO0_ND_IO0, - DF_IO1_ND_IO1, - DF_IO2_ND_IO2, - DF_IO3_ND_IO3, - DF_IO4_ND_IO4, - DF_IO5_ND_IO5, - DF_IO6_ND_IO6, - DF_IO7_ND_IO7, - DF_IO8_ND_IO8, - DF_IO9_ND_IO9, - DF_IO10_ND_IO10, - DF_IO11_ND_IO11, - DF_IO12_ND_IO12, - DF_IO13_ND_IO13, - DF_IO14_ND_IO14, - DF_IO15_ND_IO15, - DF_nCS0_SM_nCS2_nCS0, - DF_ALE_SM_WEn_ND_ALE, - DF_CLE_SM_OEn_ND_CLE, - DF_WEn_DF_WEn, - DF_REn_DF_REn, - DF_RDY0_DF_RDY0, -}; - -static struct pxa_gpio_platform_data pxa910_gpio_pdata = { - .irq_base = MMP_GPIO_TO_IRQ(0), -}; - -static struct smc91x_platdata tavorevb_smc91x_info = { - .flags = SMC91X_USE_16BIT | SMC91X_NOWAIT, -}; - -static struct resource smc91x_resources[] = { - [0] = { - .start = SMC_CS1_PHYS_BASE + 0x300, - .end = SMC_CS1_PHYS_BASE + 0xfffff, - .flags = IORESOURCE_MEM, - }, - [1] = { - .start = MMP_GPIO_TO_IRQ(80), - .end = MMP_GPIO_TO_IRQ(80), - .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE, - } -}; - -static struct platform_device smc91x_device = { - .name = "smc91x", - .id = 0, - .dev = { - .platform_data = &tavorevb_smc91x_info, - }, - .num_resources = ARRAY_SIZE(smc91x_resources), - .resource = smc91x_resources, -}; - -static void __init tavorevb_init(void) -{ - mfp_config(ARRAY_AND_SIZE(tavorevb_pin_config)); - - /* on-chip devices */ - pxa910_add_uart(1); - platform_device_add_data(&pxa910_device_gpio, &pxa910_gpio_pdata, - sizeof(struct pxa_gpio_platform_data)); - platform_device_register(&pxa910_device_gpio); - - /* off-chip devices */ - platform_device_register(&smc91x_device); -} - -MACHINE_START(TAVOREVB, "PXA910 Evaluation Board (aka TavorEVB)") - .map_io = mmp_map_io, - .nr_irqs = MMP_NR_IRQS, - .init_irq = pxa910_init_irq, - .init_time = pxa910_timer_init, - .init_machine = tavorevb_init, - .restart = mmp_restart, -MACHINE_END