From patchwork Mon Mar 25 17:26:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 13602565 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 03EC4C54E64 for ; Mon, 25 Mar 2024 17:27:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=SWffErFSCpFALS9AZhA+9lCu5vydkASbP4gl4RUsvxc=; b=qTiLFWmr+MkkWx JjumKxvKe8K3h7njVCquYRIa67X/On89mZeQTodS3v002EWwLVjOHoUvYLTiP26OpNx7fmCsa/+cY rEYkwGyBuS/Fn11mmaZC+LJOK+LRCkyxuPDByEgp2KH0PkM2WPU/BIMpaOW+uXPcfQqdrEbbYFWhS /PPGlSPtzhDOJTNe6WIWiULngRPQfmXniWTYSy6xR56WLfMMcPRX38ZddGFx0aRvf2a2ZCZ8Xrtnn 2Pe5defxeLETs4+n71Sd3rqB7+v5xHaiGWC1QYSftEv8wJsHFyR5ybqgLpqyL24FONICZDBF3aGyA wp+S280LKT50KFSW3YKw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1roo5t-000000012Bw-26qc; Mon, 25 Mar 2024 17:26:45 +0000 Received: from lelv0143.ext.ti.com ([198.47.23.248]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1roo5o-00000001299-0ldC for linux-arm-kernel@lists.infradead.org; Mon, 25 Mar 2024 17:26:42 +0000 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 42PHQL12061966; Mon, 25 Mar 2024 12:26:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1711387581; bh=u2R75byDJ62cMgKm2V1bDaB3tq9bjRG3tOWnOwtsXzc=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=aBNLEp5Wzf03RkEY1T66D4gpVGTtK8LdgGzBe9h8yOx18a92ruvv+30kgia40L0rT v+9/9VLpMJvh8+J1b0pdUSlxseUrsqy5Nvw9mwqXqTHaF46tdU+PWP1NJlDI6Yc2/D flZek70rkE0G27NBspllT+jOs/9IujN5P1m8vmLU= Received: from DLEE114.ent.ti.com (dlee114.ent.ti.com [157.170.170.25]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 42PHQL8K094182 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 25 Mar 2024 12:26:21 -0500 Received: from DLEE112.ent.ti.com (157.170.170.23) by DLEE114.ent.ti.com (157.170.170.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Mon, 25 Mar 2024 12:26:20 -0500 Received: from lelvsmtp5.itg.ti.com (10.180.75.250) by DLEE112.ent.ti.com (157.170.170.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Mon, 25 Mar 2024 12:26:21 -0500 Received: from lelvsmtp6.itg.ti.com ([10.249.42.149]) by lelvsmtp5.itg.ti.com (8.15.2/8.15.2) with ESMTP id 42PHQK81042985; Mon, 25 Mar 2024 12:26:20 -0500 From: Andrew Davis To: Russell King , Baruch Siach , Vladimir Zapolskiy , Masami Hiramatsu , Arnd Bergmann , Geert Uytterhoeven CC: , , Andrew Davis Subject: [PATCH v2 2/3] ARM: mach-lpc18xx: Rework support and directory structure Date: Mon, 25 Mar 2024 12:26:18 -0500 Message-ID: <20240325172619.113661-2-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240325172619.113661-1-afd@ti.com> References: <20240325172619.113661-1-afd@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240325_102640_403544_60070595 X-CRM114-Status: GOOD ( 20.91 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Having a platform need a mach-* directory should be seen as a negative, it means the platform needs special non-standard handling. ARM64 support does not allow mach-* directories at all. While we may not get to that given all the non-standard architectures we support, we should still try to get as close as we can and reduce the number of mach directories. The mach-lpc18xx/ directory and files, provides just one "feature": having the kernel print the machine name if the DTB does not also contain a "model" string (which they always do). To reduce the number of mach-* directories let's do without that feature and remove this directory. Note the fallback machine has a default l2c_aux_mask value set to ~0, which is different than the value of 0 used when none is provided. This is safe here as this platform does not use an l2x0 cache controller. Signed-off-by: Andrew Davis --- Changes from v1: - Updated commit desc with l2c_aux_mask info - Rebased on v6.9-rc1 arch/arm/Kconfig | 11 ----------- arch/arm/Kconfig.platforms | 11 +++++++++++ arch/arm/Makefile | 1 - arch/arm/mach-lpc18xx/Makefile | 2 -- arch/arm/mach-lpc18xx/board-dt.c | 19 ------------------- 5 files changed, 11 insertions(+), 33 deletions(-) delete mode 100644 arch/arm/mach-lpc18xx/Makefile delete mode 100644 arch/arm/mach-lpc18xx/board-dt.c diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9f55fd24c163a..66a16ee1ed8f1 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -459,17 +459,6 @@ source "arch/arm/mach-vt8500/Kconfig" source "arch/arm/mach-zynq/Kconfig" # ARMv7-M architecture -config ARCH_LPC18XX - bool "NXP LPC18xx/LPC43xx" - depends on ARM_SINGLE_ARMV7M - select ARCH_HAS_RESET_CONTROLLER - select ARM_AMBA - select CLKSRC_LPC32XX - select PINCTRL - help - Support for NXP's LPC18xx Cortex-M3 and LPC43xx Cortex-M4 - high performance microcontrollers. - config ARCH_MPS2 bool "ARM MPS2 platform" depends on ARM_SINGLE_ARMV7M diff --git a/arch/arm/Kconfig.platforms b/arch/arm/Kconfig.platforms index 5c19c1f2cff61..29fbed968d361 100644 --- a/arch/arm/Kconfig.platforms +++ b/arch/arm/Kconfig.platforms @@ -112,6 +112,17 @@ config ARCH_HPE_GXP endif +config ARCH_LPC18XX + bool "NXP LPC18xx/LPC43xx" + depends on ARM_SINGLE_ARMV7M + select ARCH_HAS_RESET_CONTROLLER + select ARM_AMBA + select CLKSRC_LPC32XX + select PINCTRL + help + Support for NXP's LPC18xx Cortex-M3 and LPC43xx Cortex-M4 + high performance microcontrollers. + menuconfig ARCH_MOXART bool "MOXA ART SoC" depends on ARCH_MULTI_V4 diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 131778fbc6827..8da36594c2f3f 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -184,7 +184,6 @@ machine-$(CONFIG_ARCH_HIGHBANK) += highbank machine-$(CONFIG_ARCH_HISI) += hisi machine-$(CONFIG_ARCH_IXP4XX) += ixp4xx machine-$(CONFIG_ARCH_KEYSTONE) += keystone -machine-$(CONFIG_ARCH_LPC18XX) += lpc18xx machine-$(CONFIG_ARCH_LPC32XX) += lpc32xx machine-$(CONFIG_ARCH_MESON) += meson machine-$(CONFIG_ARCH_MMP) += mmp diff --git a/arch/arm/mach-lpc18xx/Makefile b/arch/arm/mach-lpc18xx/Makefile deleted file mode 100644 index c80d80c199d37..0000000000000 --- a/arch/arm/mach-lpc18xx/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -obj-y += board-dt.o diff --git a/arch/arm/mach-lpc18xx/board-dt.c b/arch/arm/mach-lpc18xx/board-dt.c deleted file mode 100644 index 4729eb83401ae..0000000000000 --- a/arch/arm/mach-lpc18xx/board-dt.c +++ /dev/null @@ -1,19 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * Device Tree board file for NXP LPC18xx/43xx - * - * Copyright (C) 2015 Joachim Eastwood - */ - -#include - -static const char *const lpc18xx_43xx_compat[] __initconst = { - "nxp,lpc1850", - "nxp,lpc4350", - "nxp,lpc4370", - NULL -}; - -DT_MACHINE_START(LPC18XXDT, "NXP LPC18xx/43xx (Device Tree)") - .dt_compat = lpc18xx_43xx_compat, -MACHINE_END