From patchwork Fri Feb 11 22:32:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 12744015 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5FB01C433EF for ; Fri, 11 Feb 2022 22:36:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=XCANFPCj4wN1O64+1WaP86hEJNLBVIG+drFjguGLWFI=; b=lLsyLqwPt3quEg +jjQpHyTYtB6RTf95VUGXfOPw0HvVq1cftR5gEwRkEVt3QRvKzdev0sLA6Dh9r5YARf1GLBbr6Qdy lzk24x40YNt+YChOiroUzKIyGCVr+VBjCt/Cku+MBsitC7qjPm2410qMPJ6QK4LtUttDM4Rk9kQ7K zwYnVf/LK8W14ZNonvQgVMCMk8N5UiBreac/Y/2/BF9ZfDBHGZdp1ZpAe0uvRVJyIOTMCwrzQv1uW HEMvMLGWjT1ShjNU6t3g3zFXW0zXASwbabxUKefjSU4RaqXtU2HPAGq3+dgUJAjj5cdFqTXvUGBhN h683nuB+JqDGphiM4aYw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nIeVJ-008xuE-Be; Fri, 11 Feb 2022 22:35:02 +0000 Received: from mail-lf1-x129.google.com ([2a00:1450:4864:20::129]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nIeV5-008xmG-1a for linux-arm-kernel@lists.infradead.org; Fri, 11 Feb 2022 22:34:49 +0000 Received: by mail-lf1-x129.google.com with SMTP id m18so19199275lfq.4 for ; Fri, 11 Feb 2022 14:34:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QPa/5/JCO2PZyhKqCf78oJLBrUyDZu3TfhMBUiKpL5A=; b=Bwvzi/jRu9c9Z5ynCx54Bg7SPuHAoj86eelYgn38nLdUDhnVKhDzLNx9UCqOYVaOep 5l3eq5+ZYzRX+4W4oTdZB4pvc1SsPYLY3oX4fJbHlOclBBz4PmNPYBsAIvDykn7tDqos ioRuU+tmPwk/Q6Tb48TQluEsZWZ/GsjDayEfK+OXkPE3J2sCZfDUQFT03TDs5zYQtTsb ChRSRMbFtfbUZ7IpEBE+tzjbwVul2DnzH20OFrkxgsOEqMku54Kpm0TX9CkXImGmxNu3 yMX+vmP31Jc7fA10G1OVv/PP24gVaUu/UlopRJmo/78SvsUO/zkgPPAx+A/d2tehcQUs wT7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QPa/5/JCO2PZyhKqCf78oJLBrUyDZu3TfhMBUiKpL5A=; b=S2/zfT6s1K4vc0v3dmV9gKkBXcPgsO86CvNwwXTvUvtc2CI6TXu5g7SPmc/0xVKShN B+0p7sTU5kzq2XHGey/RmfeJecxULA93duxu2K+Am3mHxfB99ADjI9kh5DfHlEodtF5g nGQunbjo+1EuSb5/IJUJGo/RF1GZFPD9H/GwM+OSESlCmhV1MKs//+3rtu5GENou6Ixl cmZ9ZJA9ZBLxYtwxjyrC2Ia+OLrlHLmVzaeMOWwymMtKO8IPuKRky2ltOuGxFQdf9UAX bBrHSlkr3ltQ66h5qMIZzBUSOZA5LR7ednVsRxmAyYYvOtmgxFTGg7aCdESiwx7xAvHL 3fkg== X-Gm-Message-State: AOAM532h1yXqhEoRbQJGvooBPEc4D3lKg61KKg3Spxg2p30HcLlfpUi1 oNNTjDPvU5Ez+3JETfj71QFupTkA+OwmX4Du X-Google-Smtp-Source: ABdhPJwlVg1gHE9RV+lIac737ML18DCVBoi65cVy4fn4hsO514ajuOJMRxrxp7feLQEyEG2G1mWLaw== X-Received: by 2002:a05:6512:1305:: with SMTP id x5mr2681885lfu.179.1644618885045; Fri, 11 Feb 2022 14:34:45 -0800 (PST) Received: from localhost.localdomain (c-fdcc225c.014-348-6c756e10.bbcust.telenor.se. [92.34.204.253]) by smtp.gmail.com with ESMTPSA id x2sm3296300lji.27.2022.02.11.14.34.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Feb 2022 14:34:44 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, Imre Kaloz , Krzysztof Halasa Cc: Zoltan HERPAI , Linus Walleij Subject: [PATCH 01/13 v2] ARM: ixp4xx: Delete Gateway 7001 boardfiles Date: Fri, 11 Feb 2022 23:32:26 +0100 Message-Id: <20220211223238.648934-2-linus.walleij@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220211223238.648934-1-linus.walleij@linaro.org> References: <20220211223238.648934-1-linus.walleij@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220211_143447_293483_11868E6E X-CRM114-Status: GOOD ( 17.95 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Zoltan HERPAI This board is replaced with the corresponding device tree. Cc: Imre Kaloz Signed-off-by: Zoltan HERPAI Signed-off-by: Linus Walleij --- ChangeLog v1->v2: - No changes --- arch/arm/mach-ixp4xx/Kconfig | 8 -- arch/arm/mach-ixp4xx/Makefile | 3 - arch/arm/mach-ixp4xx/gateway7001-pci.c | 61 ------------ arch/arm/mach-ixp4xx/gateway7001-setup.c | 113 ----------------------- 4 files changed, 185 deletions(-) delete mode 100644 arch/arm/mach-ixp4xx/gateway7001-pci.c delete mode 100644 arch/arm/mach-ixp4xx/gateway7001-setup.c diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig index 4c787b4be62b..e6b23c3ce50c 100644 --- a/arch/arm/mach-ixp4xx/Kconfig +++ b/arch/arm/mach-ixp4xx/Kconfig @@ -17,14 +17,6 @@ config MACH_IXP4XX_OF help Say 'Y' here to support Device Tree-based IXP4xx platforms. -config MACH_GATEWAY7001 - bool "Gateway 7001" - depends on IXP4XX_PCI_LEGACY - help - Say 'Y' here if you want your kernel to support Gateway's - 7001 Access Point. For more information on this platform, - see http://openwrt.org - config MACH_GORAMO_MLR bool "GORAMO Multi Link Router" depends on IXP4XX_PCI_LEGACY diff --git a/arch/arm/mach-ixp4xx/Makefile b/arch/arm/mach-ixp4xx/Makefile index b241094c9649..0a92f8c40e1c 100644 --- a/arch/arm/mach-ixp4xx/Makefile +++ b/arch/arm/mach-ixp4xx/Makefile @@ -9,11 +9,8 @@ obj-pci-n := # Device tree platform obj-pci-$(CONFIG_MACH_IXP4XX_OF) += ixp4xx-of.o -obj-pci-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o - obj-y += common.o -obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-setup.o obj-$(CONFIG_MACH_GORAMO_MLR) += goramo_mlr.o obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o diff --git a/arch/arm/mach-ixp4xx/gateway7001-pci.c b/arch/arm/mach-ixp4xx/gateway7001-pci.c deleted file mode 100644 index 3c3ee9dad6d8..000000000000 --- a/arch/arm/mach-ixp4xx/gateway7001-pci.c +++ /dev/null @@ -1,61 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * arch/arch/mach-ixp4xx/gateway7001-pci.c - * - * PCI setup routines for Gateway 7001 - * - * Copyright (C) 2007 Imre Kaloz - * - * based on coyote-pci.c: - * Copyright (C) 2002 Jungo Software Technologies. - * Copyright (C) 2003 MontaVista Softwrae, Inc. - * - * Maintainer: Imre Kaloz - */ - -#include -#include -#include -#include - -#include -#include - -#include - -#include "irqs.h" - -void __init gateway7001_pci_preinit(void) -{ - irq_set_irq_type(IRQ_IXP4XX_GPIO10, IRQ_TYPE_LEVEL_LOW); - irq_set_irq_type(IRQ_IXP4XX_GPIO11, IRQ_TYPE_LEVEL_LOW); - - ixp4xx_pci_preinit(); -} - -static int __init gateway7001_map_irq(const struct pci_dev *dev, u8 slot, - u8 pin) -{ - if (slot == 1) - return IRQ_IXP4XX_GPIO11; - else if (slot == 2) - return IRQ_IXP4XX_GPIO10; - else return -1; -} - -struct hw_pci gateway7001_pci __initdata = { - .nr_controllers = 1, - .ops = &ixp4xx_ops, - .preinit = gateway7001_pci_preinit, - .setup = ixp4xx_setup, - .map_irq = gateway7001_map_irq, -}; - -int __init gateway7001_pci_init(void) -{ - if (machine_is_gateway7001()) - pci_common_init(&gateway7001_pci); - return 0; -} - -subsys_initcall(gateway7001_pci_init); diff --git a/arch/arm/mach-ixp4xx/gateway7001-setup.c b/arch/arm/mach-ixp4xx/gateway7001-setup.c deleted file mode 100644 index 678e7dfff0e5..000000000000 --- a/arch/arm/mach-ixp4xx/gateway7001-setup.c +++ /dev/null @@ -1,113 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * arch/arm/mach-ixp4xx/gateway7001-setup.c - * - * Board setup for the Gateway 7001 board - * - * Copyright (C) 2007 Imre Kaloz - * - * based on coyote-setup.c: - * Copyright (C) 2003-2005 MontaVista Software, Inc. - * - * Author: Imre Kaloz - */ - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "irqs.h" - -static struct flash_platform_data gateway7001_flash_data = { - .map_name = "cfi_probe", - .width = 2, -}; - -static struct resource gateway7001_flash_resource = { - .flags = IORESOURCE_MEM, -}; - -static struct platform_device gateway7001_flash = { - .name = "IXP4XX-Flash", - .id = 0, - .dev = { - .platform_data = &gateway7001_flash_data, - }, - .num_resources = 1, - .resource = &gateway7001_flash_resource, -}; - -static struct resource gateway7001_uart_resource = { - .start = IXP4XX_UART2_BASE_PHYS, - .end = IXP4XX_UART2_BASE_PHYS + 0x0fff, - .flags = IORESOURCE_MEM, -}; - -static struct plat_serial8250_port gateway7001_uart_data[] = { - { - .mapbase = IXP4XX_UART2_BASE_PHYS, - .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, - .irq = IRQ_IXP4XX_UART2, - .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, - .iotype = UPIO_MEM, - .regshift = 2, - .uartclk = IXP4XX_UART_XTAL, - }, - { }, -}; - -static struct platform_device gateway7001_uart = { - .name = "serial8250", - .id = PLAT8250_DEV_PLATFORM, - .dev = { - .platform_data = gateway7001_uart_data, - }, - .num_resources = 1, - .resource = &gateway7001_uart_resource, -}; - -static struct platform_device *gateway7001_devices[] __initdata = { - &gateway7001_flash, - &gateway7001_uart -}; - -static void __init gateway7001_init(void) -{ - ixp4xx_sys_init(); - - gateway7001_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); - gateway7001_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + SZ_32M - 1; - - *IXP4XX_EXP_CS0 |= IXP4XX_FLASH_WRITABLE; - *IXP4XX_EXP_CS1 = *IXP4XX_EXP_CS0; - - platform_add_devices(gateway7001_devices, ARRAY_SIZE(gateway7001_devices)); -} - -#ifdef CONFIG_MACH_GATEWAY7001 -MACHINE_START(GATEWAY7001, "Gateway 7001 AP") - /* Maintainer: Imre Kaloz */ - .map_io = ixp4xx_map_io, - .init_early = ixp4xx_init_early, - .init_irq = ixp4xx_init_irq, - .init_time = ixp4xx_timer_init, - .atag_offset = 0x100, - .init_machine = gateway7001_init, -#if defined(CONFIG_PCI) - .dma_zone_size = SZ_64M, -#endif - .restart = ixp4xx_restart, -MACHINE_END -#endif