From patchwork Fri Sep 22 06:15:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 13394976 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A3A97E7D0CD for ; Fri, 22 Sep 2023 06:15:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231241AbjIVGPv (ORCPT ); Fri, 22 Sep 2023 02:15:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229539AbjIVGPu (ORCPT ); Fri, 22 Sep 2023 02:15:50 -0400 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C87C4114 for ; Thu, 21 Sep 2023 23:15:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=k1; bh=nGiTOBkXg0QBYNNKE4GjU+gPswwukGG0RFc1y0f8fGU=; b=WJj01S aViU5JPWr1bKFd1swE8SLjVGyswEKVVFC054eqFF8ijl3j34fim8fec4qrwnQ2Wx jPio/PtCpg2qbTbYlA3GXv2jOKvZ/t1rBU/p981kpUfJ3T/ZTmSrLh3xQyz6hmfk tCqcMVAwp5zX59OE0kyPtYJ2lH4de5DsTB31AttO5Ic0KuAxHlcHR51EOpAUKEpq V76M7i7cRcdPWif5aAQuttwjy+/fnMoKeo5MAbqzpDc6BrrGxpU4Z/hUaCcOxxKM y0XlUUw/1LNJfEP9uEX8R/KkAiR3x9Tfsp4esgKSG5VMBZIDn9gpigrMp65AWPy6 ivAkuJD/COMIHwDw== Received: (qmail 1269022 invoked from network); 22 Sep 2023 08:15:40 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Sep 2023 08:15:40 +0200 X-UD-Smtp-Session: l3s3148p1@2qKjiewF8JkujntX From: Wolfram Sang To: linux-mips@vger.kernel.org Cc: Jonas Gorski , Florian Fainelli , Wolfram Sang , Greg Kroah-Hartman , Jiri Slaby , linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org Subject: [PATCH v2 1/6] serial: 8250: remove AR7 support Date: Fri, 22 Sep 2023 08:15:22 +0200 Message-Id: <20230922061530.3121-2-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230922061530.3121-1-wsa+renesas@sang-engineering.com> References: <20230922061530.3121-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org AR7 is going to be removed from the Kernel, so remove its type definition from 8250 code. As with previous removals, I checked with Debian Code Search that 'PORT_AR7' is not used in userspace. Signed-off-by: Wolfram Sang Acked-by: Florian Fainelli Acked-by: Greg Kroah-Hartman --- Changes since v1: * added acks * kept uapi define for for serial port type drivers/tty/serial/8250/8250_port.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c index fb891b67968f..a4f5d792679a 100644 --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c @@ -170,13 +170,6 @@ static const struct serial8250_config uart_config[] = { .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10, .flags = UART_CAP_FIFO, }, - [PORT_AR7] = { - .name = "AR7", - .fifo_size = 16, - .tx_loadsz = 16, - .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_00, - .flags = UART_CAP_FIFO /* | UART_CAP_AFE */, - }, [PORT_U6_16550A] = { .name = "U6_16550A", .fifo_size = 64, From patchwork Fri Sep 22 06:15:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 13394977 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1FBA1E7D0CE for ; Fri, 22 Sep 2023 06:15:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231255AbjIVGPv (ORCPT ); Fri, 22 Sep 2023 02:15:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45430 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229813AbjIVGPu (ORCPT ); Fri, 22 Sep 2023 02:15:50 -0400 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC8EB19C for ; Thu, 21 Sep 2023 23:15:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=k1; bh=BTlcmFnnfxEfNUisgi/VE1hSD2DIqTeGV9pSI5JKow0=; b=N7OCC2 yEDAZZBCJomsG+N7CW92pSkN0zXqQa+hKpd0yENypzbHd92rvRbmHB2DTvhSS1S+ fWaxLWYyVXd8SRun71cQwd++pqYdggI5rvLT7oAe8kv/4toA0tQkcpGbBV9h59uf Sof4gkRIZSemZJs+2zKA/oT7JWTyECdJZ+mmUrDLGsvjsaeF8k5JKqHRKpUlWNtt wq2RcBxmrbH7bpbxWzC3Hmz4Wfb7hXNtyaLYjvbqhvtr6yu8jR29xJW/1vUkjrxI m1odKgtZEPAJCBLj/fJLsTIZxL6WVCZ5HiDuAIYh3xrQGXmXi9Dy+otjhqSzzdwD xsshjicSVtlBAE3w== Received: (qmail 1269071 invoked from network); 22 Sep 2023 08:15:41 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Sep 2023 08:15:41 +0200 X-UD-Smtp-Session: l3s3148p1@E3mxiewF9JkujntX From: Wolfram Sang To: linux-mips@vger.kernel.org Cc: Jonas Gorski , Florian Fainelli , Wolfram Sang , Russell King , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org Subject: [PATCH v2 2/6] mtd: parsers: ar7: remove support Date: Fri, 22 Sep 2023 08:15:23 +0200 Message-Id: <20230922061530.3121-3-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230922061530.3121-1-wsa+renesas@sang-engineering.com> References: <20230922061530.3121-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org AR7 is going to be removed from the Kernel, so remove its support for MTD. Signed-off-by: Wolfram Sang Acked-by: Florian Fainelli Acked-by: Miquel Raynal --- Changes since v1: * added ack arch/arm/configs/pxa_defconfig | 1 - drivers/mtd/parsers/Kconfig | 5 -- drivers/mtd/parsers/Makefile | 1 - drivers/mtd/parsers/ar7part.c | 129 --------------------------------- 4 files changed, 136 deletions(-) delete mode 100644 drivers/mtd/parsers/ar7part.c diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig index 23c131b0854b..9e81b1849e4c 100644 --- a/arch/arm/configs/pxa_defconfig +++ b/arch/arm/configs/pxa_defconfig @@ -100,7 +100,6 @@ CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_CONNECTOR=y CONFIG_MTD=y -CONFIG_MTD_AR7_PARTS=m CONFIG_MTD_CMDLINE_PARTS=m CONFIG_MTD_OF_PARTS=m CONFIG_MTD_AFS_PARTS=m diff --git a/drivers/mtd/parsers/Kconfig b/drivers/mtd/parsers/Kconfig index 60738edcd5d5..da03ab6efe04 100644 --- a/drivers/mtd/parsers/Kconfig +++ b/drivers/mtd/parsers/Kconfig @@ -1,9 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -config MTD_AR7_PARTS - tristate "TI AR7 partitioning parser" - help - TI AR7 partitioning parser support - config MTD_BCM47XX_PARTS tristate "BCM47XX partitioning parser" depends on BCM47XX || ARCH_BCM_5301X diff --git a/drivers/mtd/parsers/Makefile b/drivers/mtd/parsers/Makefile index 0e70b621a1d8..9b00c62b837a 100644 --- a/drivers/mtd/parsers/Makefile +++ b/drivers/mtd/parsers/Makefile @@ -1,5 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o obj-$(CONFIG_MTD_BCM47XX_PARTS) += bcm47xxpart.o obj-$(CONFIG_MTD_BCM63XX_PARTS) += bcm63xxpart.o obj-$(CONFIG_MTD_BRCM_U_BOOT) += brcm_u-boot.o diff --git a/drivers/mtd/parsers/ar7part.c b/drivers/mtd/parsers/ar7part.c deleted file mode 100644 index 8cd683711ac6..000000000000 From patchwork Fri Sep 22 06:15:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 13394978 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6BDDE7D0D4 for ; Fri, 22 Sep 2023 06:15:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231267AbjIVGPx (ORCPT ); Fri, 22 Sep 2023 02:15:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229933AbjIVGPu (ORCPT ); Fri, 22 Sep 2023 02:15:50 -0400 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB75119E for ; Thu, 21 Sep 2023 23:15:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=k1; bh=xTki5vOqDYt4W4yvOrnoMKICai3BdzIOoF5xVAgULAk=; b=d89txo lC0N8u0Ifegm/VqPPzwuY113EXAAB4zslBsgCVeU4Q6j4UOMgwAwcnyS8SuT9InJ CRlJlaLmnRA4mF4lzX3zQ+J7Je7d59yBtRztYYxI0hCnn7qTF/Fd1fY+2Aq3q/gA OJ0LX1/LYpKmCkBp0qj5+s3OtHfvT6boxmZfwxEH2vJOkMGWb2GgR0JhgOgHuNsm e5+xCktt/PYk8JJ7GTL9LMnustwdsF18t4Jl+JBvP1KP5D7PvvPPq+tZThHZgiKX YAg37p8u/lqg3g29w6yC+OQY1oHWYBrsLdfGqmQ1odHpMSOCCh8QGTi+dyvBC44Z leXAPrXJqArjvJZw== Received: (qmail 1269124 invoked from network); 22 Sep 2023 08:15:42 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Sep 2023 08:15:42 +0200 X-UD-Smtp-Session: l3s3148p1@DyjCiewFBJoujntX From: Wolfram Sang To: linux-mips@vger.kernel.org Cc: Jonas Gorski , Florian Fainelli , Wolfram Sang , Greg Kroah-Hartman , linux-kernel@vger.kernel.org Subject: [PATCH v2 3/6] vlynq: remove bus driver Date: Fri, 22 Sep 2023 08:15:24 +0200 Message-Id: <20230922061530.3121-4-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230922061530.3121-1-wsa+renesas@sang-engineering.com> References: <20230922061530.3121-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org There are no users with a vlynq_driver in the Kernel tree. Also, only the AR7 platform ever initialized a VLYNQ bus, but AR7 is going to be removed from the Kernel. OpenWRT had some out-of-tree drivers which they probably intended to upport, but AR7 devices are even there not supported anymore because they are "stuck with Kernel 3.18" [1]. This code can go. [1] https://openwrt.org/docs/techref/targets/ar7 Signed-off-by: Wolfram Sang Acked-by: Greg Kroah-Hartman Acked-by: Florian Fainelli --- Changes since v1: * added ack MAINTAINERS | 7 - drivers/Kconfig | 2 - drivers/Makefile | 1 - drivers/vlynq/Kconfig | 21 -- drivers/vlynq/Makefile | 6 - drivers/vlynq/vlynq.c | 799 ----------------------------------------- include/linux/vlynq.h | 149 -------- 7 files changed, 985 deletions(-) delete mode 100644 drivers/vlynq/Kconfig delete mode 100644 drivers/vlynq/Makefile delete mode 100644 drivers/vlynq/vlynq.c delete mode 100644 include/linux/vlynq.h diff --git a/MAINTAINERS b/MAINTAINERS index bf0f54c24f81..bdd6e7ce962d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -22961,13 +22961,6 @@ W: https://linuxtv.org T: git git://linuxtv.org/media_tree.git F: drivers/media/test-drivers/vivid/* -VLYNQ BUS -M: Florian Fainelli -L: openwrt-devel@lists.openwrt.org (subscribers-only) -S: Maintained -F: drivers/vlynq/vlynq.c -F: include/linux/vlynq.h - VM SOCKETS (AF_VSOCK) M: Stefano Garzarella L: virtualization@lists.linux-foundation.org diff --git a/drivers/Kconfig b/drivers/Kconfig index efb66e25fa2d..9c8b82ddebfe 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -135,8 +135,6 @@ source "drivers/uio/Kconfig" source "drivers/vfio/Kconfig" -source "drivers/vlynq/Kconfig" - source "drivers/virt/Kconfig" source "drivers/virtio/Kconfig" diff --git a/drivers/Makefile b/drivers/Makefile index 1bec7819a837..f7eeec79ef66 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -151,7 +151,6 @@ obj-$(CONFIG_BCMA) += bcma/ obj-$(CONFIG_VHOST_RING) += vhost/ obj-$(CONFIG_VHOST_IOTLB) += vhost/ obj-$(CONFIG_VHOST) += vhost/ -obj-$(CONFIG_VLYNQ) += vlynq/ obj-$(CONFIG_GREYBUS) += greybus/ obj-$(CONFIG_COMEDI) += comedi/ obj-$(CONFIG_STAGING) += staging/ diff --git a/drivers/vlynq/Kconfig b/drivers/vlynq/Kconfig deleted file mode 100644 index e7f9492a0b04..000000000000 diff --git a/drivers/vlynq/Makefile b/drivers/vlynq/Makefile deleted file mode 100644 index d9ce5b2b5ce0..000000000000 diff --git a/drivers/vlynq/vlynq.c b/drivers/vlynq/vlynq.c deleted file mode 100644 index 4af6615808cc..000000000000 diff --git a/include/linux/vlynq.h b/include/linux/vlynq.h deleted file mode 100644 index e9c0cd36c48a..000000000000 From patchwork Fri Sep 22 06:15:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 13394980 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F2EF0E7D0CD for ; Fri, 22 Sep 2023 06:16:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231348AbjIVGQE (ORCPT ); Fri, 22 Sep 2023 02:16:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45930 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231280AbjIVGPy (ORCPT ); Fri, 22 Sep 2023 02:15:54 -0400 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0CD73102 for ; Thu, 21 Sep 2023 23:15:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=k1; bh=yfSDdpMikY6RdTRHwRz19gb4YLp7sQdL2g88bLD8aGA=; b=fXB84Y r058X3ZL0xIV2NEufI0dOgAKFlt51zIv6FKySijSMmAEnc4GDULW1aiww/ohFpxe 4MLfaSCjidQvKdVdWz3x+XRwOuVFDoEurTDG5P5cKliMJN1KYAs06Zy+w138RgIM 7qMiRqAwLHWNgYN8r6BJWg7eAFlhZ6II32FSsEBvctG68G4kxHIUYQehxL2WwOPb EbvVVBYX1X8zF1xAt6nch3NAnF7bLv00PA/h2+tSHwRcpgcltjQSNpx565b4W8Jz cxNHhC1YLVkNEw9TJBhOhjhQID9nX/0IkM6OliGMzrgUD/1/JrWTU4fbx4PTD06C Y/0ECBTbiFzAkEQQ== Received: (qmail 1269152 invoked from network); 22 Sep 2023 08:15:43 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Sep 2023 08:15:43 +0200 X-UD-Smtp-Session: l3s3148p1@l4bQiewFBpoujntX From: Wolfram Sang To: linux-mips@vger.kernel.org Cc: Jonas Gorski , Florian Fainelli , Wolfram Sang , Guenter Roeck , Wim Van Sebroeck , linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/6] watchdog: ar7_wdt: remove driver to prepare for platform removal Date: Fri, 22 Sep 2023 08:15:25 +0200 Message-Id: <20230922061530.3121-5-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230922061530.3121-1-wsa+renesas@sang-engineering.com> References: <20230922061530.3121-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org AR7 is going to be removed from the Kernel, so remove its watchdog support. This allows us to remove the platform because this driver includes a platform specific header. Signed-off-by: Wolfram Sang Acked-by: Florian Fainelli Acked-by: Guenter Roeck --- Changes since v1: * added acks drivers/watchdog/Kconfig | 6 - drivers/watchdog/Makefile | 1 - drivers/watchdog/ar7_wdt.c | 315 ------------------------------------- 3 files changed, 322 deletions(-) delete mode 100644 drivers/watchdog/ar7_wdt.c diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 751458959411..b9f715d73fe8 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -1768,12 +1768,6 @@ config SIBYTE_WDOG To compile this driver as a loadable module, choose M here. The module will be called sb_wdog. -config AR7_WDT - tristate "TI AR7 Watchdog Timer" - depends on AR7 || (MIPS && 32BIT && COMPILE_TEST) - help - Hardware driver for the TI AR7 Watchdog Timer. - config TXX9_WDT tristate "Toshiba TXx9 Watchdog Timer" depends on CPU_TX49XX || (MIPS && COMPILE_TEST) diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index 7eab9de311cb..7cbc34514ec1 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -168,7 +168,6 @@ obj-$(CONFIG_INDYDOG) += indydog.o obj-$(CONFIG_JZ4740_WDT) += jz4740_wdt.o obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o -obj-$(CONFIG_AR7_WDT) += ar7_wdt.o obj-$(CONFIG_TXX9_WDT) += txx9wdt.o obj-$(CONFIG_OCTEON_WDT) += octeon-wdt.o octeon-wdt-y := octeon-wdt-main.o octeon-wdt-nmi.o diff --git a/drivers/watchdog/ar7_wdt.c b/drivers/watchdog/ar7_wdt.c deleted file mode 100644 index cdcaeb0961ac..000000000000 From patchwork Fri Sep 22 06:15:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 13394981 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7CCE9E7D0D0 for ; Fri, 22 Sep 2023 06:16:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229933AbjIVGQG (ORCPT ); Fri, 22 Sep 2023 02:16:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231277AbjIVGQD (ORCPT ); Fri, 22 Sep 2023 02:16:03 -0400 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 70406197 for ; Thu, 21 Sep 2023 23:15:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type :content-transfer-encoding; s=k1; bh=2sBBi2jpgeawaZPl0+HnKpz9m+O EIzM5p6vt2uhfrK0=; b=mdE61oq/xkEt+fB3rYXRcoE5MD3uLRXFVAf4K8VcEAX Go05nZpG6ZRzMz9lxu76fKMZQBmF+EL2pKptnLYS9pe/heQQ7pKpueysBBqw6VWu PqpE8Eu5ZFzwJl8F4eyq9J5RxdDvHS0GZjmZjiWuj5LEtsi9g0/l1+ooJ+qfCB5h Hggd6KXft/0ZHa/GYtv0VeZEMTTzjXBJHb1bDBcRgWoXpdpa5jCDfWIKoFZHBMEn xE0H/PBpB1ap1whpx2k6LaOcrMtou0LeuE/BoDkePu1nm2WQxgUyLCuP+lhGS4gB /1NyIa88UHxlptb+fxkH3X+wXT/j0khRZhcTwbTfWyg== Received: (qmail 1269171 invoked from network); 22 Sep 2023 08:15:44 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Sep 2023 08:15:44 +0200 X-UD-Smtp-Session: l3s3148p1@uDbeiewFDpoujntX From: Wolfram Sang To: linux-mips@vger.kernel.org Cc: Jonas Gorski , Florian Fainelli , Wolfram Sang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH net-next v2 5/6] net: cpmac: remove driver to prepare for platform removal Date: Fri, 22 Sep 2023 08:15:26 +0200 Message-Id: <20230922061530.3121-6-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230922061530.3121-1-wsa+renesas@sang-engineering.com> References: <20230922061530.3121-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org AR7 is going to be removed from the Kernel, so remove its networking support in form of the cpmac driver. This allows us to remove the platform because this driver includes a platform specific header. Signed-off-by: Wolfram Sang Acked-by: Florian Fainelli --- Changes since v1: * added ack MAINTAINERS | 6 - drivers/net/ethernet/ti/Kconfig | 9 +- drivers/net/ethernet/ti/Makefile | 1 - drivers/net/ethernet/ti/cpmac.c | 1251 ------------------------------ 4 files changed, 1 insertion(+), 1266 deletions(-) delete mode 100644 drivers/net/ethernet/ti/cpmac.c diff --git a/MAINTAINERS b/MAINTAINERS index bdd6e7ce962d..00063d14c70b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5309,12 +5309,6 @@ M: Bence Csókás S: Maintained F: drivers/i2c/busses/i2c-cp2615.c -CPMAC ETHERNET DRIVER -M: Florian Fainelli -L: netdev@vger.kernel.org -S: Maintained -F: drivers/net/ethernet/ti/cpmac.c - CPU FREQUENCY DRIVERS - VEXPRESS SPC ARM BIG LITTLE M: Viresh Kumar M: Sudeep Holla diff --git a/drivers/net/ethernet/ti/Kconfig b/drivers/net/ethernet/ti/Kconfig index 88b5b1b47779..7a99a86888e9 100644 --- a/drivers/net/ethernet/ti/Kconfig +++ b/drivers/net/ethernet/ti/Kconfig @@ -6,7 +6,7 @@ config NET_VENDOR_TI bool "Texas Instruments (TI) devices" default y - depends on PCI || EISA || AR7 || ARCH_DAVINCI || ARCH_OMAP2PLUS || ARCH_KEYSTONE || ARCH_K3 + depends on PCI || EISA || ARCH_DAVINCI || ARCH_OMAP2PLUS || ARCH_KEYSTONE || ARCH_K3 help If you have a network (Ethernet) card belonging to this class, say Y. @@ -176,13 +176,6 @@ config TLAN Please email feedback to . -config CPMAC - tristate "TI AR7 CPMAC Ethernet support" - depends on AR7 - select PHYLIB - help - TI AR7 CPMAC Ethernet support - config TI_ICSSG_PRUETH tristate "TI Gigabit PRU Ethernet driver" select PHYLIB diff --git a/drivers/net/ethernet/ti/Makefile b/drivers/net/ethernet/ti/Makefile index 34fd7a716ba6..e38ec9d6c99b 100644 --- a/drivers/net/ethernet/ti/Makefile +++ b/drivers/net/ethernet/ti/Makefile @@ -8,7 +8,6 @@ obj-$(CONFIG_TI_DAVINCI_EMAC) += cpsw-common.o obj-$(CONFIG_TI_CPSW_SWITCHDEV) += cpsw-common.o obj-$(CONFIG_TLAN) += tlan.o -obj-$(CONFIG_CPMAC) += cpmac.o obj-$(CONFIG_TI_DAVINCI_EMAC) += ti_davinci_emac.o ti_davinci_emac-y := davinci_emac.o davinci_cpdma.o obj-$(CONFIG_TI_DAVINCI_MDIO) += davinci_mdio.o diff --git a/drivers/net/ethernet/ti/cpmac.c b/drivers/net/ethernet/ti/cpmac.c deleted file mode 100644 index 80eeeb463c4f..000000000000 From patchwork Fri Sep 22 06:15:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 13394982 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F17F6E7D0CF for ; Fri, 22 Sep 2023 06:16:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231424AbjIVGQG (ORCPT ); Fri, 22 Sep 2023 02:16:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33750 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231339AbjIVGQE (ORCPT ); Fri, 22 Sep 2023 02:16:04 -0400 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5A6419D for ; Thu, 21 Sep 2023 23:15:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=k1; bh=PBIK72HHguYgSAXkX++54+0ynqVyWWRjkT4uhKM7s/E=; b=VDcXh6 W7SwgMZtqAVpDOSRcAXl98l56PCM1Q0vXofo9juxeqleGK/Otw6KD7GwJP66WsAb qghVDa1QbHqVmWA5fYBmY1G818UYQLnkk3eNqJcHmZIdHhQjtBadadZjObz2+UtN Qv0PbMBkB8i/j2fJS0BeohX3E79Gm516/yEt/WZ9p5Mb1MBzWpLWh0RLf6L0DILQ +WrrrmfSvMFqp3hgtT++Xc4HYkOC5/SJStwr4JGOD9v9E7G0/mqyZN+qiFPNhvDW p6b9ki/QqfSpaNK6Fq3uxiwcBpr7vfYzQq4xp/LMw6GBPQKVPO9iOtfiFVkINqZ4 nmT8eA1gzOcM/dEA== Received: (qmail 1269224 invoked from network); 22 Sep 2023 08:15:45 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 22 Sep 2023 08:15:45 +0200 X-UD-Smtp-Session: l3s3148p1@U0v5iewFHoYujntX From: Wolfram Sang To: linux-mips@vger.kernel.org Cc: Jonas Gorski , Florian Fainelli , Wolfram Sang , Thomas Bogendoerfer , linux-kernel@vger.kernel.org Subject: [PATCH v2 6/6] MIPS: AR7: remove platform Date: Fri, 22 Sep 2023 08:15:27 +0200 Message-Id: <20230922061530.3121-7-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230922061530.3121-1-wsa+renesas@sang-engineering.com> References: <20230922061530.3121-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org After a discussion about removing VLYNQ support from the Kernel, it was concluded that its only user, the AR7 platform can go [1]. Even OpenWRT has removed support because these devices are "stuck with 3.18" [2]. [1] https://lore.kernel.org/r/3395161f-2543-46f0-83d9-b918800305e1@gmail.com [2] https://openwrt.org/docs/techref/targets/ar7 Suggested-by: Jonas Gorski Signed-off-by: Wolfram Sang Acked-by: Florian Fainelli --- Changes since v1: * added ack arch/mips/Kbuild.platforms | 1 - arch/mips/Kconfig | 22 - arch/mips/ar7/Makefile | 11 - arch/mips/ar7/Platform | 5 - arch/mips/ar7/clock.c | 439 -------------- arch/mips/ar7/gpio.c | 332 ----------- arch/mips/ar7/irq.c | 165 ------ arch/mips/ar7/memory.c | 51 -- arch/mips/ar7/platform.c | 722 ------------------------ arch/mips/ar7/prom.c | 256 --------- arch/mips/ar7/setup.c | 93 --- arch/mips/ar7/time.c | 31 - arch/mips/boot/compressed/uart-16550.c | 5 - arch/mips/configs/ar7_defconfig | 119 ---- arch/mips/include/asm/mach-ar7/ar7.h | 191 ------- arch/mips/include/asm/mach-ar7/irq.h | 16 - arch/mips/include/asm/mach-ar7/prom.h | 12 - arch/mips/include/asm/mach-ar7/spaces.h | 22 - 18 files changed, 2493 deletions(-) delete mode 100644 arch/mips/ar7/Makefile delete mode 100644 arch/mips/ar7/Platform delete mode 100644 arch/mips/ar7/clock.c delete mode 100644 arch/mips/ar7/gpio.c delete mode 100644 arch/mips/ar7/irq.c delete mode 100644 arch/mips/ar7/memory.c delete mode 100644 arch/mips/ar7/platform.c delete mode 100644 arch/mips/ar7/prom.c delete mode 100644 arch/mips/ar7/setup.c delete mode 100644 arch/mips/ar7/time.c delete mode 100644 arch/mips/configs/ar7_defconfig delete mode 100644 arch/mips/include/asm/mach-ar7/ar7.h delete mode 100644 arch/mips/include/asm/mach-ar7/irq.h delete mode 100644 arch/mips/include/asm/mach-ar7/prom.h delete mode 100644 arch/mips/include/asm/mach-ar7/spaces.h diff --git a/arch/mips/Kbuild.platforms b/arch/mips/Kbuild.platforms index caad195ba5c1..a2311c4bce6a 100644 --- a/arch/mips/Kbuild.platforms +++ b/arch/mips/Kbuild.platforms @@ -2,7 +2,6 @@ # All platforms listed in alphabetic order platform-$(CONFIG_MIPS_ALCHEMY) += alchemy/ -platform-$(CONFIG_AR7) += ar7/ platform-$(CONFIG_ATH25) += ath25/ platform-$(CONFIG_ATH79) += ath79/ platform-$(CONFIG_BCM47XX) += bcm47xx/ diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index bc8421859006..76db82542519 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -202,28 +202,6 @@ config MIPS_ALCHEMY select SYS_SUPPORTS_ZBOOT select COMMON_CLK -config AR7 - bool "Texas Instruments AR7" - select BOOT_ELF32 - select COMMON_CLK - select DMA_NONCOHERENT - select CEVT_R4K - select CSRC_R4K - select IRQ_MIPS_CPU - select NO_EXCEPT_FILL - select SWAP_IO_SPACE - select SYS_HAS_CPU_MIPS32_R1 - select SYS_HAS_EARLY_PRINTK - select SYS_SUPPORTS_32BIT_KERNEL - select SYS_SUPPORTS_LITTLE_ENDIAN - select SYS_SUPPORTS_MIPS16 - select SYS_SUPPORTS_ZBOOT_UART16550 - select GPIOLIB - select VLYNQ - help - Support for the Texas Instruments AR7 System-on-a-Chip - family: TNETD7100, 7200 and 7300. - config ATH25 bool "Atheros AR231x/AR531x SoC support" select CEVT_R4K diff --git a/arch/mips/ar7/Makefile b/arch/mips/ar7/Makefile deleted file mode 100644 index cd51c6c6e686..000000000000 diff --git a/arch/mips/ar7/Platform b/arch/mips/ar7/Platform deleted file mode 100644 index a9257cc01c3c..000000000000 diff --git a/arch/mips/ar7/clock.c b/arch/mips/ar7/clock.c deleted file mode 100644 index c717acbc5506..000000000000 diff --git a/arch/mips/ar7/gpio.c b/arch/mips/ar7/gpio.c deleted file mode 100644 index 4ed833b9cc2f..000000000000 diff --git a/arch/mips/ar7/irq.c b/arch/mips/ar7/irq.c deleted file mode 100644 index f0a7942d393e..000000000000 diff --git a/arch/mips/ar7/memory.c b/arch/mips/ar7/memory.c deleted file mode 100644 index ce8024c1a54e..000000000000 diff --git a/arch/mips/ar7/platform.c b/arch/mips/ar7/platform.c deleted file mode 100644 index 215149a85d83..000000000000 diff --git a/arch/mips/ar7/prom.c b/arch/mips/ar7/prom.c deleted file mode 100644 index 5810d3993fc6..000000000000 diff --git a/arch/mips/ar7/setup.c b/arch/mips/ar7/setup.c deleted file mode 100644 index 352d5dbc777c..000000000000 diff --git a/arch/mips/ar7/time.c b/arch/mips/ar7/time.c deleted file mode 100644 index 72aa77d7087b..000000000000 diff --git a/arch/mips/boot/compressed/uart-16550.c b/arch/mips/boot/compressed/uart-16550.c index 96d28f211121..09dcd2c561d9 100644 --- a/arch/mips/boot/compressed/uart-16550.c +++ b/arch/mips/boot/compressed/uart-16550.c @@ -13,11 +13,6 @@ #define PORT(offset) (CKSEG1ADDR(UART_BASE) + (offset)) #endif -#ifdef CONFIG_AR7 -#include -#define PORT(offset) (CKSEG1ADDR(AR7_REGS_UART0) + (4 * offset)) -#endif - #ifdef CONFIG_MACH_INGENIC #define INGENIC_UART_BASE_ADDR (0x10030000 + 0x1000 * CONFIG_ZBOOT_INGENIC_UART) #define PORT(offset) (CKSEG1ADDR(INGENIC_UART_BASE_ADDR) + (4 * offset)) diff --git a/arch/mips/configs/ar7_defconfig b/arch/mips/configs/ar7_defconfig deleted file mode 100644 index 329c60aa570a..000000000000 diff --git a/arch/mips/include/asm/mach-ar7/ar7.h b/arch/mips/include/asm/mach-ar7/ar7.h deleted file mode 100644 index 1e8621a6afa3..000000000000 diff --git a/arch/mips/include/asm/mach-ar7/irq.h b/arch/mips/include/asm/mach-ar7/irq.h deleted file mode 100644 index 46bb730ea970..000000000000 diff --git a/arch/mips/include/asm/mach-ar7/prom.h b/arch/mips/include/asm/mach-ar7/prom.h deleted file mode 100644 index 9e1d20b06f57..000000000000 diff --git a/arch/mips/include/asm/mach-ar7/spaces.h b/arch/mips/include/asm/mach-ar7/spaces.h deleted file mode 100644 index a004d94dfbdd..000000000000