From patchwork Wed Jan 20 12:48:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 12032217 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6C0CDC433E0 for ; Wed, 20 Jan 2021 12:50:14 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1FEBF23340 for ; Wed, 20 Jan 2021 12:50:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1FEBF23340 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=sbbxeQSnjWbg1RZO4tZAypwmytEjw9n4Mmd3A7TuCqc=; b=Q9pp4AzQ68sTB2o4B1b3DI89S NTK5gIwSowzzP/k5P/XlA+PivIj7MNq9LJmtAsD60ocwUyDvfcasNzbw62datbdVfrhF58IF4KnEL KyZytV7PiB7M4Y3b/RBA4FxZ/t4GaIKBrK3YuS4JJgXDoquWEaMCdOrMv+2TkFlmHZekDq7fJmBb3 MoyYw1uW1chtuhMdM8BCfbtb4M76eQb18LfxmeexGAKcs7E9Kz7qOiedNnf3J8Iea2vmrcicvVfkB dwPSXzuYOshk8j/vcsf8xonJCVGno7l3lp6dOdKXxDhtak5WLkKNevG95BBLjcl4Jp8O315hpjGT9 cWNU0Sleg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l2Cud-0002Aw-HB; Wed, 20 Jan 2021 12:48:39 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l2CuZ-0002A7-8b for linux-arm-kernel@lists.infradead.org; Wed, 20 Jan 2021 12:48:37 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id BFFA223359; Wed, 20 Jan 2021 12:48:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1611146914; bh=MZeAhQfFaf4CD1zpd2poTvI1ZzBOMTH/g48ULLCsDFc=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=IEYlHC2x6XiJY/ESDwFVnOHQLGVs/Daxu+JqeBpBpQTBsbPi+1QiN3Ec9sP5TyB6t oopJXzUKr0Ps7py8fJesFJktZZUMZikfIdkUu4PaFJHOM+OfU93+aCe7WRdbvvYZJ8 1jxYMTT9bqGO5Kx3xwqeej0EQaGJUyHzPURg8BhyHDb7Ls8LYB1UWo8N+0ZDMnpYbK k/mgYSy7yWs92CjGk0x0tEjr4uLqJrahjRkyILd2WPTuVdv2daSSkaaYAtBddBgbuH OawXbYnM45/QOdwuRJA6a8qBdzi3/6ro8MbckTCWr4+kJfCt3BSxmKkKH+swC+acRo Yqb15jd/A2Omg== From: Arnd Bergmann List-Id: To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, soc@kernel.org Subject: [PATCH 1/5] c6x: remove architecture Date: Wed, 20 Jan 2021 13:48:08 +0100 Message-Id: <20210120124812.2800027-2-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210120124812.2800027-1-arnd@kernel.org> References: <20210120124812.2800027-1-arnd@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210120_074835_448398_409A720A X-CRM114-Status: GOOD ( 16.41 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Aurelien Jacquiot , linux-c6x-dev@linux-c6x.org, Arnd Bergmann , Mark Salter Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann The c6x architecture was added to the kernel in 2011 at a time when running Linux on DSPs was widely seen as the logical evolution. It appears the trend has gone back to running Linux on Arm based SoCs with DSP, using a better supported software ecosystem, and having better real-time behavior for the DSP code. An example of this is TI's own Keystone2 platform. The upstream kernel port appears to no longer have any users. Mark Salter remained avaialable to review patches, but mentioned that he no longer has access to working hardware himself. Without any users, it's best to just remove the code completely to reduce the work for cross-architecture code changes. Many thanks to Mark for maintaining the code for the past ten years. Link: https://lore.kernel.org/lkml/41dc7795afda9f776d8cd0d3075f776cf586e97c.camel@redhat.com/ Cc: Mark Salter Cc: Aurelien Jacquiot Cc: linux-c6x-dev@linux-c6x.org Signed-off-by: Arnd Bergmann Acked-by: Mark Salter --- .../devicetree/bindings/c6x/clocks.txt | 40 - .../devicetree/bindings/c6x/dscr.txt | 127 --- .../devicetree/bindings/c6x/emifa.txt | 62 -- Documentation/devicetree/bindings/c6x/soc.txt | 28 - .../ti,c64x+megamod-pic.txt | 103 --- .../bindings/timer/ti,c64x+timer64.txt | 25 - MAINTAINERS | 8 - arch/c6x/Kconfig | 113 --- arch/c6x/Kconfig.debug | 10 - arch/c6x/Makefile | 60 -- arch/c6x/boot/Makefile | 11 - arch/c6x/boot/dts/Makefile | 16 - arch/c6x/boot/dts/dsk6455.dts | 57 -- arch/c6x/boot/dts/evmc6457.dts | 43 - arch/c6x/boot/dts/evmc6472.dts | 68 -- arch/c6x/boot/dts/evmc6474.dts | 53 -- arch/c6x/boot/dts/evmc6678.dts | 78 -- arch/c6x/boot/dts/tms320c6455.dtsi | 97 --- arch/c6x/boot/dts/tms320c6457.dtsi | 69 -- arch/c6x/boot/dts/tms320c6472.dtsi | 135 ---- arch/c6x/boot/dts/tms320c6474.dtsi | 90 --- arch/c6x/boot/dts/tms320c6678.dtsi | 147 ---- arch/c6x/configs/dsk6455_defconfig | 42 - arch/c6x/configs/evmc6457_defconfig | 39 - arch/c6x/configs/evmc6472_defconfig | 40 - arch/c6x/configs/evmc6474_defconfig | 40 - arch/c6x/configs/evmc6678_defconfig | 40 - arch/c6x/include/asm/Kbuild | 5 - arch/c6x/include/asm/asm-offsets.h | 1 - arch/c6x/include/asm/bitops.h | 95 --- arch/c6x/include/asm/bug.h | 20 - arch/c6x/include/asm/cache.h | 94 --- arch/c6x/include/asm/cacheflush.h | 45 -- arch/c6x/include/asm/checksum.h | 34 - arch/c6x/include/asm/clock.h | 145 ---- arch/c6x/include/asm/cmpxchg.h | 63 -- arch/c6x/include/asm/delay.h | 64 -- arch/c6x/include/asm/dscr.h | 30 - arch/c6x/include/asm/elf.h | 117 --- arch/c6x/include/asm/flat.h | 19 - arch/c6x/include/asm/ftrace.h | 6 - arch/c6x/include/asm/hardirq.h | 17 - arch/c6x/include/asm/irq.h | 50 -- arch/c6x/include/asm/irqflags.h | 68 -- arch/c6x/include/asm/linkage.h | 31 - arch/c6x/include/asm/megamod-pic.h | 10 - arch/c6x/include/asm/mmu_context.h | 6 - arch/c6x/include/asm/module.h | 20 - arch/c6x/include/asm/page.h | 9 - arch/c6x/include/asm/pgtable.h | 66 -- arch/c6x/include/asm/processor.h | 114 --- arch/c6x/include/asm/procinfo.h | 24 - arch/c6x/include/asm/ptrace.h | 32 - arch/c6x/include/asm/sections.h | 12 - arch/c6x/include/asm/setup.h | 31 - arch/c6x/include/asm/soc.h | 35 - arch/c6x/include/asm/special_insns.h | 60 -- arch/c6x/include/asm/string.h | 18 - arch/c6x/include/asm/switch_to.h | 30 - arch/c6x/include/asm/syscall.h | 75 -- arch/c6x/include/asm/syscalls.h | 46 -- arch/c6x/include/asm/thread_info.h | 94 --- arch/c6x/include/asm/timer64.h | 7 - arch/c6x/include/asm/timex.h | 30 - arch/c6x/include/asm/tlb.h | 7 - arch/c6x/include/asm/traps.h | 33 - arch/c6x/include/asm/uaccess.h | 97 --- arch/c6x/include/asm/unaligned.h | 104 --- arch/c6x/include/asm/vmalloc.h | 4 - arch/c6x/include/uapi/asm/Kbuild | 2 - arch/c6x/include/uapi/asm/byteorder.h | 13 - arch/c6x/include/uapi/asm/ptrace.h | 164 ---- arch/c6x/include/uapi/asm/setup.h | 7 - arch/c6x/include/uapi/asm/sigcontext.h | 81 -- arch/c6x/include/uapi/asm/swab.h | 55 -- arch/c6x/include/uapi/asm/unistd.h | 29 - arch/c6x/kernel/Makefile | 13 - arch/c6x/kernel/asm-offsets.c | 123 --- arch/c6x/kernel/c6x_ksyms.c | 62 -- arch/c6x/kernel/devicetree.c | 14 - arch/c6x/kernel/entry.S | 736 ------------------ arch/c6x/kernel/head.S | 81 -- arch/c6x/kernel/irq.c | 127 --- arch/c6x/kernel/module.c | 119 --- arch/c6x/kernel/process.c | 151 ---- arch/c6x/kernel/ptrace.c | 139 ---- arch/c6x/kernel/setup.c | 476 ----------- arch/c6x/kernel/signal.c | 322 -------- arch/c6x/kernel/soc.c | 87 --- arch/c6x/kernel/switch_to.S | 71 -- arch/c6x/kernel/sys_c6x.c | 71 -- arch/c6x/kernel/time.c | 63 -- arch/c6x/kernel/traps.c | 409 ---------- arch/c6x/kernel/vectors.S | 78 -- arch/c6x/kernel/vmlinux.lds.S | 151 ---- arch/c6x/lib/Makefile | 8 - arch/c6x/lib/checksum.c | 11 - arch/c6x/lib/csum_64plus.S | 414 ---------- arch/c6x/lib/divi.S | 41 - arch/c6x/lib/divremi.S | 34 - arch/c6x/lib/divremu.S | 75 -- arch/c6x/lib/divu.S | 86 -- arch/c6x/lib/llshl.S | 25 - arch/c6x/lib/llshr.S | 26 - arch/c6x/lib/llshru.S | 26 - arch/c6x/lib/memcpy_64plus.S | 43 - arch/c6x/lib/mpyll.S | 37 - arch/c6x/lib/negll.S | 19 - arch/c6x/lib/pop_rts.S | 20 - arch/c6x/lib/push_rts.S | 19 - arch/c6x/lib/remi.S | 52 -- arch/c6x/lib/remu.S | 70 -- arch/c6x/lib/strasgi.S | 77 -- arch/c6x/lib/strasgi_64plus.S | 27 - arch/c6x/mm/Makefile | 6 - arch/c6x/mm/dma-coherent.c | 173 ---- arch/c6x/mm/init.c | 65 -- arch/c6x/platforms/Kconfig | 21 - arch/c6x/platforms/Makefile | 13 - arch/c6x/platforms/cache.c | 444 ----------- arch/c6x/platforms/dscr.c | 595 -------------- arch/c6x/platforms/emif.c | 84 -- arch/c6x/platforms/megamod-pic.c | 344 -------- arch/c6x/platforms/pll.c | 440 ----------- arch/c6x/platforms/plldata.c | 467 ----------- arch/c6x/platforms/timer64.c | 241 ------ drivers/bus/Kconfig | 2 +- fs/Kconfig.binfmt | 2 +- include/asm-generic/page.h | 4 - 129 files changed, 2 insertions(+), 11162 deletions(-) delete mode 100644 Documentation/devicetree/bindings/c6x/clocks.txt delete mode 100644 Documentation/devicetree/bindings/c6x/dscr.txt delete mode 100644 Documentation/devicetree/bindings/c6x/emifa.txt delete mode 100644 Documentation/devicetree/bindings/c6x/soc.txt delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,c64x+megamod-pic.txt delete mode 100644 Documentation/devicetree/bindings/timer/ti,c64x+timer64.txt delete mode 100644 arch/c6x/Kconfig delete mode 100644 arch/c6x/Kconfig.debug delete mode 100644 arch/c6x/Makefile delete mode 100644 arch/c6x/boot/Makefile delete mode 100644 arch/c6x/boot/dts/Makefile delete mode 100644 arch/c6x/boot/dts/dsk6455.dts delete mode 100644 arch/c6x/boot/dts/evmc6457.dts delete mode 100644 arch/c6x/boot/dts/evmc6472.dts delete mode 100644 arch/c6x/boot/dts/evmc6474.dts delete mode 100644 arch/c6x/boot/dts/evmc6678.dts delete mode 100644 arch/c6x/boot/dts/tms320c6455.dtsi delete mode 100644 arch/c6x/boot/dts/tms320c6457.dtsi delete mode 100644 arch/c6x/boot/dts/tms320c6472.dtsi delete mode 100644 arch/c6x/boot/dts/tms320c6474.dtsi delete mode 100644 arch/c6x/boot/dts/tms320c6678.dtsi delete mode 100644 arch/c6x/configs/dsk6455_defconfig delete mode 100644 arch/c6x/configs/evmc6457_defconfig delete mode 100644 arch/c6x/configs/evmc6472_defconfig delete mode 100644 arch/c6x/configs/evmc6474_defconfig delete mode 100644 arch/c6x/configs/evmc6678_defconfig delete mode 100644 arch/c6x/include/asm/Kbuild delete mode 100644 arch/c6x/include/asm/asm-offsets.h delete mode 100644 arch/c6x/include/asm/bitops.h delete mode 100644 arch/c6x/include/asm/bug.h delete mode 100644 arch/c6x/include/asm/cache.h delete mode 100644 arch/c6x/include/asm/cacheflush.h delete mode 100644 arch/c6x/include/asm/checksum.h delete mode 100644 arch/c6x/include/asm/clock.h delete mode 100644 arch/c6x/include/asm/cmpxchg.h delete mode 100644 arch/c6x/include/asm/delay.h delete mode 100644 arch/c6x/include/asm/dscr.h delete mode 100644 arch/c6x/include/asm/elf.h delete mode 100644 arch/c6x/include/asm/flat.h delete mode 100644 arch/c6x/include/asm/ftrace.h delete mode 100644 arch/c6x/include/asm/hardirq.h delete mode 100644 arch/c6x/include/asm/irq.h delete mode 100644 arch/c6x/include/asm/irqflags.h delete mode 100644 arch/c6x/include/asm/linkage.h delete mode 100644 arch/c6x/include/asm/megamod-pic.h delete mode 100644 arch/c6x/include/asm/mmu_context.h delete mode 100644 arch/c6x/include/asm/module.h delete mode 100644 arch/c6x/include/asm/page.h delete mode 100644 arch/c6x/include/asm/pgtable.h delete mode 100644 arch/c6x/include/asm/processor.h delete mode 100644 arch/c6x/include/asm/procinfo.h delete mode 100644 arch/c6x/include/asm/ptrace.h delete mode 100644 arch/c6x/include/asm/sections.h delete mode 100644 arch/c6x/include/asm/setup.h delete mode 100644 arch/c6x/include/asm/soc.h delete mode 100644 arch/c6x/include/asm/special_insns.h delete mode 100644 arch/c6x/include/asm/string.h delete mode 100644 arch/c6x/include/asm/switch_to.h delete mode 100644 arch/c6x/include/asm/syscall.h delete mode 100644 arch/c6x/include/asm/syscalls.h delete mode 100644 arch/c6x/include/asm/thread_info.h delete mode 100644 arch/c6x/include/asm/timer64.h delete mode 100644 arch/c6x/include/asm/timex.h delete mode 100644 arch/c6x/include/asm/tlb.h delete mode 100644 arch/c6x/include/asm/traps.h delete mode 100644 arch/c6x/include/asm/uaccess.h delete mode 100644 arch/c6x/include/asm/unaligned.h delete mode 100644 arch/c6x/include/asm/vmalloc.h delete mode 100644 arch/c6x/include/uapi/asm/Kbuild delete mode 100644 arch/c6x/include/uapi/asm/byteorder.h delete mode 100644 arch/c6x/include/uapi/asm/ptrace.h delete mode 100644 arch/c6x/include/uapi/asm/setup.h delete mode 100644 arch/c6x/include/uapi/asm/sigcontext.h delete mode 100644 arch/c6x/include/uapi/asm/swab.h delete mode 100644 arch/c6x/include/uapi/asm/unistd.h delete mode 100644 arch/c6x/kernel/Makefile delete mode 100644 arch/c6x/kernel/asm-offsets.c delete mode 100644 arch/c6x/kernel/c6x_ksyms.c delete mode 100644 arch/c6x/kernel/devicetree.c delete mode 100644 arch/c6x/kernel/entry.S delete mode 100644 arch/c6x/kernel/head.S delete mode 100644 arch/c6x/kernel/irq.c delete mode 100644 arch/c6x/kernel/module.c delete mode 100644 arch/c6x/kernel/process.c delete mode 100644 arch/c6x/kernel/ptrace.c delete mode 100644 arch/c6x/kernel/setup.c delete mode 100644 arch/c6x/kernel/signal.c delete mode 100644 arch/c6x/kernel/soc.c delete mode 100644 arch/c6x/kernel/switch_to.S delete mode 100644 arch/c6x/kernel/sys_c6x.c delete mode 100644 arch/c6x/kernel/time.c delete mode 100644 arch/c6x/kernel/traps.c delete mode 100644 arch/c6x/kernel/vectors.S delete mode 100644 arch/c6x/kernel/vmlinux.lds.S delete mode 100644 arch/c6x/lib/Makefile delete mode 100644 arch/c6x/lib/checksum.c delete mode 100644 arch/c6x/lib/csum_64plus.S delete mode 100644 arch/c6x/lib/divi.S delete mode 100644 arch/c6x/lib/divremi.S delete mode 100644 arch/c6x/lib/divremu.S delete mode 100644 arch/c6x/lib/divu.S delete mode 100644 arch/c6x/lib/llshl.S delete mode 100644 arch/c6x/lib/llshr.S delete mode 100644 arch/c6x/lib/llshru.S delete mode 100644 arch/c6x/lib/memcpy_64plus.S delete mode 100644 arch/c6x/lib/mpyll.S delete mode 100644 arch/c6x/lib/negll.S delete mode 100644 arch/c6x/lib/pop_rts.S delete mode 100644 arch/c6x/lib/push_rts.S delete mode 100644 arch/c6x/lib/remi.S delete mode 100644 arch/c6x/lib/remu.S delete mode 100644 arch/c6x/lib/strasgi.S delete mode 100644 arch/c6x/lib/strasgi_64plus.S delete mode 100644 arch/c6x/mm/Makefile delete mode 100644 arch/c6x/mm/dma-coherent.c delete mode 100644 arch/c6x/mm/init.c delete mode 100644 arch/c6x/platforms/Kconfig delete mode 100644 arch/c6x/platforms/Makefile delete mode 100644 arch/c6x/platforms/cache.c delete mode 100644 arch/c6x/platforms/dscr.c delete mode 100644 arch/c6x/platforms/emif.c delete mode 100644 arch/c6x/platforms/megamod-pic.c delete mode 100644 arch/c6x/platforms/pll.c delete mode 100644 arch/c6x/platforms/plldata.c delete mode 100644 arch/c6x/platforms/timer64.c diff --git a/Documentation/devicetree/bindings/c6x/clocks.txt b/Documentation/devicetree/bindings/c6x/clocks.txt deleted file mode 100644 index a04f5fd30122..000000000000 diff --git a/Documentation/devicetree/bindings/c6x/dscr.txt b/Documentation/devicetree/bindings/c6x/dscr.txt deleted file mode 100644 index 92672235de57..000000000000 diff --git a/Documentation/devicetree/bindings/c6x/emifa.txt b/Documentation/devicetree/bindings/c6x/emifa.txt deleted file mode 100644 index 0ff6e9b9a13f..000000000000 diff --git a/Documentation/devicetree/bindings/c6x/soc.txt b/Documentation/devicetree/bindings/c6x/soc.txt deleted file mode 100644 index b1e4973b5769..000000000000 diff --git a/Documentation/devicetree/bindings/interrupt-controller/ti,c64x+megamod-pic.txt b/Documentation/devicetree/bindings/interrupt-controller/ti,c64x+megamod-pic.txt deleted file mode 100644 index ee3f9c351501..000000000000 diff --git a/Documentation/devicetree/bindings/timer/ti,c64x+timer64.txt b/Documentation/devicetree/bindings/timer/ti,c64x+timer64.txt deleted file mode 100644 index d96c1e283e73..000000000000 diff --git a/MAINTAINERS b/MAINTAINERS index fb971f5f6f0c..7c3eadb185f9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3837,14 +3837,6 @@ F: drivers/irqchip/irq-csky-* N: csky K: csky -C6X ARCHITECTURE -M: Mark Salter -M: Aurelien Jacquiot -L: linux-c6x-dev@linux-c6x.org -S: Maintained -W: http://www.linux-c6x.org/wiki/index.php/Main_Page -F: arch/c6x/ - CA8210 IEEE-802.15.4 RADIO DRIVER M: Harry Morris L: linux-wpan@vger.kernel.org diff --git a/arch/c6x/Kconfig b/arch/c6x/Kconfig deleted file mode 100644 index bdeeac28b1be..000000000000 diff --git a/arch/c6x/Kconfig.debug b/arch/c6x/Kconfig.debug deleted file mode 100644 index c299e0d8eca3..000000000000 diff --git a/arch/c6x/Makefile b/arch/c6x/Makefile deleted file mode 100644 index b7aa854f7008..000000000000 diff --git a/arch/c6x/boot/Makefile b/arch/c6x/boot/Makefile deleted file mode 100644 index 842b7b0bfe80..000000000000 diff --git a/arch/c6x/boot/dts/Makefile b/arch/c6x/boot/dts/Makefile deleted file mode 100644 index f438285c3640..000000000000 diff --git a/arch/c6x/boot/dts/dsk6455.dts b/arch/c6x/boot/dts/dsk6455.dts deleted file mode 100644 index fa904f2916b5..000000000000 diff --git a/arch/c6x/boot/dts/evmc6457.dts b/arch/c6x/boot/dts/evmc6457.dts deleted file mode 100644 index 73e1d43b51ce..000000000000 diff --git a/arch/c6x/boot/dts/evmc6472.dts b/arch/c6x/boot/dts/evmc6472.dts deleted file mode 100644 index 4878b78919fa..000000000000 diff --git a/arch/c6x/boot/dts/evmc6474.dts b/arch/c6x/boot/dts/evmc6474.dts deleted file mode 100644 index d10746453217..000000000000 diff --git a/arch/c6x/boot/dts/evmc6678.dts b/arch/c6x/boot/dts/evmc6678.dts deleted file mode 100644 index 5e6c0961e7b2..000000000000 diff --git a/arch/c6x/boot/dts/tms320c6455.dtsi b/arch/c6x/boot/dts/tms320c6455.dtsi deleted file mode 100644 index 0b21cb30343b..000000000000 diff --git a/arch/c6x/boot/dts/tms320c6457.dtsi b/arch/c6x/boot/dts/tms320c6457.dtsi deleted file mode 100644 index e49f7ae19124..000000000000 diff --git a/arch/c6x/boot/dts/tms320c6472.dtsi b/arch/c6x/boot/dts/tms320c6472.dtsi deleted file mode 100644 index 9dd4b04e78ef..000000000000 diff --git a/arch/c6x/boot/dts/tms320c6474.dtsi b/arch/c6x/boot/dts/tms320c6474.dtsi deleted file mode 100644 index 0ef5333629a6..000000000000 diff --git a/arch/c6x/boot/dts/tms320c6678.dtsi b/arch/c6x/boot/dts/tms320c6678.dtsi deleted file mode 100644 index da1e3f2bf062..000000000000 diff --git a/arch/c6x/configs/dsk6455_defconfig b/arch/c6x/configs/dsk6455_defconfig deleted file mode 100644 index d764ea4cce7f..000000000000 diff --git a/arch/c6x/configs/evmc6457_defconfig b/arch/c6x/configs/evmc6457_defconfig deleted file mode 100644 index 05d0b4a25ab1..000000000000 diff --git a/arch/c6x/configs/evmc6472_defconfig b/arch/c6x/configs/evmc6472_defconfig deleted file mode 100644 index 8d81fcf86b0e..000000000000 diff --git a/arch/c6x/configs/evmc6474_defconfig b/arch/c6x/configs/evmc6474_defconfig deleted file mode 100644 index 8156a98f3958..000000000000 diff --git a/arch/c6x/configs/evmc6678_defconfig b/arch/c6x/configs/evmc6678_defconfig deleted file mode 100644 index c4f433c25b69..000000000000 diff --git a/arch/c6x/include/asm/Kbuild b/arch/c6x/include/asm/Kbuild deleted file mode 100644 index a4ef93a1f7ae..000000000000 diff --git a/arch/c6x/include/asm/asm-offsets.h b/arch/c6x/include/asm/asm-offsets.h deleted file mode 100644 index d370ee36a182..000000000000 diff --git a/arch/c6x/include/asm/bitops.h b/arch/c6x/include/asm/bitops.h deleted file mode 100644 index 50e618f38a11..000000000000 diff --git a/arch/c6x/include/asm/bug.h b/arch/c6x/include/asm/bug.h deleted file mode 100644 index 1a68676256ee..000000000000 diff --git a/arch/c6x/include/asm/cache.h b/arch/c6x/include/asm/cache.h deleted file mode 100644 index 0fa8bf77c954..000000000000 diff --git a/arch/c6x/include/asm/cacheflush.h b/arch/c6x/include/asm/cacheflush.h deleted file mode 100644 index 10922d528de6..000000000000 diff --git a/arch/c6x/include/asm/checksum.h b/arch/c6x/include/asm/checksum.h deleted file mode 100644 index 934918def632..000000000000 diff --git a/arch/c6x/include/asm/clock.h b/arch/c6x/include/asm/clock.h deleted file mode 100644 index 7b6c42a52ec9..000000000000 diff --git a/arch/c6x/include/asm/cmpxchg.h b/arch/c6x/include/asm/cmpxchg.h deleted file mode 100644 index 6eed628a9e7f..000000000000 diff --git a/arch/c6x/include/asm/delay.h b/arch/c6x/include/asm/delay.h deleted file mode 100644 index 455fc713ae54..000000000000 diff --git a/arch/c6x/include/asm/dscr.h b/arch/c6x/include/asm/dscr.h deleted file mode 100644 index f6b095c3d3f5..000000000000 diff --git a/arch/c6x/include/asm/elf.h b/arch/c6x/include/asm/elf.h deleted file mode 100644 index ca88acbf560b..000000000000 diff --git a/arch/c6x/include/asm/flat.h b/arch/c6x/include/asm/flat.h deleted file mode 100644 index 9e6544b51386..000000000000 diff --git a/arch/c6x/include/asm/ftrace.h b/arch/c6x/include/asm/ftrace.h deleted file mode 100644 index 3701958d3d1c..000000000000 diff --git a/arch/c6x/include/asm/hardirq.h b/arch/c6x/include/asm/hardirq.h deleted file mode 100644 index f37d07d31040..000000000000 diff --git a/arch/c6x/include/asm/irq.h b/arch/c6x/include/asm/irq.h deleted file mode 100644 index 9da4d1afd0d7..000000000000 diff --git a/arch/c6x/include/asm/irqflags.h b/arch/c6x/include/asm/irqflags.h deleted file mode 100644 index d6cd71c02629..000000000000 diff --git a/arch/c6x/include/asm/linkage.h b/arch/c6x/include/asm/linkage.h deleted file mode 100644 index 1ad615da6479..000000000000 diff --git a/arch/c6x/include/asm/megamod-pic.h b/arch/c6x/include/asm/megamod-pic.h deleted file mode 100644 index a0a6d596bf9b..000000000000 diff --git a/arch/c6x/include/asm/mmu_context.h b/arch/c6x/include/asm/mmu_context.h deleted file mode 100644 index d2659d0a3297..000000000000 diff --git a/arch/c6x/include/asm/module.h b/arch/c6x/include/asm/module.h deleted file mode 100644 index 9fc9f4a8ecc2..000000000000 diff --git a/arch/c6x/include/asm/page.h b/arch/c6x/include/asm/page.h deleted file mode 100644 index 40079899084d..000000000000 diff --git a/arch/c6x/include/asm/pgtable.h b/arch/c6x/include/asm/pgtable.h deleted file mode 100644 index 8a91ceda39fa..000000000000 diff --git a/arch/c6x/include/asm/processor.h b/arch/c6x/include/asm/processor.h deleted file mode 100644 index 1456f5e11de3..000000000000 diff --git a/arch/c6x/include/asm/procinfo.h b/arch/c6x/include/asm/procinfo.h deleted file mode 100644 index aaa3cb902c43..000000000000 diff --git a/arch/c6x/include/asm/ptrace.h b/arch/c6x/include/asm/ptrace.h deleted file mode 100644 index 7cbae382cf37..000000000000 diff --git a/arch/c6x/include/asm/sections.h b/arch/c6x/include/asm/sections.h deleted file mode 100644 index dc2f15eb3bde..000000000000 diff --git a/arch/c6x/include/asm/setup.h b/arch/c6x/include/asm/setup.h deleted file mode 100644 index 5496bccecaa0..000000000000 diff --git a/arch/c6x/include/asm/soc.h b/arch/c6x/include/asm/soc.h deleted file mode 100644 index 43f50159e59b..000000000000 diff --git a/arch/c6x/include/asm/special_insns.h b/arch/c6x/include/asm/special_insns.h deleted file mode 100644 index d233160aefd4..000000000000 diff --git a/arch/c6x/include/asm/string.h b/arch/c6x/include/asm/string.h deleted file mode 100644 index b290ead40f68..000000000000 diff --git a/arch/c6x/include/asm/switch_to.h b/arch/c6x/include/asm/switch_to.h deleted file mode 100644 index 36c5332fadae..000000000000 diff --git a/arch/c6x/include/asm/syscall.h b/arch/c6x/include/asm/syscall.h deleted file mode 100644 index 38f3e2284ecd..000000000000 diff --git a/arch/c6x/include/asm/syscalls.h b/arch/c6x/include/asm/syscalls.h deleted file mode 100644 index df3d05feb153..000000000000 diff --git a/arch/c6x/include/asm/thread_info.h b/arch/c6x/include/asm/thread_info.h deleted file mode 100644 index dd8913d57189..000000000000 diff --git a/arch/c6x/include/asm/timer64.h b/arch/c6x/include/asm/timer64.h deleted file mode 100644 index b850dfef1f79..000000000000 diff --git a/arch/c6x/include/asm/timex.h b/arch/c6x/include/asm/timex.h deleted file mode 100644 index f946ce297e13..000000000000 diff --git a/arch/c6x/include/asm/tlb.h b/arch/c6x/include/asm/tlb.h deleted file mode 100644 index 240ba0febb57..000000000000 diff --git a/arch/c6x/include/asm/traps.h b/arch/c6x/include/asm/traps.h deleted file mode 100644 index 7e1d31c47680..000000000000 diff --git a/arch/c6x/include/asm/uaccess.h b/arch/c6x/include/asm/uaccess.h deleted file mode 100644 index 585adf9201b7..000000000000 diff --git a/arch/c6x/include/asm/unaligned.h b/arch/c6x/include/asm/unaligned.h deleted file mode 100644 index d628cc170564..000000000000 diff --git a/arch/c6x/include/asm/vmalloc.h b/arch/c6x/include/asm/vmalloc.h deleted file mode 100644 index 26c6c6696bbd..000000000000 diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild deleted file mode 100644 index e78470141932..000000000000 diff --git a/arch/c6x/include/uapi/asm/byteorder.h b/arch/c6x/include/uapi/asm/byteorder.h deleted file mode 100644 index ab61f867391c..000000000000 diff --git a/arch/c6x/include/uapi/asm/ptrace.h b/arch/c6x/include/uapi/asm/ptrace.h deleted file mode 100644 index 9b51110a0842..000000000000 diff --git a/arch/c6x/include/uapi/asm/setup.h b/arch/c6x/include/uapi/asm/setup.h deleted file mode 100644 index e90548cebec3..000000000000 diff --git a/arch/c6x/include/uapi/asm/sigcontext.h b/arch/c6x/include/uapi/asm/sigcontext.h deleted file mode 100644 index 4e5a9a260861..000000000000 diff --git a/arch/c6x/include/uapi/asm/swab.h b/arch/c6x/include/uapi/asm/swab.h deleted file mode 100644 index c407c0497718..000000000000 diff --git a/arch/c6x/include/uapi/asm/unistd.h b/arch/c6x/include/uapi/asm/unistd.h deleted file mode 100644 index 79b724c39d9b..000000000000 diff --git a/arch/c6x/kernel/Makefile b/arch/c6x/kernel/Makefile deleted file mode 100644 index fbe74174de87..000000000000 diff --git a/arch/c6x/kernel/asm-offsets.c b/arch/c6x/kernel/asm-offsets.c deleted file mode 100644 index 4a264ef87dcb..000000000000 diff --git a/arch/c6x/kernel/c6x_ksyms.c b/arch/c6x/kernel/c6x_ksyms.c deleted file mode 100644 index 5a39f52f9db4..000000000000 diff --git a/arch/c6x/kernel/devicetree.c b/arch/c6x/kernel/devicetree.c deleted file mode 100644 index a0c73f0545b2..000000000000 diff --git a/arch/c6x/kernel/entry.S b/arch/c6x/kernel/entry.S deleted file mode 100644 index fb154d19625b..000000000000 diff --git a/arch/c6x/kernel/head.S b/arch/c6x/kernel/head.S deleted file mode 100644 index fecbeef827bc..000000000000 diff --git a/arch/c6x/kernel/irq.c b/arch/c6x/kernel/irq.c deleted file mode 100644 index e4c53d185b62..000000000000 diff --git a/arch/c6x/kernel/module.c b/arch/c6x/kernel/module.c deleted file mode 100644 index 09b4c6bfe877..000000000000 diff --git a/arch/c6x/kernel/process.c b/arch/c6x/kernel/process.c deleted file mode 100644 index 9f4fd6a40a10..000000000000 diff --git a/arch/c6x/kernel/ptrace.c b/arch/c6x/kernel/ptrace.c deleted file mode 100644 index 3cdaa8cf0ed6..000000000000 diff --git a/arch/c6x/kernel/setup.c b/arch/c6x/kernel/setup.c deleted file mode 100644 index 9254c3b794a5..000000000000 diff --git a/arch/c6x/kernel/signal.c b/arch/c6x/kernel/signal.c deleted file mode 100644 index 862460c3b183..000000000000 diff --git a/arch/c6x/kernel/soc.c b/arch/c6x/kernel/soc.c deleted file mode 100644 index 8362f9390e03..000000000000 diff --git a/arch/c6x/kernel/switch_to.S b/arch/c6x/kernel/switch_to.S deleted file mode 100644 index b7f9f607042e..000000000000 diff --git a/arch/c6x/kernel/sys_c6x.c b/arch/c6x/kernel/sys_c6x.c deleted file mode 100644 index 600277f057cf..000000000000 diff --git a/arch/c6x/kernel/time.c b/arch/c6x/kernel/time.c deleted file mode 100644 index f3ec91a87f4f..000000000000 diff --git a/arch/c6x/kernel/traps.c b/arch/c6x/kernel/traps.c deleted file mode 100644 index 2b9121c755be..000000000000 diff --git a/arch/c6x/kernel/vectors.S b/arch/c6x/kernel/vectors.S deleted file mode 100644 index ad3dc006a6d3..000000000000 diff --git a/arch/c6x/kernel/vmlinux.lds.S b/arch/c6x/kernel/vmlinux.lds.S deleted file mode 100644 index ac99ba0864bf..000000000000 diff --git a/arch/c6x/lib/Makefile b/arch/c6x/lib/Makefile deleted file mode 100644 index e182004f82fe..000000000000 diff --git a/arch/c6x/lib/checksum.c b/arch/c6x/lib/checksum.c deleted file mode 100644 index dff2e2ec6e64..000000000000 diff --git a/arch/c6x/lib/csum_64plus.S b/arch/c6x/lib/csum_64plus.S deleted file mode 100644 index 57148866d8d3..000000000000 diff --git a/arch/c6x/lib/divi.S b/arch/c6x/lib/divi.S deleted file mode 100644 index d1764ae0b519..000000000000 diff --git a/arch/c6x/lib/divremi.S b/arch/c6x/lib/divremi.S deleted file mode 100644 index 575fc57a8a76..000000000000 diff --git a/arch/c6x/lib/divremu.S b/arch/c6x/lib/divremu.S deleted file mode 100644 index 5f6a6a2997ae..000000000000 diff --git a/arch/c6x/lib/divu.S b/arch/c6x/lib/divu.S deleted file mode 100644 index f0f6082944c2..000000000000 diff --git a/arch/c6x/lib/llshl.S b/arch/c6x/lib/llshl.S deleted file mode 100644 index 3272499618e0..000000000000 diff --git a/arch/c6x/lib/llshr.S b/arch/c6x/lib/llshr.S deleted file mode 100644 index 6bfaacd15e73..000000000000 diff --git a/arch/c6x/lib/llshru.S b/arch/c6x/lib/llshru.S deleted file mode 100644 index 103128f50770..000000000000 diff --git a/arch/c6x/lib/memcpy_64plus.S b/arch/c6x/lib/memcpy_64plus.S deleted file mode 100644 index 157a30486bfd..000000000000 diff --git a/arch/c6x/lib/mpyll.S b/arch/c6x/lib/mpyll.S deleted file mode 100644 index d07c13ec4fd4..000000000000 diff --git a/arch/c6x/lib/negll.S b/arch/c6x/lib/negll.S deleted file mode 100644 index 9ba434db5366..000000000000 diff --git a/arch/c6x/lib/pop_rts.S b/arch/c6x/lib/pop_rts.S deleted file mode 100644 index f129e32943c5..000000000000 diff --git a/arch/c6x/lib/push_rts.S b/arch/c6x/lib/push_rts.S deleted file mode 100644 index 40b0a4fe937c..000000000000 diff --git a/arch/c6x/lib/remi.S b/arch/c6x/lib/remi.S deleted file mode 100644 index 96a1335eac20..000000000000 diff --git a/arch/c6x/lib/remu.S b/arch/c6x/lib/remu.S deleted file mode 100644 index 428feb9c06c0..000000000000 diff --git a/arch/c6x/lib/strasgi.S b/arch/c6x/lib/strasgi.S deleted file mode 100644 index 715aeb200792..000000000000 diff --git a/arch/c6x/lib/strasgi_64plus.S b/arch/c6x/lib/strasgi_64plus.S deleted file mode 100644 index d10aa2dc3249..000000000000 diff --git a/arch/c6x/mm/Makefile b/arch/c6x/mm/Makefile deleted file mode 100644 index 19d05e972dd1..000000000000 diff --git a/arch/c6x/mm/dma-coherent.c b/arch/c6x/mm/dma-coherent.c deleted file mode 100644 index 03df07a831fc..000000000000 diff --git a/arch/c6x/mm/init.c b/arch/c6x/mm/init.c deleted file mode 100644 index a97e51a3e26d..000000000000 diff --git a/arch/c6x/platforms/Kconfig b/arch/c6x/platforms/Kconfig deleted file mode 100644 index f3a9ae6e0e82..000000000000 diff --git a/arch/c6x/platforms/Makefile b/arch/c6x/platforms/Makefile deleted file mode 100644 index b320f1c68884..000000000000 diff --git a/arch/c6x/platforms/cache.c b/arch/c6x/platforms/cache.c deleted file mode 100644 index fff027b72513..000000000000 diff --git a/arch/c6x/platforms/dscr.c b/arch/c6x/platforms/dscr.c deleted file mode 100644 index 4571615b589f..000000000000 diff --git a/arch/c6x/platforms/emif.c b/arch/c6x/platforms/emif.c deleted file mode 100644 index 6142ecc2cd88..000000000000 diff --git a/arch/c6x/platforms/megamod-pic.c b/arch/c6x/platforms/megamod-pic.c deleted file mode 100644 index 56189e50728c..000000000000 diff --git a/arch/c6x/platforms/pll.c b/arch/c6x/platforms/pll.c deleted file mode 100644 index 6fdf20d64dc7..000000000000 diff --git a/arch/c6x/platforms/plldata.c b/arch/c6x/platforms/plldata.c deleted file mode 100644 index a799e04edefe..000000000000 diff --git a/arch/c6x/platforms/timer64.c b/arch/c6x/platforms/timer64.c deleted file mode 100644 index 661f4c7c6ef6..000000000000 diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig index 0c262c2aeaf2..e7f7eee6ee9a 100644 --- a/drivers/bus/Kconfig +++ b/drivers/bus/Kconfig @@ -80,7 +80,7 @@ config MOXTET config HISILICON_LPC bool "Support for ISA I/O space on HiSilicon Hip06/7" - depends on (ARM64 && ARCH_HISI) || (COMPILE_TEST && !ALPHA && !HEXAGON && !PARISC && !C6X) + depends on (ARM64 && ARCH_HISI) || (COMPILE_TEST && !ALPHA && !HEXAGON && !PARISC) depends on HAS_IOMEM select INDIRECT_PIO if ARM64 help diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt index 885da6d983b4..647439c2c05a 100644 --- a/fs/Kconfig.binfmt +++ b/fs/Kconfig.binfmt @@ -45,7 +45,7 @@ config ARCH_USE_GNU_PROPERTY config BINFMT_ELF_FDPIC bool "Kernel support for FDPIC ELF binaries" default y if !BINFMT_ELF - depends on (ARM || (SUPERH && !MMU) || C6X) + depends on (ARM || (SUPERH && !MMU)) select ELFCORE help ELF FDPIC binaries are based on ELF, but allow the individual load diff --git a/include/asm-generic/page.h b/include/asm-generic/page.h index fe801f01625e..6fc47561814c 100644 --- a/include/asm-generic/page.h +++ b/include/asm-generic/page.h @@ -63,11 +63,7 @@ extern unsigned long memory_end; #endif /* !__ASSEMBLY__ */ -#ifdef CONFIG_KERNEL_RAM_BASE_ADDRESS -#define PAGE_OFFSET (CONFIG_KERNEL_RAM_BASE_ADDRESS) -#else #define PAGE_OFFSET (0) -#endif #ifndef ARCH_PFN_OFFSET #define ARCH_PFN_OFFSET (PAGE_OFFSET >> PAGE_SHIFT) From patchwork Wed Jan 20 12:48:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 12032221 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-22.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 42710C433DB for ; Wed, 20 Jan 2021 12:50:20 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D602923340 for ; Wed, 20 Jan 2021 12:50:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D602923340 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=gVowmczNdY+isLAWND5Cek2W8GK78e5Y922FMon+1p4=; b=kyn5ub4V7KrnCzqIrBG7s+xvZ RqDNSz68GP/9KZiCdrfj7ZcMCqVys3thrvbD3Vg+x60PyokKgWB6Pt82qhcOoLEdwku3EkdoUaP90 H6N90NKiHSIQgKb/W+RhXf4XQ41A317sxe6XYtgB3iZLn9QroOve30A3SO4R5VA3vcume80Cv2UAh 49rLjOSH7n6NG1+/BSCIuWq7D9guTeTl+SsMkJM3g80g/OavF7mMNBsBgOFIQ3yJC3iroZrCRfzbD +YxvqUzRWhVxErs73SLqIFPv3oya+VMbFARq2/h0msSpDc45NVn1pXqHN8ZOR+5mR+5Dvnt5nQ098 G2cj+5f7A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l2Cuj-0002D1-W8; Wed, 20 Jan 2021 12:48:46 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l2Cuf-0002BW-K2 for linux-arm-kernel@lists.infradead.org; Wed, 20 Jan 2021 12:48:43 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id A1EFC2336D; Wed, 20 Jan 2021 12:48:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1611146920; bh=ClLWbeiD8d9T54L86cDfKFNCd1yqeq4mnSEVdHCmKL0=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=BvtUdvOIcQ28YH2Z6JGj620/DmVahnRIU+VBHoW20AnTUlZSI6Xzi+6knPxNv8fiS VwOWONNEO+iZ6+3RogV54XmmmbfvVYZQyIdUsGWbHpnCEGYk7LdYA9qvRwAFdKoOjZ 8yGSTzl8dMcp9uVgL2yogdYGzp+5+yx1Tkr9nsNVRRVse740n4BWufL8Op0oiE+rxN akzCXrgwFiQL2x+wbychIq3fV1hjBg5FeMNIFfGGiX/8fupSRmNkfu/b3AVNoNNmqj ve6sFPdc7u4gYlb+VW6fGiwuG+bar+4FZhKVtWkYGGTMCmv4bIg+a6B9m/+u1GObia EbIrQF1xpfiPA== From: Arnd Bergmann List-Id: To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, soc@kernel.org Subject: [PATCH 2/5] ARM: remove sirf prima2/atlas platforms Date: Wed, 20 Jan 2021 13:48:09 +0100 Message-Id: <20210120124812.2800027-3-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210120124812.2800027-1-arnd@kernel.org> References: <20210120124812.2800027-1-arnd@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210120_074841_830262_DA55A710 X-CRM114-Status: GOOD ( 19.12 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Barry Song , Arnd Bergmann Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann The SiRF Prima2 and Atlas platform code was contributed by Cambridge Silicon Radio (CSR) after aquiring the original SiRF company, and maintained by Barry Song. CSR was subsequently acquired by Qualcomm, who no longer have an interest in maintaining the SoC platform but instead have released more recent SoCs for the same market in the Snapdragon family. As Barry is no longer working for the company, nobody else there wants to maintain it, and there are no third-party users, the best way forward seems to be to completely remove it. Thanks to Barry for maintaining the platform for the past ten years. Cc: Barry Song Link: https://lore.kernel.org/lkml/c969392572604b98bcb3be44048c3165@hisilicon.com/ Signed-off-by: Arnd Bergmann --- .../devicetree/bindings/arm/sirf.yaml | 30 - .../devicetree/bindings/reset/sirf,rstc.txt | 42 - MAINTAINERS | 13 - arch/arm/Kconfig | 2 - arch/arm/Kconfig.debug | 41 +- arch/arm/Makefile | 1 - arch/arm/boot/dts/Makefile | 6 - arch/arm/boot/dts/atlas6-evb.dts | 78 - arch/arm/boot/dts/atlas6.dtsi | 800 ------- arch/arm/boot/dts/atlas7-evb.dts | 127 -- arch/arm/boot/dts/atlas7.dtsi | 1955 ----------------- arch/arm/boot/dts/prima2-evb.dts | 37 - arch/arm/boot/dts/prima2.dtsi | 838 ------- arch/arm/configs/prima2_defconfig | 72 - arch/arm/include/debug/sirf.S | 40 - arch/arm/mach-prima2/Kconfig | 48 - arch/arm/mach-prima2/Makefile | 9 - arch/arm/mach-prima2/common.c | 64 - arch/arm/mach-prima2/common.h | 32 - arch/arm/mach-prima2/headsmp.S | 36 - arch/arm/mach-prima2/hotplug.c | 38 - arch/arm/mach-prima2/platsmp.c | 123 -- arch/arm/mach-prima2/pm.c | 153 -- arch/arm/mach-prima2/pm.h | 28 - arch/arm/mach-prima2/rstc.c | 107 - arch/arm/mach-prima2/rtciobrg.c | 179 -- arch/arm/mach-prima2/sleep.S | 63 - 27 files changed, 2 insertions(+), 4960 deletions(-) delete mode 100644 Documentation/devicetree/bindings/arm/sirf.yaml delete mode 100644 Documentation/devicetree/bindings/reset/sirf,rstc.txt delete mode 100644 arch/arm/boot/dts/atlas6-evb.dts delete mode 100644 arch/arm/boot/dts/atlas6.dtsi delete mode 100644 arch/arm/boot/dts/atlas7-evb.dts delete mode 100644 arch/arm/boot/dts/atlas7.dtsi delete mode 100644 arch/arm/boot/dts/prima2-evb.dts delete mode 100644 arch/arm/boot/dts/prima2.dtsi delete mode 100644 arch/arm/configs/prima2_defconfig delete mode 100644 arch/arm/include/debug/sirf.S delete mode 100644 arch/arm/mach-prima2/Kconfig delete mode 100644 arch/arm/mach-prima2/Makefile delete mode 100644 arch/arm/mach-prima2/common.c delete mode 100644 arch/arm/mach-prima2/common.h delete mode 100644 arch/arm/mach-prima2/headsmp.S delete mode 100644 arch/arm/mach-prima2/hotplug.c delete mode 100644 arch/arm/mach-prima2/platsmp.c delete mode 100644 arch/arm/mach-prima2/pm.c delete mode 100644 arch/arm/mach-prima2/pm.h delete mode 100644 arch/arm/mach-prima2/rstc.c delete mode 100644 arch/arm/mach-prima2/rtciobrg.c delete mode 100644 arch/arm/mach-prima2/sleep.S diff --git a/Documentation/devicetree/bindings/arm/sirf.yaml b/Documentation/devicetree/bindings/arm/sirf.yaml deleted file mode 100644 index b25eb35d1b66..000000000000 diff --git a/Documentation/devicetree/bindings/reset/sirf,rstc.txt b/Documentation/devicetree/bindings/reset/sirf,rstc.txt deleted file mode 100644 index 0505de742d30..000000000000 diff --git a/MAINTAINERS b/MAINTAINERS index 7c3eadb185f9..aeef69cbc7ec 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1779,19 +1779,6 @@ F: drivers/net/ethernet/cortina/ F: drivers/pinctrl/pinctrl-gemini.c F: drivers/rtc/rtc-ftrtc010.c -ARM/CSR SIRFPRIMA2 MACHINE SUPPORT -M: Barry Song -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -S: Maintained -T: git git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux.git -F: arch/arm/boot/dts/prima2* -F: arch/arm/mach-prima2/ -F: drivers/clk/sirf/ -F: drivers/clocksource/timer-atlas7.c -F: drivers/clocksource/timer-prima2.c -X: drivers/gnss -N: [^a-z]sirf - ARM/CZ.NIC TURRIS MOX SUPPORT M: Marek Behun S: Maintained diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 96f153c5639b..9d9a7060d365 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -671,8 +671,6 @@ source "arch/arm/mach-orion5x/Kconfig" source "arch/arm/mach-oxnas/Kconfig" -source "arch/arm/mach-prima2/Kconfig" - source "arch/arm/mach-pxa/Kconfig" source "arch/arm/plat-pxa/Kconfig" diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 23264f7bff72..fe8b95069d31 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -1142,32 +1142,6 @@ choice Say Y here if you want kernel low-level debugging support on Allwinner A31/A23 based platforms on the R_UART. - config DEBUG_SIRFPRIMA2_UART1 - bool "Kernel low-level debugging messages via SiRFprimaII UART1" - depends on ARCH_PRIMA2 - select DEBUG_SIRFSOC_UART - help - Say Y here if you want the debug print routines to direct - their output to the uart1 port on SiRFprimaII devices. - - config DEBUG_SIRFATLAS7_UART0 - bool "Kernel low-level debugging messages via SiRFatlas7 UART0" - depends on ARCH_ATLAS7 - select DEBUG_SIRFSOC_UART - help - Say Y here if you want the debug print routines to direct - their output to the uart0 port on SiRFATLAS7 devices.The uart0 - is used on SiRFATLAS7 as a extra debug port.sometimes an extra - debug port can be very useful. - - config DEBUG_SIRFATLAS7_UART1 - bool "Kernel low-level debugging messages via SiRFatlas7 UART1" - depends on ARCH_ATLAS7 - select DEBUG_SIRFSOC_UART - help - Say Y here if you want the debug print routines to direct - their output to the uart1 port on SiRFATLAS7 devices. - config DEBUG_SPEAR3XX bool "Kernel low-level debugging messages via ST SPEAr 3xx/6xx UART" depends on ARCH_SPEAR3XX || ARCH_SPEAR6XX @@ -1538,10 +1512,6 @@ config DEBUG_STM32_UART bool depends on ARCH_STM32 -config DEBUG_SIRFSOC_UART - bool - depends on ARCH_SIRF - config DEBUG_UART_FLOW_CONTROL bool "Enable flow control (CTS) for the debug UART" depends on DEBUG_LL @@ -1596,7 +1566,6 @@ config DEBUG_LL_INCLUDE default "debug/renesas-scif.S" if DEBUG_RMOBILE_SCIFA4 default "debug/s3c24xx.S" if DEBUG_S3C24XX_UART || DEBUG_S3C64XX_UART default "debug/s5pv210.S" if DEBUG_S5PV210_UART - default "debug/sirf.S" if DEBUG_SIRFSOC_UART default "debug/sti.S" if DEBUG_STI_UART default "debug/stm32.S" if DEBUG_STM32_UART default "debug/tegra.S" if DEBUG_TEGRA_UART @@ -1648,8 +1617,6 @@ config DEBUG_UART_PHYS default 0x1600d000 if DEBUG_SD5203_UART default 0x18000300 if DEBUG_BCM_5301X default 0x18000400 if DEBUG_BCM_HR2 - default 0x18010000 if DEBUG_SIRFATLAS7_UART0 - default 0x18020000 if DEBUG_SIRFATLAS7_UART1 default 0x18023000 if DEBUG_BCM_IPROC_UART3 default 0x1c090000 if DEBUG_VEXPRESS_UART0_RS1 default 0x20001000 if DEBUG_HIP01_UART @@ -1695,7 +1662,6 @@ config DEBUG_UART_PHYS default 0x80074000 if DEBUG_IMX28_UART default 0x808c0000 if DEBUG_EP93XX || ARCH_EP93XX default 0x90020000 if DEBUG_NSPIRE_CLASSIC_UART || DEBUG_NSPIRE_CX_UART - default 0xb0060000 if DEBUG_SIRFPRIMA2_UART1 default 0xb0090000 if DEBUG_VEXPRESS_UART0_CRX default 0xc0013000 if DEBUG_U300_UART default 0xc8000000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN @@ -1754,7 +1720,7 @@ config DEBUG_UART_PHYS DEBUG_RMOBILE_SCIFA4 || DEBUG_S3C24XX_UART || \ DEBUG_S3C64XX_UART || \ DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \ - DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \ + DEBUG_DIGICOLOR_UA0 || \ DEBUG_AT91_UART || DEBUG_STM32_UART config DEBUG_UART_VIRT @@ -1836,10 +1802,7 @@ config DEBUG_UART_VIRT default 0xfec03000 if DEBUG_SOCFPGA_CYCLONE5_UART1 default 0xfec12000 if DEBUG_MVEBU_UART0 || DEBUG_MVEBU_UART0_ALTERNATE default 0xfec12100 if DEBUG_MVEBU_UART1_ALTERNATE - default 0xfec10000 if DEBUG_SIRFATLAS7_UART0 default 0xfec20000 if DEBUG_DAVINCI_DMx_UART0 - default 0xfec20000 if DEBUG_SIRFATLAS7_UART1 - default 0xfec60000 if DEBUG_SIRFPRIMA2_UART1 default 0xfec90000 if DEBUG_RK32_UART2 default 0xfed0c000 if DEBUG_DAVINCI_DA8XX_UART1 default 0xfed0d000 if DEBUG_DAVINCI_DA8XX_UART2 || DEBUG_SD5203_UART @@ -1863,7 +1826,7 @@ config DEBUG_UART_VIRT DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \ DEBUG_S3C64XX_UART || \ DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \ - DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \ + DEBUG_DIGICOLOR_UA0 || \ DEBUG_AT91_UART || DEBUG_STM32_UART config DEBUG_UART_8250_SHIFT diff --git a/arch/arm/Makefile b/arch/arm/Makefile index dd51416cdcd9..7c4b50852a78 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -209,7 +209,6 @@ machine-$(CONFIG_PLAT_SAMSUNG) += s3c machine-$(CONFIG_ARCH_S5PV210) += s5pv210 machine-$(CONFIG_ARCH_SA1100) += sa1100 machine-$(CONFIG_ARCH_RENESAS) += shmobile -machine-$(CONFIG_ARCH_SIRF) += prima2 machine-$(CONFIG_ARCH_SOCFPGA) += socfpga machine-$(CONFIG_ARCH_STI) += sti machine-$(CONFIG_ARCH_STM32) += stm32 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 2c02cb4c71cb..da413b4d5c3f 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -74,10 +74,6 @@ dtb-$(CONFIG_SOC_SAM_V7) += \ at91-sama5d4_xplained.dtb \ at91-sama5d4ek.dtb \ at91-vinco.dtb -dtb-$(CONFIG_ARCH_ATLAS6) += \ - atlas6-evb.dtb -dtb-$(CONFIG_ARCH_ATLAS7) += \ - atlas7-evb.dtb dtb-$(CONFIG_ARCH_AXXIA) += \ axm5516-amarillo.dtb dtb-$(CONFIG_ARCH_BCM2835) += \ @@ -886,8 +882,6 @@ dtb-$(CONFIG_ARCH_ACTIONS) += \ owl-s500-labrador-base-m.dtb \ owl-s500-roseapplepi.dtb \ owl-s500-sparky.dtb -dtb-$(CONFIG_ARCH_PRIMA2) += \ - prima2-evb.dtb dtb-$(CONFIG_ARCH_PXA) += \ pxa300-raumfeld-connector.dtb \ pxa300-raumfeld-controller.dtb \ diff --git a/arch/arm/boot/dts/atlas6-evb.dts b/arch/arm/boot/dts/atlas6-evb.dts deleted file mode 100644 index 89e430392f26..000000000000 diff --git a/arch/arm/boot/dts/atlas6.dtsi b/arch/arm/boot/dts/atlas6.dtsi deleted file mode 100644 index 8ac5d1524a43..000000000000 diff --git a/arch/arm/boot/dts/atlas7-evb.dts b/arch/arm/boot/dts/atlas7-evb.dts deleted file mode 100644 index e0515043d145..000000000000 diff --git a/arch/arm/boot/dts/atlas7.dtsi b/arch/arm/boot/dts/atlas7.dtsi deleted file mode 100644 index 99c9d9d9267f..000000000000 diff --git a/arch/arm/boot/dts/prima2-evb.dts b/arch/arm/boot/dts/prima2-evb.dts deleted file mode 100644 index 7394f764df65..000000000000 diff --git a/arch/arm/boot/dts/prima2.dtsi b/arch/arm/boot/dts/prima2.dtsi deleted file mode 100644 index 7d3d93c22ed9..000000000000 diff --git a/arch/arm/configs/prima2_defconfig b/arch/arm/configs/prima2_defconfig deleted file mode 100644 index be19aa127595..000000000000 diff --git a/arch/arm/include/debug/sirf.S b/arch/arm/include/debug/sirf.S deleted file mode 100644 index 3612c7b9cbe7..000000000000 diff --git a/arch/arm/mach-prima2/Kconfig b/arch/arm/mach-prima2/Kconfig deleted file mode 100644 index ea077f66372d..000000000000 diff --git a/arch/arm/mach-prima2/Makefile b/arch/arm/mach-prima2/Makefile deleted file mode 100644 index 0fd2763031e9..000000000000 diff --git a/arch/arm/mach-prima2/common.c b/arch/arm/mach-prima2/common.c deleted file mode 100644 index e2d158e331e2..000000000000 diff --git a/arch/arm/mach-prima2/common.h b/arch/arm/mach-prima2/common.h deleted file mode 100644 index 3bab7e571ded..000000000000 diff --git a/arch/arm/mach-prima2/headsmp.S b/arch/arm/mach-prima2/headsmp.S deleted file mode 100644 index 88ea1243942a..000000000000 diff --git a/arch/arm/mach-prima2/hotplug.c b/arch/arm/mach-prima2/hotplug.c deleted file mode 100644 index bc0d957e89ac..000000000000 diff --git a/arch/arm/mach-prima2/platsmp.c b/arch/arm/mach-prima2/platsmp.c deleted file mode 100644 index 8f7bbb57fb20..000000000000 diff --git a/arch/arm/mach-prima2/pm.c b/arch/arm/mach-prima2/pm.c deleted file mode 100644 index c24bc89f320b..000000000000 diff --git a/arch/arm/mach-prima2/pm.h b/arch/arm/mach-prima2/pm.h deleted file mode 100644 index 0aff6cb876be..000000000000 diff --git a/arch/arm/mach-prima2/rstc.c b/arch/arm/mach-prima2/rstc.c deleted file mode 100644 index 9d56606ac87f..000000000000 diff --git a/arch/arm/mach-prima2/rtciobrg.c b/arch/arm/mach-prima2/rtciobrg.c deleted file mode 100644 index 97c0e333e3b9..000000000000 diff --git a/arch/arm/mach-prima2/sleep.S b/arch/arm/mach-prima2/sleep.S deleted file mode 100644 index d9bbc5ca39ef..000000000000 From patchwork Wed Jan 20 12:48:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 12032225 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-22.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5CC61C433DB for ; Wed, 20 Jan 2021 12:50:23 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E6E9723340 for ; Wed, 20 Jan 2021 12:50:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E6E9723340 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=azbKHdrJKqJ+CPynA9+XKyxwfTsVF77bF5/SzskTa4I=; b=rnXjLCkkr60XRiiLL9N8EFyRW Z1i387Y9fk/NNjdmAayo/RvM6fpJd08NN7AE7UbSuJTOduTjssSMJxk8jfGs9T/I0j6o098zSLNG8 idLsuEngb7zIhoKIVfV8SGMjU9m0Svc0TGP/iEzhqLkkmAxoGWFzHlyzALVf/9JfBMEhPiQkPe87u eNXRK7lg48QO/QKyXZTQr1Wajq8EC3RLT0Ay4TAHt+lY0akEULTzz8HqCUoHUVoYj/lDbK8E9MK0a d6ghRFrfk/aeQC8OhbBth116Sa52kY5igHWEcp7ZCNHTVyUJj0EfwTllMCzO9GjjGQidEAoxJW8p5 tlLhGlr3g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l2Cus-0002Fj-Cr; Wed, 20 Jan 2021 12:48:54 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l2Cui-0002CG-8q for linux-arm-kernel@lists.infradead.org; Wed, 20 Jan 2021 12:48:46 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id EAFD423371; Wed, 20 Jan 2021 12:48:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1611146923; bh=/Wl34/jHn9mrIFox4YO2TVo/JCUUjHA0k/OxWK3F5AE=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=FCoxzWvexWDhnhbLRvae28eh7x/aERpfpG1hbpXUjhVX1NmW1xS4JYs3a5D1LBpaW JX1BZGHvlV/ANbxJMhieW2PcVAvFYgS6a1DofNMZfeSqkJ2JwN2wFB4bfOvuhKCPbc c2iVcdRPRfAf7V88FUimKANN2qm5gaRaGAZsm9XRrHTsaRrXsMAbFr+vwIEa+u2dVu QDILCkA2YV84/pX+m44gVWALQNxfHwhysq4LAeJTABJAEBXirm4S9EHnF1Gf6VBi53 8kFq2l8d7nPknMeVFRzKmpB4NfOKBj5m5eO8lfRLbLmSMzLc6knIwevsTbOIJYbpwd IWQLHoMSjWFBw== From: Arnd Bergmann List-Id: To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, soc@kernel.org Subject: [PATCH 3/5] ARM: remove zte zx platform Date: Wed, 20 Jan 2021 13:48:10 +0100 Message-Id: <20210120124812.2800027-4-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210120124812.2800027-1-arnd@kernel.org> References: <20210120124812.2800027-1-arnd@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210120_074844_617397_1894963E X-CRM114-Status: GOOD ( 19.91 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jun Nie , Shawn Guo , Arnd Bergmann Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann The ZTE ZX set-top-box SoC platform was added in 2015 by Jun Nie, with Baoyou Xie and Shawn Guo subsequently becoming maintainers after the addition of the 64-bit variant. However, the only machines that were ever supported upstream are the reference designs, not actual set-top-box devices that would benefit from this support. All ZTE set-top-boxes from the past few years seem to be based on third-party SoCs. While there is very little information about zx296702 and zx296718 on the web, I found some references to other chips from the same family, such as zx296716 and zx296719, which were never submitted for upstream support. Finally, there is no support for the GPU on either of them, with the lima and panfrost device drivers having been added after work on the zx platform had stopped. Shawn confirmed that he has not seen any interest in this platform for the past four years, and that it can be removed. Thanks to Jun and Shawn for maintaining this platform over the past five years. Cc: Jun Nie Cc: Shawn Guo Signed-off-by: Arnd Bergmann Acked-by: Shawn Guo --- .../devicetree/bindings/arm/zte,sysctrl.txt | 30 - .../devicetree/bindings/arm/zte.yaml | 28 - .../bindings/reset/zte,zx2967-reset.txt | 20 - .../devicetree/bindings/serial/pl011.yaml | 2 - .../devicetree/bindings/soc/zte/pd-2967xx.txt | 19 - MAINTAINERS | 42 -- arch/arm/Kconfig | 2 - arch/arm/Kconfig.debug | 14 - arch/arm/Makefile | 1 - arch/arm/boot/dts/Makefile | 1 - arch/arm/boot/dts/zx296702-ad1.dts | 48 -- arch/arm/boot/dts/zx296702.dtsi | 142 ---- arch/arm/configs/zx_defconfig | 122 ---- arch/arm/mach-zx/Kconfig | 21 - arch/arm/mach-zx/Makefile | 3 - arch/arm/mach-zx/core.h | 16 - arch/arm/mach-zx/headsmp.S | 30 - arch/arm/mach-zx/platsmp.c | 186 ------ arch/arm/mach-zx/zx296702-pm-domain.c | 202 ------ arch/arm/mach-zx/zx296702.c | 22 - arch/arm64/Kconfig.platforms | 6 - arch/arm64/boot/dts/Makefile | 1 - arch/arm64/boot/dts/zte/Makefile | 3 - arch/arm64/boot/dts/zte/zx296718-evb.dts | 144 ---- arch/arm64/boot/dts/zte/zx296718-pcbox.dts | 143 ---- arch/arm64/boot/dts/zte/zx296718.dtsi | 627 ------------------ drivers/reset/Kconfig | 2 +- drivers/soc/Kconfig | 1 - drivers/soc/Makefile | 1 - drivers/soc/zte/Kconfig | 15 - drivers/soc/zte/Makefile | 6 - drivers/soc/zte/zx296718_pm_domains.c | 181 ----- drivers/soc/zte/zx2967_pm_domains.c | 141 ---- drivers/soc/zte/zx2967_pm_domains.h | 44 -- 34 files changed, 1 insertion(+), 2265 deletions(-) delete mode 100644 Documentation/devicetree/bindings/arm/zte,sysctrl.txt delete mode 100644 Documentation/devicetree/bindings/arm/zte.yaml delete mode 100644 Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt delete mode 100644 Documentation/devicetree/bindings/soc/zte/pd-2967xx.txt delete mode 100644 arch/arm/boot/dts/zx296702-ad1.dts delete mode 100644 arch/arm/boot/dts/zx296702.dtsi delete mode 100644 arch/arm/configs/zx_defconfig delete mode 100644 arch/arm/mach-zx/Kconfig delete mode 100644 arch/arm/mach-zx/Makefile delete mode 100644 arch/arm/mach-zx/core.h delete mode 100644 arch/arm/mach-zx/headsmp.S delete mode 100644 arch/arm/mach-zx/platsmp.c delete mode 100644 arch/arm/mach-zx/zx296702-pm-domain.c delete mode 100644 arch/arm/mach-zx/zx296702.c delete mode 100644 arch/arm64/boot/dts/zte/Makefile delete mode 100644 arch/arm64/boot/dts/zte/zx296718-evb.dts delete mode 100644 arch/arm64/boot/dts/zte/zx296718-pcbox.dts delete mode 100644 arch/arm64/boot/dts/zte/zx296718.dtsi delete mode 100644 drivers/soc/zte/Kconfig delete mode 100644 drivers/soc/zte/Makefile delete mode 100644 drivers/soc/zte/zx296718_pm_domains.c delete mode 100644 drivers/soc/zte/zx2967_pm_domains.c delete mode 100644 drivers/soc/zte/zx2967_pm_domains.h diff --git a/Documentation/devicetree/bindings/arm/zte,sysctrl.txt b/Documentation/devicetree/bindings/arm/zte,sysctrl.txt deleted file mode 100644 index 7e66b7f7ba96..000000000000 diff --git a/Documentation/devicetree/bindings/arm/zte.yaml b/Documentation/devicetree/bindings/arm/zte.yaml deleted file mode 100644 index 672f8129cd31..000000000000 diff --git a/Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt b/Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt deleted file mode 100644 index b015508f9780..000000000000 diff --git a/Documentation/devicetree/bindings/serial/pl011.yaml b/Documentation/devicetree/bindings/serial/pl011.yaml index c23c93b400f0..1a51c532e8d2 100644 --- a/Documentation/devicetree/bindings/serial/pl011.yaml +++ b/Documentation/devicetree/bindings/serial/pl011.yaml @@ -19,7 +19,6 @@ select: contains: enum: - arm,pl011 - - zte,zx296702-uart required: - compatible @@ -30,7 +29,6 @@ properties: - const: arm,pl011 - const: arm,primecell - items: - - const: zte,zx296702-uart - const: arm,primecell reg: diff --git a/Documentation/devicetree/bindings/soc/zte/pd-2967xx.txt b/Documentation/devicetree/bindings/soc/zte/pd-2967xx.txt deleted file mode 100644 index 7629de1c2c72..000000000000 diff --git a/MAINTAINERS b/MAINTAINERS index aeef69cbc7ec..54b5e6dee017 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2704,40 +2704,6 @@ S: Maintained F: arch/arm/mach-pxa/include/mach/z2.h F: arch/arm/mach-pxa/z2.c -ARM/ZTE ARCHITECTURE -M: Jun Nie -M: Shawn Guo -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -S: Maintained -F: Documentation/devicetree/bindings/arm/zte.yaml -F: Documentation/devicetree/bindings/clock/zx2967*.txt -F: Documentation/devicetree/bindings/dma/zxdma.txt -F: Documentation/devicetree/bindings/gpio/zx296702-gpio.txt -F: Documentation/devicetree/bindings/i2c/i2c-zx2967.txt -F: Documentation/devicetree/bindings/mmc/zx-dw-mshc.txt -F: Documentation/devicetree/bindings/pinctrl/pinctrl-zx.txt -F: Documentation/devicetree/bindings/reset/zte,zx2967-reset.txt -F: Documentation/devicetree/bindings/soc/zte/ -F: Documentation/devicetree/bindings/sound/zte,*.txt -F: Documentation/devicetree/bindings/thermal/zx2967-thermal.txt -F: Documentation/devicetree/bindings/watchdog/zte,zx2967-wdt.txt -F: arch/arm/boot/dts/zx2967* -F: arch/arm/mach-zx/ -F: arch/arm64/boot/dts/zte/ -F: drivers/clk/zte/ -F: drivers/dma/zx_dma.c -F: drivers/gpio/gpio-zx.c -F: drivers/i2c/busses/i2c-zx2967.c -F: drivers/mmc/host/dw_mmc-zx.* -F: drivers/pinctrl/zte/ -F: drivers/soc/zte/ -F: drivers/thermal/zx2967_thermal.c -F: drivers/watchdog/zx2967_wdt.c -F: include/dt-bindings/clock/zx2967*.h -F: include/dt-bindings/soc/zte,*.h -F: sound/soc/codecs/zx_aud96p22.c -F: sound/soc/zte/ - ARM/ZYNQ ARCHITECTURE M: Michal Simek L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) @@ -6029,14 +5995,6 @@ T: git git://anongit.freedesktop.org/drm/drm-misc F: Documentation/devicetree/bindings/display/xlnx/ F: drivers/gpu/drm/xlnx/ -DRM DRIVERS FOR ZTE ZX -M: Shawn Guo -L: dri-devel@lists.freedesktop.org -S: Maintained -T: git git://anongit.freedesktop.org/drm/drm-misc -F: Documentation/devicetree/bindings/display/zte,vou.txt -F: drivers/gpu/drm/zte/ - DRM PANEL DRIVERS M: Thierry Reding R: Sam Ravnborg diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9d9a7060d365..9f605ab54570 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -718,8 +718,6 @@ source "arch/arm/mach-vexpress/Kconfig" source "arch/arm/mach-vt8500/Kconfig" -source "arch/arm/mach-zx/Kconfig" - source "arch/arm/mach-zynq/Kconfig" # ARMv7-M architecture diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index fe8b95069d31..543e29068c08 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -1353,18 +1353,6 @@ choice This option selects UART0 on VIA/Wondermedia System-on-a-chip devices, including VT8500, WM8505, WM8650 and WM8850. - config DEBUG_ZTE_ZX - bool "Use ZTE ZX UART" - select DEBUG_UART_PL01X - depends on ARCH_ZX - help - Say Y here if you are enabling ZTE ZX296702 SOC and need - debug uart support. - - This option is preferred over the platform specific - options; the platform specific options are deprecated - and will be soon removed. - config DEBUG_ZYNQ_UART0 bool "Kernel low-level debugging on Xilinx Zynq using UART0" depends on ARCH_ZYNQ @@ -1599,7 +1587,6 @@ config DEBUG_UART_PHYS default 0x02531000 if DEBUG_KEYSTONE_UART1 default 0x03010fe0 if ARCH_RPC default 0x07000000 if DEBUG_SUN9I_UART0 - default 0x09405000 if DEBUG_ZTE_ZX default 0x10009000 if DEBUG_REALVIEW_STD_PORT || \ DEBUG_VEXPRESS_UART0_CA9 default 0x1010c000 if DEBUG_REALVIEW_PB1176_PORT @@ -1782,7 +1769,6 @@ config DEBUG_UART_VIRT default 0xfb020000 if DEBUG_OMAP3UART3 default 0xfb042000 if DEBUG_OMAP3UART4 default 0xfb10c000 if DEBUG_REALVIEW_PB1176_PORT - default 0xfc705000 if DEBUG_ZTE_ZX default 0xfcfe8600 if DEBUG_BCM63XX_UART default 0xfd000000 if DEBUG_SPEAR3XX || DEBUG_SPEAR13XX default 0xfd883000 if DEBUG_ALPINE_UART0 diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 7c4b50852a78..7b8eed93f1fa 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -220,7 +220,6 @@ machine-$(CONFIG_ARCH_U8500) += ux500 machine-$(CONFIG_ARCH_VERSATILE) += versatile machine-$(CONFIG_ARCH_VEXPRESS) += vexpress machine-$(CONFIG_ARCH_VT8500) += vt8500 -machine-$(CONFIG_ARCH_ZX) += zx machine-$(CONFIG_ARCH_ZYNQ) += zynq machine-$(CONFIG_PLAT_SPEAR) += spear diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index da413b4d5c3f..5fcae846aa00 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1387,7 +1387,6 @@ dtb-$(CONFIG_ARCH_MSTARV7) += \ mstar-infinity2m-ssd202d-ssd201htv2.dtb \ mstar-infinity3-msc313e-breadbee.dtb \ mstar-mercury5-ssc8336n-midrived08.dtb -dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb dtb-$(CONFIG_ARCH_ASPEED) += \ aspeed-ast2500-evb.dtb \ aspeed-ast2600-evb.dtb \ diff --git a/arch/arm/boot/dts/zx296702-ad1.dts b/arch/arm/boot/dts/zx296702-ad1.dts deleted file mode 100644 index bd9400840023..000000000000 diff --git a/arch/arm/boot/dts/zx296702.dtsi b/arch/arm/boot/dts/zx296702.dtsi deleted file mode 100644 index f378c661b3bf..000000000000 diff --git a/arch/arm/configs/zx_defconfig b/arch/arm/configs/zx_defconfig deleted file mode 100644 index a046a492bfa7..000000000000 diff --git a/arch/arm/mach-zx/Kconfig b/arch/arm/mach-zx/Kconfig deleted file mode 100644 index ea29c84a7849..000000000000 diff --git a/arch/arm/mach-zx/Makefile b/arch/arm/mach-zx/Makefile deleted file mode 100644 index 6f8930cdb8fb..000000000000 diff --git a/arch/arm/mach-zx/core.h b/arch/arm/mach-zx/core.h deleted file mode 100644 index 25fe873892c9..000000000000 diff --git a/arch/arm/mach-zx/headsmp.S b/arch/arm/mach-zx/headsmp.S deleted file mode 100644 index 0846859b0573..000000000000 diff --git a/arch/arm/mach-zx/platsmp.c b/arch/arm/mach-zx/platsmp.c deleted file mode 100644 index d4e1d3792224..000000000000 diff --git a/arch/arm/mach-zx/zx296702-pm-domain.c b/arch/arm/mach-zx/zx296702-pm-domain.c deleted file mode 100644 index 7a08bf9dd792..000000000000 diff --git a/arch/arm/mach-zx/zx296702.c b/arch/arm/mach-zx/zx296702.c deleted file mode 100644 index fd8fa3a074fa..000000000000 diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 6eecdef538bd..ec3c0cb27d1e 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -317,12 +317,6 @@ config ARCH_XGENE help This enables support for AppliedMicro X-Gene SOC Family -config ARCH_ZX - bool "ZTE ZX SoC Family" - select PINCTRL - help - This enables support for ZTE ZX SoC Family - config ARCH_ZYNQMP bool "Xilinx ZynqMP Family" help diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile index 9b1170658d60..f1173cd93594 100644 --- a/arch/arm64/boot/dts/Makefile +++ b/arch/arm64/boot/dts/Makefile @@ -29,4 +29,3 @@ subdir-y += synaptics subdir-y += ti subdir-y += toshiba subdir-y += xilinx -subdir-y += zte diff --git a/arch/arm64/boot/dts/zte/Makefile b/arch/arm64/boot/dts/zte/Makefile deleted file mode 100644 index 126896144bda..000000000000 diff --git a/arch/arm64/boot/dts/zte/zx296718-evb.dts b/arch/arm64/boot/dts/zte/zx296718-evb.dts deleted file mode 100644 index cb2519ecd724..000000000000 diff --git a/arch/arm64/boot/dts/zte/zx296718-pcbox.dts b/arch/arm64/boot/dts/zte/zx296718-pcbox.dts deleted file mode 100644 index e02509f7082b..000000000000 diff --git a/arch/arm64/boot/dts/zte/zx296718.dtsi b/arch/arm64/boot/dts/zte/zx296718.dtsi deleted file mode 100644 index cc54837ff4ba..000000000000 diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig index 71ab75a46491..8dd99ca2192c 100644 --- a/drivers/reset/Kconfig +++ b/drivers/reset/Kconfig @@ -173,7 +173,7 @@ config RESET_SCMI config RESET_SIMPLE bool "Simple Reset Controller Driver" if COMPILE_TEST - default ARCH_AGILEX || ARCH_ASPEED || ARCH_BITMAIN || ARCH_REALTEK || ARCH_STM32 || ARCH_STRATIX10 || ARCH_SUNXI || ARCH_ZX || ARC + default ARCH_AGILEX || ARCH_ASPEED || ARCH_BITMAIN || ARCH_REALTEK || ARCH_STM32 || ARCH_STRATIX10 || ARCH_SUNXI || ARC help This enables a simple reset controller driver for reset lines that that can be asserted and deasserted by toggling bits in a contiguous, diff --git a/drivers/soc/Kconfig b/drivers/soc/Kconfig index d097d070f579..f357c6c659d2 100644 --- a/drivers/soc/Kconfig +++ b/drivers/soc/Kconfig @@ -22,7 +22,6 @@ source "drivers/soc/ti/Kconfig" source "drivers/soc/ux500/Kconfig" source "drivers/soc/versatile/Kconfig" source "drivers/soc/xilinx/Kconfig" -source "drivers/soc/zte/Kconfig" source "drivers/soc/kendryte/Kconfig" endmenu diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile index 699b758d28e4..9bceb12b291d 100644 --- a/drivers/soc/Makefile +++ b/drivers/soc/Makefile @@ -28,5 +28,4 @@ obj-y += ti/ obj-$(CONFIG_ARCH_U8500) += ux500/ obj-$(CONFIG_PLAT_VERSATILE) += versatile/ obj-y += xilinx/ -obj-$(CONFIG_ARCH_ZX) += zte/ obj-$(CONFIG_SOC_KENDRYTE) += kendryte/ diff --git a/drivers/soc/zte/Kconfig b/drivers/soc/zte/Kconfig deleted file mode 100644 index 1cf1938da541..000000000000 diff --git a/drivers/soc/zte/Makefile b/drivers/soc/zte/Makefile deleted file mode 100644 index 728c677addcd..000000000000 diff --git a/drivers/soc/zte/zx296718_pm_domains.c b/drivers/soc/zte/zx296718_pm_domains.c deleted file mode 100644 index 4daab06bbc26..000000000000 diff --git a/drivers/soc/zte/zx2967_pm_domains.c b/drivers/soc/zte/zx2967_pm_domains.c deleted file mode 100644 index a4503e31b616..000000000000 diff --git a/drivers/soc/zte/zx2967_pm_domains.h b/drivers/soc/zte/zx2967_pm_domains.h deleted file mode 100644 index f586c02410ff..000000000000 From patchwork Wed Jan 20 12:48:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 12032223 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CE551C433E6 for ; Wed, 20 Jan 2021 12:50:20 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 833C323340 for ; Wed, 20 Jan 2021 12:50:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 833C323340 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=F1G+OhxkS0uVoWZMSodapKpL2meL8tzbIQ24EGJksU4=; b=lakui2KzbWyr6KxpP1BeYPPEy 4gsoqRcTnkqHqQevXQ74Fk0K9RZadz0jiCqz0JI4DQaAiYr2JLnDyrXyeQD8c83wQ3CH4I2BC/cXf djxRdrVJ7uqi2pMDFgyDtjjpzRuPCajEl9ReAvBPCbIK3IHCM6uNbhbH2V4bVOa0PhvdxXfEpdik2 Ny339+j7NFMV5f1tJc9zx8ViOUF/qbIsIy6GCE+is5+vfRSWbZXPW1NMH8K/GdnMqrActuOoUCya3 RRxTTGVtoGqjlGpSzytBWsBE+UnvXP7t1W4Y3lhAery+rx2sARSN1m15H13IzyffLXsoyML47W/cL 6kTlEGeiA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l2Cuy-0002HD-2h; Wed, 20 Jan 2021 12:49:01 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l2Cum-0002Df-6y for linux-arm-kernel@lists.infradead.org; Wed, 20 Jan 2021 12:48:50 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id D201E23380; Wed, 20 Jan 2021 12:48:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1611146927; bh=4BxAf1FTOYShE682lWGMYU0CsMqPExM7BYzadGDryks=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=iXskoELhldg0eFmx6sfXmYtXpg8a2TmXIX2aa6JCvBpRLR+uCmSQrMax+9W8rKvnL seCdje87i63xUTF80XylUusgVjHdH5zulPMYvNWsa6w6TKB9aQPC75dyTKeJeAmvLR x3LfDGRn7IsCjrNEXke3PRIdmIegHW9eJOxXDHQgYQHD0ZMuFtawk6SDtSJ+t+6bNO jwvTaSgxQsHPwRI24frZYAmyk98Nx4z+NrFQqegotLhVijuVDZ1LnZTrhA535TfWQ0 UO78x1id2rkVV3wqMgT3FRdiI5meR2JVypcf96NxHp19gB2/GFqEQJqTYd6nefnf/n PJ6ECkc0CW/zA== From: Arnd Bergmann List-Id: To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, soc@kernel.org Subject: [PATCH 4/5] ARM: remove tango platform Date: Wed, 20 Jan 2021 13:48:11 +0100 Message-Id: <20210120124812.2800027-5-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210120124812.2800027-1-arnd@kernel.org> References: <20210120124812.2800027-1-arnd@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210120_074848_465269_521CB025 X-CRM114-Status: GOOD ( 16.15 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mans Rullgard , Arnd Bergmann , Marc Gonzalez Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann The smp8758 (tango4) SoC was the last generation of set-top-box chips to come out of Sigma Designs, and support was added by Marc Gonzalez and Måns Rullgård between 2015 and 2017, before the company went out of business and the products were abandoned. The chip is used in some set-top-boxes such as the Popcorn Hour A-500, which could have seen some adoption by hobbyists. This has not happened in the past four years, and support for the more widely used MIPS based SoCs was never merged at all. Thanks to Marc and Måns for maintaining for the past years even after the death of the platform. Cc: Marc Gonzalez Cc: Mans Rullgard Link: https://lore.kernel.org/lkml/2d643ebc-09af-a809-eb3f-2aec8ecee501@free.fr/ Signed-off-by: Arnd Bergmann Acked-by: Mans Rullgard --- MAINTAINERS | 7 - arch/arm/Kconfig | 2 - arch/arm/Makefile | 1 - arch/arm/boot/dts/Makefile | 2 - arch/arm/boot/dts/tango4-common.dtsi | 184 ---------------------- arch/arm/boot/dts/tango4-smp8758.dtsi | 57 ------- arch/arm/boot/dts/tango4-vantage-1172.dts | 42 ----- arch/arm/configs/tango4_defconfig | 93 ----------- arch/arm/mach-tango/Kconfig | 13 -- arch/arm/mach-tango/Makefile | 4 - arch/arm/mach-tango/platsmp.c | 52 ------ arch/arm/mach-tango/pm.c | 31 ---- arch/arm/mach-tango/pm.h | 7 - arch/arm/mach-tango/setup.c | 20 --- arch/arm/mach-tango/smc.S | 12 -- arch/arm/mach-tango/smc.h | 9 -- drivers/i2c/busses/Kconfig | 4 +- 17 files changed, 2 insertions(+), 538 deletions(-) delete mode 100644 arch/arm/boot/dts/tango4-common.dtsi delete mode 100644 arch/arm/boot/dts/tango4-smp8758.dtsi delete mode 100644 arch/arm/boot/dts/tango4-vantage-1172.dts delete mode 100644 arch/arm/configs/tango4_defconfig delete mode 100644 arch/arm/mach-tango/Kconfig delete mode 100644 arch/arm/mach-tango/Makefile delete mode 100644 arch/arm/mach-tango/platsmp.c delete mode 100644 arch/arm/mach-tango/pm.c delete mode 100644 arch/arm/mach-tango/pm.h delete mode 100644 arch/arm/mach-tango/setup.c delete mode 100644 arch/arm/mach-tango/smc.S delete mode 100644 arch/arm/mach-tango/smc.h diff --git a/MAINTAINERS b/MAINTAINERS index 54b5e6dee017..bb2a153f76d7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2538,13 +2538,6 @@ F: arch/arm/boot/dts/berlin* F: arch/arm/mach-berlin/ F: arch/arm64/boot/dts/synaptics/ -ARM/TANGO ARCHITECTURE -M: Marc Gonzalez -M: Mans Rullgard -L: linux-arm-kernel@lists.infradead.org -S: Odd Fixes -N: tango - ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT M: Lennert Buytenhek L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9f605ab54570..70d6bfbcd164 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -702,8 +702,6 @@ source "arch/arm/mach-stm32/Kconfig" source "arch/arm/mach-sunxi/Kconfig" -source "arch/arm/mach-tango/Kconfig" - source "arch/arm/mach-tegra/Kconfig" source "arch/arm/mach-u300/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 7b8eed93f1fa..1291fdc869f2 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -213,7 +213,6 @@ machine-$(CONFIG_ARCH_SOCFPGA) += socfpga machine-$(CONFIG_ARCH_STI) += sti machine-$(CONFIG_ARCH_STM32) += stm32 machine-$(CONFIG_ARCH_SUNXI) += sunxi -machine-$(CONFIG_ARCH_TANGO) += tango machine-$(CONFIG_ARCH_TEGRA) += tegra machine-$(CONFIG_ARCH_U300) += u300 machine-$(CONFIG_ARCH_U8500) += ux500 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 5fcae846aa00..a13112f8730c 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1221,8 +1221,6 @@ dtb-$(CONFIG_MACH_SUN9I) += \ sun9i-a80-cubieboard4.dtb dtb-$(CONFIG_MACH_SUNIV) += \ suniv-f1c100s-licheepi-nano.dtb -dtb-$(CONFIG_ARCH_TANGO) += \ - tango4-vantage-1172.dtb dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \ tegra20-acer-a500-picasso.dtb \ tegra20-harmony.dtb \ diff --git a/arch/arm/boot/dts/tango4-common.dtsi b/arch/arm/boot/dts/tango4-common.dtsi deleted file mode 100644 index d584da314500..000000000000 diff --git a/arch/arm/boot/dts/tango4-smp8758.dtsi b/arch/arm/boot/dts/tango4-smp8758.dtsi deleted file mode 100644 index 1c6a5bf1a86b..000000000000 diff --git a/arch/arm/boot/dts/tango4-vantage-1172.dts b/arch/arm/boot/dts/tango4-vantage-1172.dts deleted file mode 100644 index d237d7f02c51..000000000000 diff --git a/arch/arm/configs/tango4_defconfig b/arch/arm/configs/tango4_defconfig deleted file mode 100644 index cbc9ade78f14..000000000000 diff --git a/arch/arm/mach-tango/Kconfig b/arch/arm/mach-tango/Kconfig deleted file mode 100644 index a9eeda36aeb1..000000000000 diff --git a/arch/arm/mach-tango/Makefile b/arch/arm/mach-tango/Makefile deleted file mode 100644 index 97cd04508fa1..000000000000 diff --git a/arch/arm/mach-tango/platsmp.c b/arch/arm/mach-tango/platsmp.c deleted file mode 100644 index 65012afbc1a3..000000000000 diff --git a/arch/arm/mach-tango/pm.c b/arch/arm/mach-tango/pm.c deleted file mode 100644 index a32c3b631484..000000000000 diff --git a/arch/arm/mach-tango/pm.h b/arch/arm/mach-tango/pm.h deleted file mode 100644 index 35ea705a0ee2..000000000000 diff --git a/arch/arm/mach-tango/setup.c b/arch/arm/mach-tango/setup.c deleted file mode 100644 index 824f90737b04..000000000000 diff --git a/arch/arm/mach-tango/smc.S b/arch/arm/mach-tango/smc.S deleted file mode 100644 index b1752aaa72bc..000000000000 diff --git a/arch/arm/mach-tango/smc.h b/arch/arm/mach-tango/smc.h deleted file mode 100644 index 455ce3e06daf..000000000000 diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index d4d60ad0eda0..0e284fb750e5 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -1174,8 +1174,8 @@ config I2C_XILINX will be called xilinx_i2c. config I2C_XLR - tristate "Netlogic XLR and Sigma Designs I2C support" - depends on CPU_XLR || ARCH_TANGO || COMPILE_TEST + tristate "Netlogic XLR I2C support" + depends on CPU_XLR || COMPILE_TEST help This driver enables support for the on-chip I2C interface of the Netlogic XLR/XLS MIPS processors and Sigma Designs SOCs. From patchwork Wed Jan 20 12:48:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 12032227 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A532C433E0 for ; Wed, 20 Jan 2021 12:50:25 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9C68223340 for ; Wed, 20 Jan 2021 12:50:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9C68223340 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ysVe4WNIjXsOKWxaiOzuL0gIX9YTQoJo6HlyUiUw8aA=; b=25C7pKmH9TYFHjrt3DhsMsEo8 VALgylTWGD3+tY7UsaaPVxSzwi08L+wj7IHKUGDNSsQEZuQPOCwuU0XU26vmZ6915biIp9ko6ALWu bBmHUnteNmJQ2zTzptpEi34kop5fJWy834Y8b65kxNns0sBzLzhTkIIwIRHJFV3JPVa+p9k7qhZJk dJeFFYCN2iGtDkD0RyZRX2MIT1tA1Wy8XwkAzHhHsO27BPuaxHRFY0ob0EK1tnRKwVxvy5xoXv+iU C5fhubLtpfokMb+fRifZIt9vHsTmqgALInp6jmkkdAqeuQKTfd4EDmErPuOkHTEUG6HkUuAshrg/z j6w7GSLtw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l2Cv7-0002Jj-9p; Wed, 20 Jan 2021 12:49:09 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l2Cuo-0002EN-3B for linux-arm-kernel@lists.infradead.org; Wed, 20 Jan 2021 12:48:53 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2AC3A23381; Wed, 20 Jan 2021 12:48:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1611146929; bh=BWyv/u7vwlOEx4k7nYHY2DCVRTpFdi7p6xzsWlNF87Q=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=KW7dK1jumBIReL+LgPdnfG1xv64plTaR9D0i450ktpQwktP2lwamswOyux2Oj9znY dvFWwtgtA3XOLUkvZrvgy8G7DWv1bpWZ0cVrXGRxIX21x+DvTDKo4gVeEH3rUWekX/ YOKClnysTB4uExfbuBEx6TMuVB/QjMFIpa7DvzCT4hKVthm5sfE7jfO6GaA024qpPy Hn4xxSi6FbCaBTLQ6iGBrb2ht3fqrX06+UlBr/JjTzGkyGP2xAny0vXXZRQda6ewaL UCSTmDgflsBto43Mpc1qw3mYXzq0RwTphT5D/yjS8DRQE0rk9KHucj1bx9vvKJaVpM dbfCTW8nDu9oQ== From: Arnd Bergmann List-Id: To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, soc@kernel.org Subject: [PATCH 5/5] ARM: remove u300 platform Date: Wed, 20 Jan 2021 13:48:12 +0100 Message-Id: <20210120124812.2800027-6-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210120124812.2800027-1-arnd@kernel.org> References: <20210120124812.2800027-1-arnd@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210120_074850_319832_8878E28C X-CRM114-Status: GOOD ( 18.61 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linus Walleij , Arnd Bergmann Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann The Ericsson U300 platform was one of two ARM929 based SoC platforms for mobile phones in ST-Ericsson after the merger of Ericsson with ST-NXP into ST-Ericsson, the other one being the ST Nomadik. The platform was not widely adopted in Linux based systems and was replaced with the far superior ST-Ericsson U8500 in 2011, but Linus Walleij kept maintaining the code for the whole time. Linus continues to use the Nomadik machine, but decided to drop u300 from the kernel as part of this year's spring cleaning. Thanks for having maintained it all these years. Cc: Linus Walleij Link: https://lore.kernel.org/lkml/CACRpkdbJkiHR9FSfJTH_5d_qRU1__dRXHM1TL40iqNRKbGQfrQ@mail.gmail.com/ Signed-off-by: Arnd Bergmann Reviewed-by: Linus Walleij --- .../devicetree/bindings/arm/ste-u300.txt | 46 -- MAINTAINERS | 14 +- arch/arm/Kconfig | 2 - arch/arm/Kconfig.debug | 10 - arch/arm/Makefile | 1 - arch/arm/boot/dts/Makefile | 2 - arch/arm/boot/dts/ste-u300.dts | 464 ------------------ arch/arm/configs/u300_defconfig | 65 --- arch/arm/mach-u300/Kconfig | 32 -- arch/arm/mach-u300/Makefile | 8 - arch/arm/mach-u300/core.c | 413 ---------------- arch/arm/mach-u300/regulator.c | 134 ----- drivers/mtd/nand/raw/Kconfig | 3 +- drivers/spi/Kconfig | 1 - 14 files changed, 2 insertions(+), 1193 deletions(-) delete mode 100644 Documentation/devicetree/bindings/arm/ste-u300.txt delete mode 100644 arch/arm/boot/dts/ste-u300.dts delete mode 100644 arch/arm/configs/u300_defconfig delete mode 100644 arch/arm/mach-u300/Kconfig delete mode 100644 arch/arm/mach-u300/Makefile delete mode 100644 arch/arm/mach-u300/core.c delete mode 100644 arch/arm/mach-u300/regulator.c diff --git a/Documentation/devicetree/bindings/arm/ste-u300.txt b/Documentation/devicetree/bindings/arm/ste-u300.txt deleted file mode 100644 index d11d80006a19..000000000000 diff --git a/MAINTAINERS b/MAINTAINERS index bb2a153f76d7..908e03f0ed3a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2136,7 +2136,7 @@ ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT M: Michael Petchkovsky S: Maintained -ARM/NOMADIK/U300/Ux500 ARCHITECTURES +ARM/NOMADIK/Ux500 ARCHITECTURES M: Linus Walleij L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained @@ -2145,35 +2145,23 @@ F: Documentation/devicetree/bindings/arm/ste-* F: Documentation/devicetree/bindings/arm/ux500.yaml F: Documentation/devicetree/bindings/arm/ux500/ F: Documentation/devicetree/bindings/i2c/i2c-nomadik.txt -F: Documentation/devicetree/bindings/i2c/i2c-stu300.txt F: arch/arm/boot/dts/ste-* F: arch/arm/mach-nomadik/ -F: arch/arm/mach-u300/ F: arch/arm/mach-ux500/ F: drivers/clk/clk-nomadik.c -F: drivers/clk/clk-u300.c F: drivers/clocksource/clksrc-dbx500-prcmu.c -F: drivers/clocksource/timer-u300.c -F: drivers/dma/coh901318* F: drivers/dma/ste_dma40* F: drivers/hwspinlock/u8500_hsem.c F: drivers/i2c/busses/i2c-nomadik.c -F: drivers/i2c/busses/i2c-stu300.c F: drivers/iio/adc/ab8500-gpadc.c -F: drivers/mfd/ab3100* F: drivers/mfd/ab8500* F: drivers/mfd/abx500* F: drivers/mfd/db8500* F: drivers/mfd/dbx500* F: drivers/pinctrl/nomadik/ -F: drivers/pinctrl/pinctrl-coh901* -F: drivers/pinctrl/pinctrl-u300.c -F: drivers/rtc/rtc-ab3100.c F: drivers/rtc/rtc-ab8500.c -F: drivers/rtc/rtc-coh901331.c F: drivers/rtc/rtc-pl031.c F: drivers/soc/ux500/ -F: drivers/watchdog/coh901327_wdt.c ARM/NUVOTON NPCM ARCHITECTURE M: Avi Fishman diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 70d6bfbcd164..6c423ee402ae 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -704,8 +704,6 @@ source "arch/arm/mach-sunxi/Kconfig" source "arch/arm/mach-tegra/Kconfig" -source "arch/arm/mach-u300/Kconfig" - source "arch/arm/mach-uniphier/Kconfig" source "arch/arm/mach-ux500/Kconfig" diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 543e29068c08..c36c5d4c6e9c 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -1280,14 +1280,6 @@ choice Say Y here if you want kernel low-level debugging support on Tegra based platforms. - config DEBUG_U300_UART - bool "Kernel low-level debugging messages via U300 UART0" - depends on ARCH_U300 - select DEBUG_UART_PL01X - help - Say Y here if you want the debug print routines to direct - their output to the uart port on U300 devices. - config DEBUG_UX500_UART depends on ARCH_U8500 bool "Use Ux500 UART for low-level debug" @@ -1650,7 +1642,6 @@ config DEBUG_UART_PHYS default 0x808c0000 if DEBUG_EP93XX || ARCH_EP93XX default 0x90020000 if DEBUG_NSPIRE_CLASSIC_UART || DEBUG_NSPIRE_CX_UART default 0xb0090000 if DEBUG_VEXPRESS_UART0_CRX - default 0xc0013000 if DEBUG_U300_UART default 0xc8000000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN default 0xc8000003 if ARCH_IXP4XX && CPU_BIG_ENDIAN default 0xd0000000 if DEBUG_SPEAR3XX @@ -1804,7 +1795,6 @@ config DEBUG_UART_VIRT default 0xfefb0000 if DEBUG_OMAP1UART1 || DEBUG_OMAP7XXUART1 default 0xfefb0800 if DEBUG_OMAP1UART2 || DEBUG_OMAP7XXUART2 default 0xfefb9800 if DEBUG_OMAP1UART3 || DEBUG_OMAP7XXUART3 - default 0xff003000 if DEBUG_U300_UART default 0xffd01000 if DEBUG_HIP01_UART default DEBUG_UART_PHYS if !MMU depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \ diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 1291fdc869f2..5887de173fc9 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -214,7 +214,6 @@ machine-$(CONFIG_ARCH_STI) += sti machine-$(CONFIG_ARCH_STM32) += stm32 machine-$(CONFIG_ARCH_SUNXI) += sunxi machine-$(CONFIG_ARCH_TEGRA) += tegra -machine-$(CONFIG_ARCH_U300) += u300 machine-$(CONFIG_ARCH_U8500) += ux500 machine-$(CONFIG_ARCH_VERSATILE) += versatile machine-$(CONFIG_ARCH_VEXPRESS) += vexpress diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index a13112f8730c..6d8abff55238 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1255,8 +1255,6 @@ dtb-$(CONFIG_ARCH_TEGRA_124_SOC) += \ tegra124-nyan-big.dtb \ tegra124-nyan-blaze.dtb \ tegra124-venice2.dtb -dtb-$(CONFIG_ARCH_U300) += \ - ste-u300.dtb dtb-$(CONFIG_ARCH_U8500) += \ ste-snowball.dtb \ ste-hrefprev60-stuib.dtb \ diff --git a/arch/arm/boot/dts/ste-u300.dts b/arch/arm/boot/dts/ste-u300.dts deleted file mode 100644 index f4e7660fead7..000000000000 diff --git a/arch/arm/configs/u300_defconfig b/arch/arm/configs/u300_defconfig deleted file mode 100644 index 543f07338100..000000000000 diff --git a/arch/arm/mach-u300/Kconfig b/arch/arm/mach-u300/Kconfig deleted file mode 100644 index c3c8bf54f033..000000000000 diff --git a/arch/arm/mach-u300/Makefile b/arch/arm/mach-u300/Makefile deleted file mode 100644 index 67f71ae45dfc..000000000000 diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c deleted file mode 100644 index a1694d977ec9..000000000000 diff --git a/arch/arm/mach-u300/regulator.c b/arch/arm/mach-u300/regulator.c deleted file mode 100644 index c0cc1d82e1b9..000000000000 diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig index 442a039b92f3..4b84fd36e384 100644 --- a/drivers/mtd/nand/raw/Kconfig +++ b/drivers/mtd/nand/raw/Kconfig @@ -331,8 +331,7 @@ source "drivers/mtd/nand/raw/ingenic/Kconfig" config MTD_NAND_FSMC tristate "ST Micros FSMC NAND controller" depends on OF && HAS_IOMEM - depends on PLAT_SPEAR || ARCH_NOMADIK || ARCH_U8500 || MACH_U300 || \ - COMPILE_TEST + depends on PLAT_SPEAR || ARCH_NOMADIK || ARCH_U8500 || COMPILE_TEST help Enables support for NAND Flash chips on the ST Microelectronics Flexible Static Memory Controller (FSMC) diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index aadaea052f51..74ea73a05981 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -601,7 +601,6 @@ config SPI_PIC32_SQI config SPI_PL022 tristate "ARM AMBA PL022 SSP controller" depends on ARM_AMBA - default y if MACH_U300 default y if ARCH_REALVIEW default y if INTEGRATOR_IMPD1 default y if ARCH_VERSATILE