From patchwork Mon May 15 16:02:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 13241721 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 3589BC7EE26 for ; Mon, 15 May 2023 16:03:33 +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: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:In-Reply-To:References: List-Owner; bh=zAqmVClQqjfzlCNNBbRVvQZ3wO8ppy7OYSQn0XD/zCA=; b=Rc8CCMXC/zfk8H iFNWhRNxtz9SNCnwNeRbXQk6ZY4FnyT9fNhSmQDd4ll1yqxBwGG317xUDG4LLdji5kAtsVzuX1fKY jbV43GLbqEEuCrsfZolzo320VfXPOtV+c17TJ5v4a/dU1tbsY/okxyJ0kWQhCbiZkFgFEUt9Jk4zL ZjmoVwoBhvVPAQGJGdoFBDsHThBhLUu0zYEzN09PO6OrNZRm8PoI+SpLV0TemTmowv+iyGB0slHXy gHyphxXHJosUo2a9o/qgMbt65D+U50aCrYzBhtWVhMspweSv5ldmte4A1SqzVydw7i2ZRru3++5oc jHL6XBbaIKO2wI5hBkNw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pyafH-002fI7-1A; Mon, 15 May 2023 16:03:11 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pyafA-002fF7-2K for linux-arm-kernel@bombadil.infradead.org; Mon, 15 May 2023 16:03:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Content-Transfer-Encoding :MIME-Version:Message-ID:Date:Subject:CC:To:From:Sender:Reply-To:Content-ID: Content-Description:In-Reply-To:References; bh=Oa6IBatsIaVeBtx9IqnQa720cOdZAC2k9zv9qk3N9Lk=; b=CyerLgzN63CoL8Ee7PaPeDBx/1 w6n8xG802awrp44FXvgFMlFPAVbWYfQyjvmC7s7YxYUp8j3VvtUEsymKSTjq7HvQVMpgUbL09sZtF ScWoqweX4zquUtHYqy01XRDudBrC99pargqmaQXo2tpOn3uz8VZ8m07gNnktGhnzgxNxo04W17H2X 6sYTsBppLT5RqGlxJgtPTUeXJ67DFXyAQqCLOUnDYnRXpaqgZvIS/XNDBGlWPRSkANeafZ/s06/ws rLR0lPpo6zy088OLCnOMX0aMERBtq4xS76HFdzAJMXCUNG3JsX4nccBPsyKgP5ZDJUq+9azi+Sqld weUN7Gew==; Received: from lelv0143.ext.ti.com ([198.47.23.248]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pyaf4-00BVwS-2W for linux-arm-kernel@lists.infradead.org; Mon, 15 May 2023 16:03:02 +0000 Received: from fllv0034.itg.ti.com ([10.64.40.246]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 34FG2adM005215; Mon, 15 May 2023 11:02:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1684166556; bh=Oa6IBatsIaVeBtx9IqnQa720cOdZAC2k9zv9qk3N9Lk=; h=From:To:CC:Subject:Date; b=boe9RsqSyH737gaG1kMrwQlxo4AJG4qxTkrby/Dd2N4gNUiFT1xTNYt1Q9qi5eYO1 RbVs41jR0y1dH1ibQ0vHeZotxrAjEIAR5N+8YKEYxPdyhgbiYAzq2sdmpoPRfeSuyS wr9rQqSKdofBI9CWXIdXVQp9nQdqJZHlewZerhH0= Received: from DFLE110.ent.ti.com (dfle110.ent.ti.com [10.64.6.31]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 34FG2aUY034512 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 15 May 2023 11:02:36 -0500 Received: from DFLE100.ent.ti.com (10.64.6.21) by DFLE110.ent.ti.com (10.64.6.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Mon, 15 May 2023 11:02:36 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DFLE100.ent.ti.com (10.64.6.21) 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, 15 May 2023 11:02:35 -0500 Received: from lelv0327.itg.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 34FG2ZR0029578; Mon, 15 May 2023 11:02:35 -0500 From: Andrew Davis To: Russell King , Baruch Siach , Vladimir Zapolskiy , Kunihiko Hayashi , Masami Hiramatsu , Arnd Bergmann , Geert Uytterhoeven , Linus Walleij CC: , , Andrew Davis Subject: [PATCH 01/10] ARM: Kconfig: move platform selection into its own Kconfig file Date: Mon, 15 May 2023 11:02:25 -0500 Message-ID: <20230515160234.289631-1-afd@ti.com> X-Mailer: git-send-email 2.39.2 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-20230515_170259_162502_9EFB696C X-CRM114-Status: GOOD ( 14.40 ) 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 Mostly just for better organization for now. This matches what is done on some other platforms including ARM64. This also lets us start to reduce the number of mach- directories that only exist to store the platform selection. Start with "Platform selection" and ARCH_VIRT. Signed-off-by: Andrew Davis --- arch/arm/Kconfig | 67 +------------------------------------ arch/arm/Kconfig.platforms | 68 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 66 deletions(-) create mode 100644 arch/arm/Kconfig.platforms diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 0fb4b218f665..23e3e344f9c0 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -336,72 +336,7 @@ config ARCH_MULTIPLATFORM Selecting N here allows using those options, including DEBUG_UNCOMPRESS, XIP_KERNEL and ZBOOT_ROM. If unsure, say Y. -menu "Platform selection" - depends on MMU - -comment "CPU Core family selection" - -config ARCH_MULTI_V4 - bool "ARMv4 based platforms (FA526, StrongARM)" - depends on !ARCH_MULTI_V6_V7 - # https://github.com/llvm/llvm-project/issues/50764 - depends on !LD_IS_LLD || LLD_VERSION >= 160000 - select ARCH_MULTI_V4_V5 - select CPU_FA526 if !(CPU_SA110 || CPU_SA1100) - -config ARCH_MULTI_V4T - bool "ARMv4T based platforms (ARM720T, ARM920T, ...)" - depends on !ARCH_MULTI_V6_V7 - # https://github.com/llvm/llvm-project/issues/50764 - depends on !LD_IS_LLD || LLD_VERSION >= 160000 - select ARCH_MULTI_V4_V5 - select CPU_ARM920T if !(CPU_ARM7TDMI || CPU_ARM720T || \ - CPU_ARM740T || CPU_ARM9TDMI || CPU_ARM922T || \ - CPU_ARM925T || CPU_ARM940T) - -config ARCH_MULTI_V5 - bool "ARMv5 based platforms (ARM926T, XSCALE, PJ1, ...)" - depends on !ARCH_MULTI_V6_V7 - select ARCH_MULTI_V4_V5 - select CPU_ARM926T if !(CPU_ARM946E || CPU_ARM1020 || \ - CPU_ARM1020E || CPU_ARM1022 || CPU_ARM1026 || \ - CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_FEROCEON) - -config ARCH_MULTI_V4_V5 - bool - -config ARCH_MULTI_V6 - bool "ARMv6 based platforms (ARM11)" - select ARCH_MULTI_V6_V7 - select CPU_V6K - -config ARCH_MULTI_V7 - bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)" - default y - select ARCH_MULTI_V6_V7 - select CPU_V7 - select HAVE_SMP - -config ARCH_MULTI_V6_V7 - bool - select MIGHT_HAVE_CACHE_L2X0 - -config ARCH_MULTI_CPU_AUTO - def_bool !(ARCH_MULTI_V4 || ARCH_MULTI_V4T || ARCH_MULTI_V6_V7) - select ARCH_MULTI_V5 - -endmenu - -config ARCH_VIRT - bool "Dummy Virtual Machine" - depends on ARCH_MULTI_V7 - select ARM_AMBA - select ARM_GIC - select ARM_GIC_V2M if PCI - select ARM_GIC_V3 - select ARM_GIC_V3_ITS if PCI - select ARM_PSCI - select HAVE_ARM_ARCH_TIMER +source "arch/arm/Kconfig.platforms" config ARCH_AIROHA bool "Airoha SoC Support" diff --git a/arch/arm/Kconfig.platforms b/arch/arm/Kconfig.platforms new file mode 100644 index 000000000000..ed1f6da11e24 --- /dev/null +++ b/arch/arm/Kconfig.platforms @@ -0,0 +1,68 @@ +# SPDX-License-Identifier: GPL-2.0-only + +menu "Platform selection" + depends on MMU + +comment "CPU Core family selection" + +config ARCH_MULTI_V4 + bool "ARMv4 based platforms (FA526, StrongARM)" + depends on !ARCH_MULTI_V6_V7 + # https://github.com/llvm/llvm-project/issues/50764 + depends on !LD_IS_LLD || LLD_VERSION >= 160000 + select ARCH_MULTI_V4_V5 + select CPU_FA526 if !(CPU_SA110 || CPU_SA1100) + +config ARCH_MULTI_V4T + bool "ARMv4T based platforms (ARM720T, ARM920T, ...)" + depends on !ARCH_MULTI_V6_V7 + # https://github.com/llvm/llvm-project/issues/50764 + depends on !LD_IS_LLD || LLD_VERSION >= 160000 + select ARCH_MULTI_V4_V5 + select CPU_ARM920T if !(CPU_ARM7TDMI || CPU_ARM720T || \ + CPU_ARM740T || CPU_ARM9TDMI || CPU_ARM922T || \ + CPU_ARM925T || CPU_ARM940T) + +config ARCH_MULTI_V5 + bool "ARMv5 based platforms (ARM926T, XSCALE, PJ1, ...)" + depends on !ARCH_MULTI_V6_V7 + select ARCH_MULTI_V4_V5 + select CPU_ARM926T if !(CPU_ARM946E || CPU_ARM1020 || \ + CPU_ARM1020E || CPU_ARM1022 || CPU_ARM1026 || \ + CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_FEROCEON) + +config ARCH_MULTI_V4_V5 + bool + +config ARCH_MULTI_V6 + bool "ARMv6 based platforms (ARM11)" + select ARCH_MULTI_V6_V7 + select CPU_V6K + +config ARCH_MULTI_V7 + bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)" + default y + select ARCH_MULTI_V6_V7 + select CPU_V7 + select HAVE_SMP + +config ARCH_MULTI_V6_V7 + bool + select MIGHT_HAVE_CACHE_L2X0 + +config ARCH_MULTI_CPU_AUTO + def_bool !(ARCH_MULTI_V4 || ARCH_MULTI_V4T || ARCH_MULTI_V6_V7) + select ARCH_MULTI_V5 + +endmenu + +config ARCH_VIRT + bool "Dummy Virtual Machine" + depends on ARCH_MULTI_V7 + select ARM_AMBA + select ARM_GIC + select ARM_GIC_V2M if PCI + select ARM_GIC_V3 + select ARM_GIC_V3_ITS if PCI + select ARM_PSCI + select HAVE_ARM_ARCH_TIMER From patchwork Mon May 15 16:02:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 13241726 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 D3A82C7EE26 for ; Mon, 15 May 2023 16:03:38 +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=pNEZ4nnbSM/6D3XZoPjvpSXx5wIlNSlJF3F1sSip12Q=; b=d8S8rOT9tuzn3M d27WLpTMDHdq5BdJ2rmkIBVYIzFvg1DsvN2Ln/lQZkeNpcqv1zvMZpE0fCveyZRRTcPpr6RLiGEOs aCXSbluCtsDmhgmRqqnoOAW2RoyL+54a7VPwKRzHkLf5tda272xTqNCTEXqbQdgtTEYIIdRwOrCIb jW7VQWzI9ibPt4yezhCuYymhxAgGTbxGeldhQv/uEFqIsLYA2Q/MAyTu9ReXSUKlMGK3Q8PbV5I4k B5TJt6CMh8ws0vXZb0Kah8gSjxATb/NkBpX6H92CIb/PSprdPsGEjk2eWnDOzQwqD6iIE1TvGwJKO fwZp/4IJOdca2CpX2IZg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pyafH-002fIP-33; Mon, 15 May 2023 16:03:11 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pyafA-002fEf-2r for linux-arm-kernel@bombadil.infradead.org; Mon, 15 May 2023 16:03:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Content-Transfer-Encoding :MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From: Sender:Reply-To:Content-ID:Content-Description; bh=sO2n3QpgEqsuayu9y+SZkmQDkAI3LQSlLH/Zd1n/S98=; b=nYShLiVb/rwt5XXOc3Qa2SXRa5 lG5YJ8QQsvyMjdIwdpdbSSsMklKTq6VRYempv+KhaDeuA0CmInJZ7J0mLogn6r48cvFcMXvpdCa7k n4bVmNBIas5DaHHw7aPzI1GKLADCEaaCu7kIPmuRZVr+V5BW2VJTvu+OYXdTqnja944pTMO4v3bck SoxqgP2LK1Z5an3SKKNgJ8ZG3GfrUEJe7DMJXdBt84vRg5eFGtAki2NCSFi0YrBw8c2Aarbi2Vigs bcXjT+zR51jJlDnaNZw2ioIPn1a+H0QFvbas7lDKltqjsMrqdhp49Zbq17CfEhjDZi0bEK1OOyeYp bzwzc/Bg==; Received: from lelv0142.ext.ti.com ([198.47.23.249]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pyaf3-00BVwP-37 for linux-arm-kernel@lists.infradead.org; Mon, 15 May 2023 16:03:03 +0000 Received: from fllv0034.itg.ti.com ([10.64.40.246]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 34FG2cuw119225; Mon, 15 May 2023 11:02:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1684166558; bh=sO2n3QpgEqsuayu9y+SZkmQDkAI3LQSlLH/Zd1n/S98=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=yQ2wAcwrJf0+7alBxTsIOFG3nifMzQMQdtbvfqzKUEBtSZ0R6yBJgHaOzb1yEzoew GviP5dQIiWJXDfyu+xG22YzlknAzCt1jl823ind0biwrq/7uG/Rcl2RbTZYqJz9vwy LRG0YJRCrcfv4/2eBc3nUPlnSFlSAsHzgTkIg5lI= Received: from DFLE108.ent.ti.com (dfle108.ent.ti.com [10.64.6.29]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 34FG2chU034520 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 15 May 2023 11:02:38 -0500 Received: from DFLE112.ent.ti.com (10.64.6.33) by DFLE108.ent.ti.com (10.64.6.29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Mon, 15 May 2023 11:02:36 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DFLE112.ent.ti.com (10.64.6.33) 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, 15 May 2023 11:02:36 -0500 Received: from lelv0327.itg.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 34FG2ZR1029578; Mon, 15 May 2023 11:02:36 -0500 From: Andrew Davis To: Russell King , Baruch Siach , Vladimir Zapolskiy , Kunihiko Hayashi , Masami Hiramatsu , Arnd Bergmann , Geert Uytterhoeven , Linus Walleij CC: , , Andrew Davis Subject: [PATCH 02/10] ARM: mach-asm9260: Move ASM9260 support into Kconfig.platforms Date: Mon, 15 May 2023 11:02:26 -0500 Message-ID: <20230515160234.289631-2-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230515160234.289631-1-afd@ti.com> References: <20230515160234.289631-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-20230515_170259_155750_FF113B4B X-CRM114-Status: GOOD ( 12.90 ) 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 This removes the need for a dedicated Kconfig and mach directory. Signed-off-by: Andrew Davis --- arch/arm/Kconfig | 2 -- arch/arm/Kconfig.platforms | 9 +++++++++ arch/arm/mach-asm9260/Kconfig | 9 --------- 3 files changed, 9 insertions(+), 11 deletions(-) delete mode 100644 arch/arm/mach-asm9260/Kconfig diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 23e3e344f9c0..5a047fd6b12a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -360,8 +360,6 @@ source "arch/arm/mach-alpine/Kconfig" source "arch/arm/mach-artpec/Kconfig" -source "arch/arm/mach-asm9260/Kconfig" - source "arch/arm/mach-aspeed/Kconfig" source "arch/arm/mach-at91/Kconfig" diff --git a/arch/arm/Kconfig.platforms b/arch/arm/Kconfig.platforms index ed1f6da11e24..b80a5b49d276 100644 --- a/arch/arm/Kconfig.platforms +++ b/arch/arm/Kconfig.platforms @@ -66,3 +66,12 @@ config ARCH_VIRT select ARM_GIC_V3_ITS if PCI select ARM_PSCI select HAVE_ARM_ARCH_TIMER + +config MACH_ASM9260 + bool "Alphascale ASM9260" + depends on ARCH_MULTI_V5 + depends on CPU_LITTLE_ENDIAN + select CPU_ARM926T + select ASM9260_TIMER + help + Support for Alphascale ASM9260 based platform. diff --git a/arch/arm/mach-asm9260/Kconfig b/arch/arm/mach-asm9260/Kconfig deleted file mode 100644 index 74e0f61c74c8..000000000000 --- a/arch/arm/mach-asm9260/Kconfig +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -config MACH_ASM9260 - bool "Alphascale ASM9260" - depends on ARCH_MULTI_V5 - depends on CPU_LITTLE_ENDIAN - select CPU_ARM926T - select ASM9260_TIMER - help - Support for Alphascale ASM9260 based platform. From patchwork Mon May 15 16:02:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 13241720 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 93226C7EE23 for ; Mon, 15 May 2023 16:03:32 +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=SRil1uuV79m2n39JhE67eP/u3+gRUEsrxbplmJ9Mfl4=; b=jT0VSxQNfeM0oe Iau0+kBkiM9V9P1Iz5VHfDfAi/qre/ciGUWrpW9XZVfrew11csIt4sG32vIqK5eXBXrXC1TEfZg5k TBRfAeuuMpxDTjD9rd64ygHtf+riaegU6qgCDBhKN/OnE6mfF8/qOjN7DdWvdsFmNuYkkp8Zb+gZF sBCm3CkYEFpu9U7GYlf54vrq/dWmcyNtkl35RU+5rLgPXTMhi8ULCGtxXkbV+oufWwgt2Fzu4ypSg FUIZ96qSIw/mJ3aCWNKqqKTs7GJOzDXy3xHOk2qXl5IXJzU3Z4p0x0Kfg38W27UuYYLCbTgqmhPb7 TJUQg5dT7ojlloaMFp8w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pyafE-002fFw-19; Mon, 15 May 2023 16:03:08 +0000 Received: from fllv0015.ext.ti.com ([198.47.19.141]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pyaf2-002fCu-2a for linux-arm-kernel@lists.infradead.org; Mon, 15 May 2023 16:02:58 +0000 Received: from fllv0034.itg.ti.com ([10.64.40.246]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 34FG2bOU004404; Mon, 15 May 2023 11:02:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1684166557; bh=a5SYVmAok1YJ/oGVJSMi5rZ+H8GMZeDc8MDpgYsIOFo=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=x2ziy4UcWjOdjut7GGuQ7suDqO7e/8U5nAx3tE4hSPfZOSdvJjCm2dj/VDJyPuy19 c627qmKUAfAQFz7Qf75LBih6sOXLks2L/3XJE9FeSCTGg2rp2wZQT7OoWTkJm3K//g UkRd9Wa7ODBUDlkhRA+xigcj6h1SHO+pCDEOK+dM= Received: from DFLE110.ent.ti.com (dfle110.ent.ti.com [10.64.6.31]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 34FG2bqp034516 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 15 May 2023 11:02:37 -0500 Received: from DFLE100.ent.ti.com (10.64.6.21) by DFLE110.ent.ti.com (10.64.6.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Mon, 15 May 2023 11:02:37 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DFLE100.ent.ti.com (10.64.6.21) 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, 15 May 2023 11:02:37 -0500 Received: from lelv0327.itg.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 34FG2ZR2029578; Mon, 15 May 2023 11:02:36 -0500 From: Andrew Davis To: Russell King , Baruch Siach , Vladimir Zapolskiy , Kunihiko Hayashi , Masami Hiramatsu , Arnd Bergmann , Geert Uytterhoeven , Linus Walleij CC: , , Andrew Davis Subject: [PATCH 03/10] ARM: mach-rda: Move RDA Micro support into Kconfig.platforms Date: Mon, 15 May 2023 11:02:27 -0500 Message-ID: <20230515160234.289631-3-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230515160234.289631-1-afd@ti.com> References: <20230515160234.289631-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-20230515_090256_937027_43DCCB66 X-CRM114-Status: GOOD ( 13.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 This removes the need for a dedicated Kconfig and empty mach directory. Signed-off-by: Andrew Davis --- arch/arm/Kconfig | 2 -- arch/arm/Kconfig.platforms | 8 ++++++++ arch/arm/mach-rda/Kconfig | 8 -------- 3 files changed, 8 insertions(+), 10 deletions(-) delete mode 100644 arch/arm/mach-rda/Kconfig diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5a047fd6b12a..62073a43933c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -434,8 +434,6 @@ source "arch/arm/mach-pxa/Kconfig" source "arch/arm/mach-qcom/Kconfig" -source "arch/arm/mach-rda/Kconfig" - source "arch/arm/mach-realtek/Kconfig" source "arch/arm/mach-rpc/Kconfig" diff --git a/arch/arm/Kconfig.platforms b/arch/arm/Kconfig.platforms index b80a5b49d276..80f5b040e6ef 100644 --- a/arch/arm/Kconfig.platforms +++ b/arch/arm/Kconfig.platforms @@ -75,3 +75,11 @@ config MACH_ASM9260 select ASM9260_TIMER help Support for Alphascale ASM9260 based platform. + +config ARCH_RDA + bool "RDA Micro SoCs" + depends on ARCH_MULTI_V7 + select RDA_INTC + select RDA_TIMER + help + This enables support for the RDA Micro 8810PL SoC family. diff --git a/arch/arm/mach-rda/Kconfig b/arch/arm/mach-rda/Kconfig deleted file mode 100644 index 4d2e4e046cb3..000000000000 --- a/arch/arm/mach-rda/Kconfig +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -menuconfig ARCH_RDA - bool "RDA Micro SoCs" - depends on ARCH_MULTI_V7 - select RDA_INTC - select RDA_TIMER - help - This enables support for the RDA Micro 8810PL SoC family. From patchwork Mon May 15 16:02:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 13241725 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 67CA2C77B75 for ; Mon, 15 May 2023 16:03:36 +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=BCTHSnKm4GqUo35swGHp5BVB0FDIfNNE11Rk06K2I/A=; b=gXadC0AVYteIcj VgRIw+LZLZY3xRqL4rf02600KVO1aPeZOlqGvW8L3tTodQ+TDbPEFwor6KGZkq3lpCrifL4bG4Pz5 QhDexer8BisYZaxk4Whsa+vOrwAk4M4+62K0O2zNAAMwtJIix+x2Ep4LcZWMo1CWVELQ4w+UGHKVE 2844O10jay+kt4YmE8g3yhv+qUSMhj6TbCc5Fz578Xsi7lxbL0Pjvt0u/FhnyMfGYlJ3cmNrGVfRp iuyeXH7Q+kLPCp5YTItCAysNQ8tWS8nH8ZlETvxJI+Iif9WG1r/Q4e9sNBMseyQr5IQr6qFDUtLRo giAInVg8BwVyyT64f9Kg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pyafG-002fHM-2I; Mon, 15 May 2023 16:03:10 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pyafA-002fF7-0r for linux-arm-kernel@bombadil.infradead.org; Mon, 15 May 2023 16:03:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Content-Transfer-Encoding :MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From: Sender:Reply-To:Content-ID:Content-Description; bh=CvWvVH18srmviV9eFau3ExXHkDGCjygPOjSsZR1D5Qc=; b=RCQauZKt4MtoQsMG1ZZW7kHyIo mrbipr8oq/CIkIAf5StW9i2Ye6DU16xaPGJlkk8iPomD9KRKgHX0/gkqVLxaO61UOujtgmatL3+jv 8g2ONZNuL0ukqOH7oJPWqCo8UmkR+5hvqzl1zDVoFCoxvsm56hc9NvqQ//H2otsmMmoWQH5O2Aabc QD2n/mcXCLQg7J91g65EO/rGIwjC5Sd8VSdi6/Wc9ySpkdfyuGPZPRt8I9rYhFG8QFGWRwkmIpIT3 GQ9s9NsBaJwtV8wY5xSEgNf1q6C5rFoBMUNu3I2fJes7JxHqd68XX3fHR/d6mDIvTR3MKsxNSXCQZ VW7ZFN9A==; Received: from fllv0015.ext.ti.com ([198.47.19.141]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pyaf4-00BVwT-2m for linux-arm-kernel@lists.infradead.org; Mon, 15 May 2023 16:03:02 +0000 Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 34FG2cN7004409; Mon, 15 May 2023 11:02:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1684166558; bh=CvWvVH18srmviV9eFau3ExXHkDGCjygPOjSsZR1D5Qc=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=si6eZcg/SfwtqS0U/MmbAQmT6BRR8aoEtPKMPRctW22OLegmq2BovFN1mps13tHAg YcgZ4UL9HiEdL32gYzx/3JXeP0A8QFA/hRf0OEMQ8IWK0muziPlh7uvlIjkyhXkxO6 dqFHUoTGJNLwpEiiRyWAdmU/ea58tcw03UE6Bvq8= Received: from DLEE114.ent.ti.com (dlee114.ent.ti.com [157.170.170.25]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 34FG2cF8060787 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 15 May 2023 11:02:38 -0500 Received: from DLEE114.ent.ti.com (157.170.170.25) 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, 15 May 2023 11:02:37 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) 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 via Frontend Transport; Mon, 15 May 2023 11:02:37 -0500 Received: from lelv0327.itg.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 34FG2ZR3029578; Mon, 15 May 2023 11:02:37 -0500 From: Andrew Davis To: Russell King , Baruch Siach , Vladimir Zapolskiy , Kunihiko Hayashi , Masami Hiramatsu , Arnd Bergmann , Geert Uytterhoeven , Linus Walleij CC: , , Andrew Davis Subject: [PATCH 04/10] ARM: mach-uniphier: Move Socionext UniPhier support into Kconfig.platforms Date: Mon, 15 May 2023 11:02:28 -0500 Message-ID: <20230515160234.289631-4-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230515160234.289631-1-afd@ti.com> References: <20230515160234.289631-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-20230515_170259_185815_C88BE6A1 X-CRM114-Status: GOOD ( 14.01 ) 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 This removes the need for a dedicated Kconfig and empty mach directory. Signed-off-by: Andrew Davis --- MAINTAINERS | 1 - arch/arm/Kconfig | 2 -- arch/arm/Kconfig.platforms | 15 +++++++++++++++ arch/arm/mach-uniphier/Kconfig | 15 --------------- 4 files changed, 15 insertions(+), 18 deletions(-) delete mode 100644 arch/arm/mach-uniphier/Kconfig diff --git a/MAINTAINERS b/MAINTAINERS index e0ad886d3163..b4d226f87413 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2977,7 +2977,6 @@ F: Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.yaml F: Documentation/devicetree/bindings/soc/socionext/socionext,uniphier*.yaml F: arch/arm/boot/dts/uniphier* F: arch/arm/include/asm/hardware/cache-uniphier.h -F: arch/arm/mach-uniphier/ F: arch/arm/mm/cache-uniphier.c F: arch/arm64/boot/dts/socionext/uniphier* F: drivers/bus/uniphier-system-bus.c diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 62073a43933c..75d56ad5eb27 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -462,8 +462,6 @@ source "arch/arm/mach-sunxi/Kconfig" source "arch/arm/mach-tegra/Kconfig" -source "arch/arm/mach-uniphier/Kconfig" - source "arch/arm/mach-ux500/Kconfig" source "arch/arm/mach-versatile/Kconfig" diff --git a/arch/arm/Kconfig.platforms b/arch/arm/Kconfig.platforms index 80f5b040e6ef..0e6d7172bf61 100644 --- a/arch/arm/Kconfig.platforms +++ b/arch/arm/Kconfig.platforms @@ -83,3 +83,18 @@ config ARCH_RDA select RDA_TIMER help This enables support for the RDA Micro 8810PL SoC family. + +config ARCH_UNIPHIER + bool "Socionext UniPhier SoCs" + depends on ARCH_MULTI_V7 + select ARCH_HAS_RESET_CONTROLLER + select ARM_AMBA + select ARM_GLOBAL_TIMER + select ARM_GIC + select HAVE_ARM_SCU + select HAVE_ARM_TWD if SMP + select PINCTRL + select RESET_CONTROLLER + help + Support for UniPhier SoC family developed by Socionext Inc. + (formerly, System LSI Business Division of Panasonic Corporation) diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig deleted file mode 100644 index e661d2626675..000000000000 --- a/arch/arm/mach-uniphier/Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -config ARCH_UNIPHIER - bool "Socionext UniPhier SoCs" - depends on ARCH_MULTI_V7 - select ARCH_HAS_RESET_CONTROLLER - select ARM_AMBA - select ARM_GLOBAL_TIMER - select ARM_GIC - select HAVE_ARM_SCU - select HAVE_ARM_TWD if SMP - select PINCTRL - select RESET_CONTROLLER - help - Support for UniPhier SoC family developed by Socionext Inc. - (formerly, System LSI Business Division of Panasonic Corporation) From patchwork Mon May 15 16:02:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 13241859 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 BDC97C7EE23 for ; Mon, 15 May 2023 17:15:24 +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=6pklKefe9TsAhaerpvtxvk6VhCwdrzVtxMgn5Uo7Rlw=; b=cUm/B0r4D7Kmop OSIUJKXD1i1qBXUjecjtX277Xfct/o9rfM15HEoq5QgHERV4YZr+03QMhyvApcqX406Bdm/eCXY5M yQ5enDD1sZMb93yo97OTgdl5e9uVn6BpQtsjTDgruZWa4jV5Uc3uj5k/ecqP+5hiutQo6JzCtNPbJ t9fK7yvLt9sPz6tgQr4uL4HVjQbPvBkRh9qQXffIqJBhJDJ9jopLrsLAPj67Iu3+lwiDiRo8v5TbT 3DBpP299FJAWpwjStshxJ4X2ZBbOUHy/HQHwGbyLoYI3zKD9paOCRfCaHewjrtDG57xdTRhgozgzx 8/Bf/Mu2SmJjZUoMUkPw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pybn5-002the-0K; Mon, 15 May 2023 17:15:19 +0000 Received: from fllv0015.ext.ti.com ([198.47.19.141]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pyaf2-002fCt-23 for linux-arm-kernel@lists.infradead.org; Mon, 15 May 2023 16:02:58 +0000 Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 34FG2cah004414; Mon, 15 May 2023 11:02:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1684166559; bh=fWiAiLfECMa60sdqN8J4wC3WNRsL94eqtGa4ZSYPaxE=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=FgAVNlsQc4wJDMCaLdZYMH6cPBEjDI4PsHP49t5TDJYfbOdmOtspKjIE3i4V9dNIz Z1i4FBwkmTFvDv6Y8nZYM4LtibqwP+PsQ7qbx0wisCkxTBdtIS5S79mC1G7Qm2QSs4 lTE4KrrE7O7EHCtGchKFmwuLHGw6epV86RsmM4Ww= Received: from DFLE113.ent.ti.com (dfle113.ent.ti.com [10.64.6.34]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 34FG2cBZ060800 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 15 May 2023 11:02:38 -0500 Received: from DFLE108.ent.ti.com (10.64.6.29) by DFLE113.ent.ti.com (10.64.6.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Mon, 15 May 2023 11:02:38 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DFLE108.ent.ti.com (10.64.6.29) 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, 15 May 2023 11:02:38 -0500 Received: from lelv0327.itg.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 34FG2ZR4029578; Mon, 15 May 2023 11:02:37 -0500 From: Andrew Davis To: Russell King , Baruch Siach , Vladimir Zapolskiy , Kunihiko Hayashi , Masami Hiramatsu , Arnd Bergmann , Geert Uytterhoeven , Linus Walleij CC: , , Andrew Davis Subject: [PATCH 05/10] ARM: mach-moxart: Move MOXA ART support into Kconfig.platforms Date: Mon, 15 May 2023 11:02:29 -0500 Message-ID: <20230515160234.289631-5-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230515160234.289631-1-afd@ti.com> References: <20230515160234.289631-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-20230515_090256_771689_A67764C0 X-CRM114-Status: GOOD ( 15.52 ) 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 This removes the need for a dedicated Kconfig and empty mach directory. Signed-off-by: Andrew Davis --- arch/arm/Kconfig | 2 -- arch/arm/Kconfig.platforms | 28 ++++++++++++++++++++++++++++ arch/arm/Makefile | 1 - arch/arm/mach-moxart/Kconfig | 28 ---------------------------- arch/arm/mach-moxart/Makefile | 4 ---- arch/arm/mach-moxart/moxart.c | 6 ------ 6 files changed, 28 insertions(+), 41 deletions(-) delete mode 100644 arch/arm/mach-moxart/Kconfig delete mode 100644 arch/arm/mach-moxart/Makefile delete mode 100644 arch/arm/mach-moxart/moxart.c diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 75d56ad5eb27..e7351a683545 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -408,8 +408,6 @@ source "arch/arm/mach-milbeaut/Kconfig" source "arch/arm/mach-mmp/Kconfig" -source "arch/arm/mach-moxart/Kconfig" - source "arch/arm/mach-mstar/Kconfig" source "arch/arm/mach-mv78xx0/Kconfig" diff --git a/arch/arm/Kconfig.platforms b/arch/arm/Kconfig.platforms index 0e6d7172bf61..4b5fad18ca8b 100644 --- a/arch/arm/Kconfig.platforms +++ b/arch/arm/Kconfig.platforms @@ -76,6 +76,34 @@ config MACH_ASM9260 help Support for Alphascale ASM9260 based platform. +menuconfig ARCH_MOXART + bool "MOXA ART SoC" + depends on ARCH_MULTI_V4 + depends on CPU_LITTLE_ENDIAN + select CPU_FA526 + select ARM_DMA_MEM_BUFFERABLE + select FARADAY_FTINTC010 + select FTTMR010_TIMER + select GPIOLIB + select PHYLIB if NETDEVICES + help + Say Y here if you want to run your kernel on hardware with a + MOXA ART SoC. + The MOXA ART SoC is based on a Faraday FA526 ARMv4 32-bit + 192 MHz CPU with MMU and 16KB/8KB D/I-cache (UC-7112-LX). + Used on models UC-7101, UC-7112/UC-7110, IA240/IA241, IA3341. + +if ARCH_MOXART + +config MACH_UC7112LX + bool "MOXA UC-7112-LX" + depends on ARCH_MOXART + help + Say Y here if you intend to run this kernel on a MOXA + UC-7112-LX embedded computer. + +endif + config ARCH_RDA bool "RDA Micro SoCs" depends on ARCH_MULTI_V7 diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 547e5856eaa0..32e99aa282bf 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -192,7 +192,6 @@ machine-$(CONFIG_ARCH_LPC18XX) += lpc18xx machine-$(CONFIG_ARCH_LPC32XX) += lpc32xx machine-$(CONFIG_ARCH_MESON) += meson machine-$(CONFIG_ARCH_MMP) += mmp -machine-$(CONFIG_ARCH_MOXART) += moxart machine-$(CONFIG_ARCH_MV78XX0) += mv78xx0 machine-$(CONFIG_ARCH_MVEBU) += mvebu machine-$(CONFIG_ARCH_MXC) += imx diff --git a/arch/arm/mach-moxart/Kconfig b/arch/arm/mach-moxart/Kconfig deleted file mode 100644 index 909c6573ba8b..000000000000 --- a/arch/arm/mach-moxart/Kconfig +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -menuconfig ARCH_MOXART - bool "MOXA ART SoC" - depends on ARCH_MULTI_V4 - depends on CPU_LITTLE_ENDIAN - select CPU_FA526 - select ARM_DMA_MEM_BUFFERABLE - select FARADAY_FTINTC010 - select FTTMR010_TIMER - select GPIOLIB - select PHYLIB if NETDEVICES - help - Say Y here if you want to run your kernel on hardware with a - MOXA ART SoC. - The MOXA ART SoC is based on a Faraday FA526 ARMv4 32-bit - 192 MHz CPU with MMU and 16KB/8KB D/I-cache (UC-7112-LX). - Used on models UC-7101, UC-7112/UC-7110, IA240/IA241, IA3341. - -if ARCH_MOXART - -config MACH_UC7112LX - bool "MOXA UC-7112-LX" - depends on ARCH_MOXART - help - Say Y here if you intend to run this kernel on a MOXA - UC-7112-LX embedded computer. - -endif diff --git a/arch/arm/mach-moxart/Makefile b/arch/arm/mach-moxart/Makefile deleted file mode 100644 index ded3e38fb98d..000000000000 --- a/arch/arm/mach-moxart/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -# Object file lists. - -obj-$(CONFIG_MACH_UC7112LX) += moxart.o diff --git a/arch/arm/mach-moxart/moxart.c b/arch/arm/mach-moxart/moxart.c deleted file mode 100644 index f1f58c0c0fa1..000000000000 --- a/arch/arm/mach-moxart/moxart.c +++ /dev/null @@ -1,6 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* - * arch/arm/mach-moxart/moxart.c - * - * (C) Copyright 2013, Jonas Jensen - */ From patchwork Mon May 15 16:02:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 13241724 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 76A7EC7EE22 for ; Mon, 15 May 2023 16:03:35 +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=K9KNdMQwWHDjOzbsdZG+bfPTd/F/nMUk9ZdZha8iuzE=; b=XtkKu7uyBzG8s4 buQy0dF4dcWaKTI+PnIsa1+F5IBoEq1w33Gn/VJV9+Ldk8lNYP0igB4BT+l3hxY0wzIN/RoyceawO jHvS3trNcMWPhLWJe3qFYv2c3qq3/iPp3l59QHv8QHtqFG5oJHLsxVlHTMEisMs3ZdRY9w19DOj19 0zh0Rttuwu89RD701thYuuanyvgQoo0PhNMJx1BR00q/cREexWfBEv7EkrbavAXwGcoW3GK+B+mUS lAhnMAyfXevrAZBuX5PWRuZIGiHqj51G4Ek5fbvygCEPd/O2VALiBBGDUWWjrMvrvdYS27TUdKMZI lFDaI9evgDpifuKv8Jmw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pyafF-002fGY-1G; Mon, 15 May 2023 16:03:09 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pyaf8-002fEf-1R for linux-arm-kernel@bombadil.infradead.org; Mon, 15 May 2023 16:03:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Content-Transfer-Encoding :MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From: Sender:Reply-To:Content-ID:Content-Description; bh=PH427ORrMteRZ+FasmOGCOeb5m6y7D+/2XMu0ot4hLM=; b=IBopDRXWukNhzmV/UqYZER31n4 vrKj6yhaPj1qmOdukytloFH0JS81RoHJp2F69XpBXRow6f4g+7D+tV9LjXkaVKnh0gALWlh9hb3aD kFyUy/qa5ESfLPcPzJ23pFV1yP4W+dUdD4rQDabgXRCLu2QujHf0/rzzhbKNh1vX0rz2dzwSFzQ66 OGa3uOpLV8pdO4rIQ4pgq1QX9cx0jOsz/4v5NopvESEjZAZ7TNTqaHFvB1h82FhSa0XaIGOEhNazb 4/7G17NTjOlAVlMudN1H0tN/TMkNX/eDD7Y0OmjU6BDcvnsnIrTPW6j5xvdENhPWQJxjzP+Kmz4Ch j3KAXv1Q==; Received: from lelv0143.ext.ti.com ([198.47.23.248]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pyaf3-00BVwQ-3C for linux-arm-kernel@lists.infradead.org; Mon, 15 May 2023 16:03:00 +0000 Received: from fllv0034.itg.ti.com ([10.64.40.246]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 34FG2eQW005231; Mon, 15 May 2023 11:02:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1684166560; bh=PH427ORrMteRZ+FasmOGCOeb5m6y7D+/2XMu0ot4hLM=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=DYeM+3zhYANPWkPrwCRbkGKMwrGfC3X2JCthfHZ+S/K/QZRom/jPbpIr7Lc1+MBE4 jbKwx76G9gC0sP2S+lcnCb6eoUzAcsuL9kK+wqzZz2dKyKeUFmSRtWgL33Q7ImXdCv vhr0YeFtUyTEN7lrx2dK0+HvAKGhXS5/e2XnVUE0= Received: from DFLE112.ent.ti.com (dfle112.ent.ti.com [10.64.6.33]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 34FG2e7I034534 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 15 May 2023 11:02:40 -0500 Received: from DFLE114.ent.ti.com (10.64.6.35) by DFLE112.ent.ti.com (10.64.6.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Mon, 15 May 2023 11:02:39 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DFLE114.ent.ti.com (10.64.6.35) 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, 15 May 2023 11:02:39 -0500 Received: from lelv0327.itg.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 34FG2ZR5029578; Mon, 15 May 2023 11:02:38 -0500 From: Andrew Davis To: Russell King , Baruch Siach , Vladimir Zapolskiy , Kunihiko Hayashi , Masami Hiramatsu , Arnd Bergmann , Geert Uytterhoeven , Linus Walleij CC: , , Andrew Davis Subject: [PATCH 06/10] ARM: mach-airoha: Rework support and directory structure Date: Mon, 15 May 2023 11:02:30 -0500 Message-ID: <20230515160234.289631-6-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230515160234.289631-1-afd@ti.com> References: <20230515160234.289631-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-20230515_170258_437037_77104357 X-CRM114-Status: GOOD ( 19.96 ) 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-airoha/ directory, and files within, provide 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. It also seems there was a copy/paste error and the "MEDIATEK_DT" name was re-used in the DT_MACHINE_START macro. This may have caused conflicts if this was built in a multi-arch configuration. Signed-off-by: Andrew Davis --- arch/arm/Kconfig | 11 ----------- arch/arm/Kconfig.platforms | 11 +++++++++++ arch/arm/Makefile | 1 - arch/arm/mach-airoha/Makefile | 2 -- arch/arm/mach-airoha/airoha.c | 16 ---------------- 5 files changed, 11 insertions(+), 30 deletions(-) delete mode 100644 arch/arm/mach-airoha/Makefile delete mode 100644 arch/arm/mach-airoha/airoha.c diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e7351a683545..f60e98da58cd 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -338,17 +338,6 @@ config ARCH_MULTIPLATFORM source "arch/arm/Kconfig.platforms" -config ARCH_AIROHA - bool "Airoha SoC Support" - depends on ARCH_MULTI_V7 - select ARM_AMBA - select ARM_GIC - select ARM_GIC_V3 - select ARM_PSCI - select HAVE_ARM_ARCH_TIMER - help - Support for Airoha EN7523 SoCs - # # This is sorted alphabetically by mach-* pathname. However, plat-* # Kconfigs may be included either alphabetically (according to the diff --git a/arch/arm/Kconfig.platforms b/arch/arm/Kconfig.platforms index 4b5fad18ca8b..38457d5a18ff 100644 --- a/arch/arm/Kconfig.platforms +++ b/arch/arm/Kconfig.platforms @@ -67,6 +67,17 @@ config ARCH_VIRT select ARM_PSCI select HAVE_ARM_ARCH_TIMER +config ARCH_AIROHA + bool "Airoha SoC Support" + depends on ARCH_MULTI_V7 + select ARM_AMBA + select ARM_GIC + select ARM_GIC_V3 + select ARM_PSCI + select HAVE_ARM_ARCH_TIMER + help + Support for Airoha EN7523 SoCs + config MACH_ASM9260 bool "Alphascale ASM9260" depends on ARCH_MULTI_V5 diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 32e99aa282bf..e20c8af34d51 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -167,7 +167,6 @@ textofs-$(CONFIG_ARCH_AXXIA) := 0x00308000 # Machine directory name. This list is sorted alphanumerically # by CONFIG_* macro name. machine-$(CONFIG_ARCH_ACTIONS) += actions -machine-$(CONFIG_ARCH_AIROHA) += airoha machine-$(CONFIG_ARCH_ALPINE) += alpine machine-$(CONFIG_ARCH_ARTPEC) += artpec machine-$(CONFIG_ARCH_ASPEED) += aspeed diff --git a/arch/arm/mach-airoha/Makefile b/arch/arm/mach-airoha/Makefile deleted file mode 100644 index a5857d0d02eb..000000000000 --- a/arch/arm/mach-airoha/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -obj-y += airoha.o diff --git a/arch/arm/mach-airoha/airoha.c b/arch/arm/mach-airoha/airoha.c deleted file mode 100644 index ea23b5abb478..000000000000 --- a/arch/arm/mach-airoha/airoha.c +++ /dev/null @@ -1,16 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* - * Device Tree support for Airoha SoCs - * - * Copyright (c) 2022 Felix Fietkau - */ -#include - -static const char * const airoha_board_dt_compat[] = { - "airoha,en7523", - NULL, -}; - -DT_MACHINE_START(MEDIATEK_DT, "Airoha Cortex-A53 (Device Tree)") - .dt_compat = airoha_board_dt_compat, -MACHINE_END From patchwork Mon May 15 16:02:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 13241719 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 E0C8CC7EE22 for ; Mon, 15 May 2023 16:03:30 +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=gJ4PFD5z0k55x8j3vb4n7SrLRuPtKJlg8KuNnxu6yEQ=; b=chSdrMrIO8rtuV rZTi6Vu1yh8fYpETIztcNBk91gcPY4Q9jCK09nuPV6ZzKDKSZaOhR+At4Zfa9f1M2u93DGb60Nxb5 /Q8pCAYG3OirPrYupOoVXS2wtv5RpSObVAr4CtJePyk2irT7bja1cH7SH1obAVioAtc29vjaJO7c/ w2pNzut0JP7An4gGN72zep/RPfcD17ZYVnOl9RNezojlmlwL24Ziy9y0DhDRdIOCW1sjNxyQ8WWuH TySQFzOXvIgA20hBxMEj072Q0yVSJsj9pIs11GaOdWOHUOtMbpPqZE1W6hFe9tH5wAXmp7LsIMwx/ 6FxF9sySKC8JclXUZf9Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pyafF-002fGt-2u; Mon, 15 May 2023 16:03:10 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pyaf9-002fF7-2l for linux-arm-kernel@bombadil.infradead.org; Mon, 15 May 2023 16:03:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Content-Transfer-Encoding :MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From: Sender:Reply-To:Content-ID:Content-Description; bh=af5c91Q+vqJOwLmdyh9Q8efsWJmeqrOcwNcvgIRxRNY=; b=e2PGaud7ApfgH0SXHmmbSkvwAZ F36Zp9ZpMq5TT5sxy93amPEixlSNNdpOS/usENIlr/EP1dCf3loIr3HWU/g4jNrd3Vf5UE7fKJgI3 sKxa5owbXTtI61pPg8N+gqsqJchbIj2pyMfKgICCTp/+fgVarXVKp5oJjC+pshOHTg+xvSNrLRJ9+ aaOle5VefWWGTujFJEzGR1pSmV3ntXOJgy8cyfmpGRHWlhqqBln1Pt40cPZgNcH5a3DEbCBaas6Xl 67DOF2erB3qFSTjYPqwomnGVMVd21qsuo+z5TrIUPtiWyO9K28W0l3AEtn0QsAxoo76FrYLgRpcRb Upr0h9mQ==; Received: from fllv0015.ext.ti.com ([198.47.19.141]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pyaf4-00BVwO-2q for linux-arm-kernel@lists.infradead.org; Mon, 15 May 2023 16:03:02 +0000 Received: from lelv0265.itg.ti.com ([10.180.67.224]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 34FG2eu5004419; Mon, 15 May 2023 11:02:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1684166560; bh=af5c91Q+vqJOwLmdyh9Q8efsWJmeqrOcwNcvgIRxRNY=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=SP84bAZeRgvC/Gc+WsGQ7Atg+Tv8DWL6vow2gLHKiV4vVI80fktSft8/rWehKjmyg 1rARaYTfCDmsTN0t7R9SryL81T6Dk8AN5yeuyVKCtKNk1hvEw79SOVyQ31s3zlCNO+ ibuHvZn1lAP0fYhYxV2VMvkEHALeEVEcJG7OmBI0= Received: from DFLE115.ent.ti.com (dfle115.ent.ti.com [10.64.6.36]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 34FG2ee3013210 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 15 May 2023 11:02:40 -0500 Received: from DFLE103.ent.ti.com (10.64.6.24) by DFLE115.ent.ti.com (10.64.6.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Mon, 15 May 2023 11:02:39 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DFLE103.ent.ti.com (10.64.6.24) 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, 15 May 2023 11:02:39 -0500 Received: from lelv0327.itg.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 34FG2ZR6029578; Mon, 15 May 2023 11:02:39 -0500 From: Andrew Davis To: Russell King , Baruch Siach , Vladimir Zapolskiy , Kunihiko Hayashi , Masami Hiramatsu , Arnd Bergmann , Geert Uytterhoeven , Linus Walleij CC: , , Andrew Davis Subject: [PATCH 07/10] ARM: mach-digicolor: Rework support and directory structure Date: Mon, 15 May 2023 11:02:31 -0500 Message-ID: <20230515160234.289631-7-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230515160234.289631-1-afd@ti.com> References: <20230515160234.289631-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-20230515_170259_174960_246782E6 X-CRM114-Status: GOOD ( 17.23 ) 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-digicolor/ 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. Signed-off-by: Andrew Davis --- arch/arm/Kconfig | 2 -- arch/arm/Kconfig.platforms | 11 +++++++++++ arch/arm/Makefile | 1 - arch/arm/mach-digicolor/Kconfig | 11 ----------- arch/arm/mach-digicolor/Makefile | 2 -- arch/arm/mach-digicolor/digicolor.c | 15 --------------- 6 files changed, 11 insertions(+), 31 deletions(-) delete mode 100644 arch/arm/mach-digicolor/Kconfig delete mode 100644 arch/arm/mach-digicolor/Makefile delete mode 100644 arch/arm/mach-digicolor/digicolor.c diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f60e98da58cd..d4afd5a01307 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -363,8 +363,6 @@ source "arch/arm/mach-clps711x/Kconfig" source "arch/arm/mach-davinci/Kconfig" -source "arch/arm/mach-digicolor/Kconfig" - source "arch/arm/mach-dove/Kconfig" source "arch/arm/mach-ep93xx/Kconfig" diff --git a/arch/arm/Kconfig.platforms b/arch/arm/Kconfig.platforms index 38457d5a18ff..c74392419cc3 100644 --- a/arch/arm/Kconfig.platforms +++ b/arch/arm/Kconfig.platforms @@ -87,6 +87,17 @@ config MACH_ASM9260 help Support for Alphascale ASM9260 based platform. +config ARCH_DIGICOLOR + bool "Conexant Digicolor SoC Support" + depends on ARCH_MULTI_V7 + select CLKSRC_MMIO + select DIGICOLOR_TIMER + select GENERIC_IRQ_CHIP + select GPIOLIB + select MFD_SYSCON + select PINCTRL + select PINCTRL_DIGICOLOR + menuconfig ARCH_MOXART bool "MOXA ART SoC" depends on ARCH_MULTI_V4 diff --git a/arch/arm/Makefile b/arch/arm/Makefile index e20c8af34d51..82ec2c8bd749 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -176,7 +176,6 @@ machine-$(CONFIG_ARCH_BCM) += bcm machine-$(CONFIG_ARCH_BERLIN) += berlin machine-$(CONFIG_ARCH_CLPS711X) += clps711x machine-$(CONFIG_ARCH_DAVINCI) += davinci -machine-$(CONFIG_ARCH_DIGICOLOR) += digicolor machine-$(CONFIG_ARCH_DOVE) += dove machine-$(CONFIG_ARCH_EP93XX) += ep93xx machine-$(CONFIG_ARCH_EXYNOS) += exynos diff --git a/arch/arm/mach-digicolor/Kconfig b/arch/arm/mach-digicolor/Kconfig deleted file mode 100644 index 90394433c405..000000000000 --- a/arch/arm/mach-digicolor/Kconfig +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -config ARCH_DIGICOLOR - bool "Conexant Digicolor SoC Support" - depends on ARCH_MULTI_V7 - select CLKSRC_MMIO - select DIGICOLOR_TIMER - select GENERIC_IRQ_CHIP - select GPIOLIB - select MFD_SYSCON - select PINCTRL - select PINCTRL_DIGICOLOR diff --git a/arch/arm/mach-digicolor/Makefile b/arch/arm/mach-digicolor/Makefile deleted file mode 100644 index fc5b7c98c824..000000000000 --- a/arch/arm/mach-digicolor/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_ARCH_DIGICOLOR) += digicolor.o diff --git a/arch/arm/mach-digicolor/digicolor.c b/arch/arm/mach-digicolor/digicolor.c deleted file mode 100644 index 156d0d5996a9..000000000000 --- a/arch/arm/mach-digicolor/digicolor.c +++ /dev/null @@ -1,15 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * Support for Conexant Digicolor SoCs -*/ - -#include - -static const char *const digicolor_dt_compat[] __initconst = { - "cnxt,cx92755", - NULL, -}; - -DT_MACHINE_START(DIGICOLOR, "Conexant Digicolor (Flattened Device Tree)") - .dt_compat = digicolor_dt_compat, -MACHINE_END From patchwork Mon May 15 16:02:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 13241723 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 D6BD8C77B75 for ; Mon, 15 May 2023 16:03:32 +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=GJGXk0HXQaeOb8hLSIH+zzr7KP84S39h+M/d0ss5pqI=; b=Lz3lDbLyGqBoKx ciSp0UL20bXQZf2QbxCJ3G64Zgu/RsHDq9zY2xi7jleDJ8wlibJDE9qn4vsVhMxrA2SZyu1Ki0vTm mQmkCL87D61p8+0L88p7Vn9ea03wiCuJzUKIKzLa5rLBAhM2FGx+MxfqI5YdI8JrLm8PwlMC7wApW 0c9/boJeY1rPlLgGLMBMSfalJZhJXmCtIbKG3JcvXP0VcF+iKYdPy6u/fwZRZLoepzf77H8em06Dg axZ+nd2YBjwTD/7xfIlNZ1jI+nw1x7RLg1poFtzyl70XOGlaC3t5ZnPWrA/+0vWJM96XD/6A9fk+V 2Z/lE0yNg8zzNcXFYl8g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pyafI-002fIq-1X; Mon, 15 May 2023 16:03:12 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pyafB-002fEf-0m for linux-arm-kernel@bombadil.infradead.org; Mon, 15 May 2023 16:03:05 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Content-Transfer-Encoding :MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From: Sender:Reply-To:Content-ID:Content-Description; bh=e568jHeft8X7DiMKrnio7Zpsq4AqsydpRcGoANzkNRo=; b=i3bG5s9fgFqHHpcGv2pBP4Z6V+ HGs52E7i1aUOkER95Yq34KLF3JpCEKLdEzGzfk6oWKz+6CESKkikKCXPCCvzCA7i9MXK0c8mU3R1O 0KnzprQHtxmU1beMklw67S33yL+XxLJK1+XkIXcHXI0TVxm6zSHvma60xEtIszVacmNCMJ599IHKF 5bsjYeQugFQDqPjAWaDgmn3/ZFBDX8hES5YpL8+LN636d2jN2SuEr4XSeWlWcqrmj5J/5EjrM6IEy 9PQNMqYDm89AofnubHTrAc/dSnqiPjg9LITbP3W8TRyJBPFGw5dTgOkBAhgVH7rDj+9D4KtMJrODU 760/BUYA==; Received: from fllv0015.ext.ti.com ([198.47.19.141]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pyaf3-00BVwN-3A for linux-arm-kernel@lists.infradead.org; Mon, 15 May 2023 16:03:02 +0000 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 34FG2eD0004423; Mon, 15 May 2023 11:02:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1684166560; bh=e568jHeft8X7DiMKrnio7Zpsq4AqsydpRcGoANzkNRo=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=d7QYdVwR+bkhmgvoarhQnE/68v5IMKhUBl582GpMg0e9iPTkGUgtLAK/ycLdm1+NV NfKOUJ6Oh42DwoOCnfmuMhT06KZsFVxM79lkjmr4EdFbZBRXtx3XqXbG28geGZ757w wyCs/ThArkeWGMNAPcySMsb2zOWmd5MDvxQklmoU= Received: from DLEE111.ent.ti.com (dlee111.ent.ti.com [157.170.170.22]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 34FG2eR8113800 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 15 May 2023 11:02:40 -0500 Received: from DLEE109.ent.ti.com (157.170.170.41) by DLEE111.ent.ti.com (157.170.170.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Mon, 15 May 2023 11:02:40 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DLEE109.ent.ti.com (157.170.170.41) 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, 15 May 2023 11:02:40 -0500 Received: from lelv0327.itg.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 34FG2ZR7029578; Mon, 15 May 2023 11:02:39 -0500 From: Andrew Davis To: Russell King , Baruch Siach , Vladimir Zapolskiy , Kunihiko Hayashi , Masami Hiramatsu , Arnd Bergmann , Geert Uytterhoeven , Linus Walleij CC: , , Andrew Davis Subject: [PATCH 08/10] ARM: mach-hpe: Rework support and directory structure Date: Mon, 15 May 2023 11:02:32 -0500 Message-ID: <20230515160234.289631-8-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230515160234.289631-1-afd@ti.com> References: <20230515160234.289631-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-20230515_170258_460846_7FE3C7E5 X-CRM114-Status: GOOD ( 21.63 ) 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-hpe/ 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. Signed-off-by: Andrew Davis --- MAINTAINERS | 1 - arch/arm/Kconfig | 2 -- arch/arm/Kconfig.platforms | 25 +++++++++++++++++++++++++ arch/arm/Makefile | 1 - arch/arm/mach-hpe/Kconfig | 23 ----------------------- arch/arm/mach-hpe/Makefile | 1 - arch/arm/mach-hpe/gxp.c | 16 ---------------- 7 files changed, 25 insertions(+), 44 deletions(-) delete mode 100644 arch/arm/mach-hpe/Kconfig delete mode 100644 arch/arm/mach-hpe/Makefile delete mode 100644 arch/arm/mach-hpe/gxp.c diff --git a/MAINTAINERS b/MAINTAINERS index b4d226f87413..03ac2c37d22e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2253,7 +2253,6 @@ F: Documentation/devicetree/bindings/timer/hpe,gxp-timer.yaml F: Documentation/hwmon/gxp-fan-ctrl.rst F: arch/arm/boot/dts/hpe-bmc* F: arch/arm/boot/dts/hpe-gxp* -F: arch/arm/mach-hpe/ F: drivers/clocksource/timer-gxp.c F: drivers/hwmon/gxp-fan-ctrl.c F: drivers/i2c/busses/i2c-gxp.c diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index d4afd5a01307..0024967b08ea 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -377,8 +377,6 @@ source "arch/arm/mach-highbank/Kconfig" source "arch/arm/mach-hisi/Kconfig" -source "arch/arm/mach-hpe/Kconfig" - source "arch/arm/mach-imx/Kconfig" source "arch/arm/mach-ixp4xx/Kconfig" diff --git a/arch/arm/Kconfig.platforms b/arch/arm/Kconfig.platforms index c74392419cc3..60f2140c9ff2 100644 --- a/arch/arm/Kconfig.platforms +++ b/arch/arm/Kconfig.platforms @@ -98,6 +98,31 @@ config ARCH_DIGICOLOR select PINCTRL select PINCTRL_DIGICOLOR +menuconfig ARCH_HPE + bool "HPE SoC support" + depends on ARCH_MULTI_V7 + help + This enables support for HPE ARM based BMC chips. + +if ARCH_HPE + +config ARCH_HPE_GXP + bool "HPE GXP SoC" + depends on ARCH_MULTI_V7 + select ARM_VIC + select GENERIC_IRQ_CHIP + select CLKSRC_MMIO + help + HPE GXP is the name of the HPE Soc. This SoC is used to implement many + BMC features at HPE. It supports ARMv7 architecture based on the Cortex + A9 core. It is capable of using an AXI bus to which a memory controller + is attached. It has multiple SPI interfaces to connect boot flash and + BIOS flash. It uses a 10/100/1000 MAC for network connectivity. It + has multiple i2c engines to drive connectivity with a host + infrastructure. + +endif + menuconfig ARCH_MOXART bool "MOXA ART SoC" depends on ARCH_MULTI_V4 diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 82ec2c8bd749..d306cf8107dc 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -183,7 +183,6 @@ machine-$(CONFIG_ARCH_FOOTBRIDGE) += footbridge machine-$(CONFIG_ARCH_GEMINI) += gemini machine-$(CONFIG_ARCH_HIGHBANK) += highbank machine-$(CONFIG_ARCH_HISI) += hisi -machine-$(CONFIG_ARCH_HPE) += hpe machine-$(CONFIG_ARCH_IXP4XX) += ixp4xx machine-$(CONFIG_ARCH_KEYSTONE) += keystone machine-$(CONFIG_ARCH_LPC18XX) += lpc18xx diff --git a/arch/arm/mach-hpe/Kconfig b/arch/arm/mach-hpe/Kconfig deleted file mode 100644 index 3372bbf38d38..000000000000 --- a/arch/arm/mach-hpe/Kconfig +++ /dev/null @@ -1,23 +0,0 @@ -menuconfig ARCH_HPE - bool "HPE SoC support" - depends on ARCH_MULTI_V7 - help - This enables support for HPE ARM based BMC chips. -if ARCH_HPE - -config ARCH_HPE_GXP - bool "HPE GXP SoC" - depends on ARCH_MULTI_V7 - select ARM_VIC - select GENERIC_IRQ_CHIP - select CLKSRC_MMIO - help - HPE GXP is the name of the HPE Soc. This SoC is used to implement many - BMC features at HPE. It supports ARMv7 architecture based on the Cortex - A9 core. It is capable of using an AXI bus to which a memory controller - is attached. It has multiple SPI interfaces to connect boot flash and - BIOS flash. It uses a 10/100/1000 MAC for network connectivity. It - has multiple i2c engines to drive connectivity with a host - infrastructure. - -endif diff --git a/arch/arm/mach-hpe/Makefile b/arch/arm/mach-hpe/Makefile deleted file mode 100644 index 8b0a91234df4..000000000000 --- a/arch/arm/mach-hpe/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-$(CONFIG_ARCH_HPE_GXP) += gxp.o diff --git a/arch/arm/mach-hpe/gxp.c b/arch/arm/mach-hpe/gxp.c deleted file mode 100644 index ef3341373006..000000000000 --- a/arch/arm/mach-hpe/gxp.c +++ /dev/null @@ -1,16 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2022 Hewlett-Packard Enterprise Development Company, L.P. */ - -#include -#include - -static const char * const gxp_board_dt_compat[] = { - "hpe,gxp", - NULL, -}; - -DT_MACHINE_START(GXP_DT, "HPE GXP") - .dt_compat = gxp_board_dt_compat, - .l2c_aux_val = 0, - .l2c_aux_mask = ~0, -MACHINE_END From patchwork Mon May 15 16:02:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 13241858 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 6D7F7C7EE24 for ; Mon, 15 May 2023 17:15:24 +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=kT4b/ZABqVU4Yzfsu4U+TFmQe23pyHuvAQDz628Wr8M=; b=31NGli/Y0YqLJG LihZtIij2mNBE5nEOzfTxNQ7lPNXQoqeittiw/khQVLrOTwtDo15lqzcTlbjCJ9K8dW9wWci4Mq6f GvIePiK2/CT02WNIYR5YGj4Td3Y4IBJRJvQU3EqoExIlmEKy+P8AQOYTse80KjMNmrw72z3+i01SZ gEdzlGMkI74J42/mzf69N3WOvvs5nkOlW/Qs8mOg0cli+I8Biv5LYujh7xVFZoTM9l/ePvvkMs6iC T58qrZg9o9oNgXUHlib8ctmUoXG/azvX9SXyqd0YWuV0iCqiKt6+JdogcGxkhz/FWBOGGKCLtCmuu oPwooMssbjpL36K+l4nA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pybn4-002thJ-1u; Mon, 15 May 2023 17:15:18 +0000 Received: from lelv0142.ext.ti.com ([198.47.23.249]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pyaf2-002fD0-0x for linux-arm-kernel@lists.infradead.org; Mon, 15 May 2023 16:02:57 +0000 Received: from lelv0266.itg.ti.com ([10.180.67.225]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 34FG2fxY119239; Mon, 15 May 2023 11:02:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1684166561; bh=5eShS47428T2bRPRMMSWbirvyOAz0ibuKCszyB2qk5A=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=T0g1YukMTvBPw/FF3Y/MfGz4wDGl+wUKxbUp2l7W7rbHwtd3pe+a5/cohNngtfEcF nSwFkLcz+ZW8aeCl2HCPktL9kZoKZ7IIwmP5SU/1Ilmj8lBWdIYDDvDXGF2Ls30WSj 3ISpXQGdvNlluDUX5dAD06b3TQm60fzmp90o0E9w= Received: from DLEE111.ent.ti.com (dlee111.ent.ti.com [157.170.170.22]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 34FG2fD8060814 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 15 May 2023 11:02:41 -0500 Received: from DLEE109.ent.ti.com (157.170.170.41) by DLEE111.ent.ti.com (157.170.170.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Mon, 15 May 2023 11:02:41 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DLEE109.ent.ti.com (157.170.170.41) 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, 15 May 2023 11:02:40 -0500 Received: from lelv0327.itg.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 34FG2ZR8029578; Mon, 15 May 2023 11:02:40 -0500 From: Andrew Davis To: Russell King , Baruch Siach , Vladimir Zapolskiy , Kunihiko Hayashi , Masami Hiramatsu , Arnd Bergmann , Geert Uytterhoeven , Linus Walleij CC: , , Andrew Davis Subject: [PATCH 09/10] ARM: mach-lpc18xx: Rework support and directory structure Date: Mon, 15 May 2023 11:02:33 -0500 Message-ID: <20230515160234.289631-9-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230515160234.289631-1-afd@ti.com> References: <20230515160234.289631-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-20230515_090256_435642_83513374 X-CRM114-Status: GOOD ( 16.43 ) 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. Signed-off-by: Andrew Davis --- arch/arm/Makefile | 1 - arch/arm/mach-lpc18xx/Makefile | 2 -- arch/arm/mach-lpc18xx/board-dt.c | 19 ------------------- 3 files changed, 22 deletions(-) delete mode 100644 arch/arm/mach-lpc18xx/Makefile delete mode 100644 arch/arm/mach-lpc18xx/board-dt.c diff --git a/arch/arm/Makefile b/arch/arm/Makefile index d306cf8107dc..bab3d2485f80 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -185,7 +185,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 c80d80c199d3..000000000000 --- 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 4729eb83401a..000000000000 --- 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 From patchwork Mon May 15 16:02:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 13241722 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 EA44FC7EE2C for ; Mon, 15 May 2023 16:03:32 +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=uTR9DCr1QnsvsuXKpMXFrdQ5y/kw27quHcmERDjG+QI=; b=QmQF1bSeApLPgK RkYxlCV8vBvDp7Cx8546+lwzADE1Kc6kJ/JXCP0jd0P6LCrShvXNPFWrYGl+X2flubH3cp4oexcej 16gXCUE2KP6oatcKXAYB8CsQDnoUD4adu77r6Dki5UR7iTUGH3OhjPRsIdiIV7+YgizkOXI55LLCL Pp5Aw8xTuFKDyQbJ3Hrt8rUWFGzA+ght/oFk81GUktnXbBwbAtnSgNaJM3taspdmmX2n9AdKtLx9l 0y6aHRcFy6dtWPEHE2qLiWD71okOJdnR6VSaPoiwWfOT8AbhA0gyRez4OUktdZ7bnkcVjG7q9eVkr H9s5SLUDT9yZ3gW7yUew==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pyafE-002fGH-2q; Mon, 15 May 2023 16:03:08 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pyaf8-002fEg-1R for linux-arm-kernel@bombadil.infradead.org; Mon, 15 May 2023 16:03:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Content-Transfer-Encoding :MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From: Sender:Reply-To:Content-ID:Content-Description; bh=NyxnYDfYOZQyNyIiR3B05+UIDCkBUdv/tTr9EGJ+AJc=; b=dJKwfpthr3CO92OlfseI8PvErc wvPaqUbGSJrYAXW6TEpN2dPWGAZasCggQhula3tQCehNPN8EnGPc5AfTFlL8nNVIV0TxleZyQ4vRu A/dIPvj9y96UY7w3WhcLOyi2CYxTB8y3D9QFewaGabN8nbSWpSxPrnVYPnbx5KJxMPkumLxO8QvW4 ikEz4yu6a3zGHZpSYPwuIleh2cXNIN2p0f6HT5ABCB2dGJEu2d0ZB9mmI22H4egVh+ucrCfYIrUJ5 Up2ShY4oLsw10afIqh08+XFQQKEChbSLhUEjKkRisml14+/7Lj430nqtNXWu+jWmozDrm5iN7RN0j 0yfX2ZvA==; Received: from fllv0015.ext.ti.com ([198.47.19.141]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pyaf4-00BVwR-01 for linux-arm-kernel@lists.infradead.org; Mon, 15 May 2023 16:03:01 +0000 Received: from lelv0265.itg.ti.com ([10.180.67.224]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 34FG2gie004428; Mon, 15 May 2023 11:02:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1684166562; bh=NyxnYDfYOZQyNyIiR3B05+UIDCkBUdv/tTr9EGJ+AJc=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=yKdJQ5BBW0XC+y+V73TwNiK0Tbu0w6lIiQ9CDW6J8SCxZu9l/zsQkA1ILuQo5RIE5 DvZFVd0jYq4FIUHJ0uwc3RMCzhT3OfzvBYseXkDBS/w2h0egBgaf7WCwqUHz5NEzIP ge9t2aRif6mYAn01JNvneStHJx8Fv6pFTxNUuB9E= Received: from DLEE109.ent.ti.com (dlee109.ent.ti.com [157.170.170.41]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 34FG2g8f013231 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 15 May 2023 11:02:42 -0500 Received: from DLEE112.ent.ti.com (157.170.170.23) by DLEE109.ent.ti.com (157.170.170.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Mon, 15 May 2023 11:02:41 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) 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, 15 May 2023 11:02:41 -0500 Received: from lelv0327.itg.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 34FG2ZR9029578; Mon, 15 May 2023 11:02:41 -0500 From: Andrew Davis To: Russell King , Baruch Siach , Vladimir Zapolskiy , Kunihiko Hayashi , Masami Hiramatsu , Arnd Bergmann , Geert Uytterhoeven , Linus Walleij CC: , , Andrew Davis Subject: [PATCH 10/10] ARM: mach-sunplus: Rework support and directory structure Date: Mon, 15 May 2023 11:02:34 -0500 Message-ID: <20230515160234.289631-10-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230515160234.289631-1-afd@ti.com> References: <20230515160234.289631-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-20230515_170258_437037_4A35942F X-CRM114-Status: GOOD ( 21.58 ) 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-sunplus/ 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. Signed-off-by: Andrew Davis --- MAINTAINERS | 1 - arch/arm/Kconfig | 2 -- arch/arm/Kconfig.platforms | 29 +++++++++++++++++++++++++++++ arch/arm/Makefile | 1 - arch/arm/mach-sunplus/Kconfig | 27 --------------------------- arch/arm/mach-sunplus/Makefile | 8 -------- arch/arm/mach-sunplus/sp7021.c | 16 ---------------- 7 files changed, 29 insertions(+), 55 deletions(-) delete mode 100644 arch/arm/mach-sunplus/Kconfig delete mode 100644 arch/arm/mach-sunplus/Makefile delete mode 100644 arch/arm/mach-sunplus/sp7021.c diff --git a/MAINTAINERS b/MAINTAINERS index 03ac2c37d22e..91d1ee89e275 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2855,7 +2855,6 @@ F: Documentation/devicetree/bindings/interrupt-controller/sunplus,sp7021-intc.ya F: Documentation/devicetree/bindings/reset/sunplus,reset.yaml F: arch/arm/boot/dts/sunplus-sp7021*.dts* F: arch/arm/configs/sp7021_*defconfig -F: arch/arm/mach-sunplus/ F: drivers/clk/clk-sp7021.c F: drivers/irqchip/irq-sp7021-intc.c F: drivers/reset/reset-sunplus.c diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 0024967b08ea..57f994497311 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -439,8 +439,6 @@ source "arch/arm/mach-sti/Kconfig" source "arch/arm/mach-stm32/Kconfig" -source "arch/arm/mach-sunplus/Kconfig" - source "arch/arm/mach-sunxi/Kconfig" source "arch/arm/mach-tegra/Kconfig" diff --git a/arch/arm/Kconfig.platforms b/arch/arm/Kconfig.platforms index 60f2140c9ff2..892a5e309cea 100644 --- a/arch/arm/Kconfig.platforms +++ b/arch/arm/Kconfig.platforms @@ -159,6 +159,35 @@ config ARCH_RDA help This enables support for the RDA Micro 8810PL SoC family. +menuconfig ARCH_SUNPLUS + bool "Sunplus SoCs" + depends on ARCH_MULTI_V7 + help + Support for Sunplus SoC family: SP7021 and succeeding SoC-based systems, + such as the Banana Pi BPI-F2S development board (and derivatives). + () + () + +if ARCH_SUNPLUS + +config SOC_SP7021 + bool "Sunplus SP7021 SoC support" + default ARCH_SUNPLUS + select HAVE_ARM_ARCH_TIMER + select ARM_GIC + select ARM_PSCI + select PINCTRL + select PINCTRL_SPPCTL + select SERIAL_SUNPLUS if TTY + select SERIAL_SUNPLUS_CONSOLE if TTY + help + Support for Sunplus SP7021 SoC. It is based on ARM 4-core + Cortex-A7 with various peripherals (e.g.: I2C, SPI, SDIO, + Ethernet, etc.), FPGA interface, chip-to-chip bus. + It is designed for industrial control. + +endif + config ARCH_UNIPHIER bool "Socionext UniPhier SoCs" depends on ARCH_MULTI_V7 diff --git a/arch/arm/Makefile b/arch/arm/Makefile index bab3d2485f80..ceadfa3c59fd 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -213,7 +213,6 @@ machine-$(CONFIG_ARCH_RENESAS) += shmobile machine-$(CONFIG_ARCH_INTEL_SOCFPGA) += socfpga machine-$(CONFIG_ARCH_STI) += sti machine-$(CONFIG_ARCH_STM32) += stm32 -machine-$(CONFIG_ARCH_SUNPLUS) += sunplus machine-$(CONFIG_ARCH_SUNXI) += sunxi machine-$(CONFIG_ARCH_TEGRA) += tegra machine-$(CONFIG_ARCH_U8500) += ux500 diff --git a/arch/arm/mach-sunplus/Kconfig b/arch/arm/mach-sunplus/Kconfig deleted file mode 100644 index d0c2416e6f24..000000000000 --- a/arch/arm/mach-sunplus/Kconfig +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) - -menuconfig ARCH_SUNPLUS - bool "Sunplus SoCs" - depends on ARCH_MULTI_V7 - help - Support for Sunplus SoC family: SP7021 and succeeding SoC-based systems, - such as the Banana Pi BPI-F2S development board (and derivatives). - () - () - -config SOC_SP7021 - bool "Sunplus SP7021 SoC support" - depends on ARCH_SUNPLUS - default ARCH_SUNPLUS - select HAVE_ARM_ARCH_TIMER - select ARM_GIC - select ARM_PSCI - select PINCTRL - select PINCTRL_SPPCTL - select SERIAL_SUNPLUS if TTY - select SERIAL_SUNPLUS_CONSOLE if TTY - help - Support for Sunplus SP7021 SoC. It is based on ARM 4-core - Cortex-A7 with various peripherals (e.g.: I2C, SPI, SDIO, - Ethernet, etc.), FPGA interface, chip-to-chip bus. - It is designed for industrial control. diff --git a/arch/arm/mach-sunplus/Makefile b/arch/arm/mach-sunplus/Makefile deleted file mode 100644 index d211de6af2db..000000000000 --- a/arch/arm/mach-sunplus/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# -# Makefile for the linux kernel. -# - -# Object file lists. - -obj-$(CONFIG_SOC_SP7021) += sp7021.o diff --git a/arch/arm/mach-sunplus/sp7021.c b/arch/arm/mach-sunplus/sp7021.c deleted file mode 100644 index 774d0a5bd4eb..000000000000 --- a/arch/arm/mach-sunplus/sp7021.c +++ /dev/null @@ -1,16 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) -/* - * Copyright (C) Sunplus Technology Co., Ltd. - * All rights reserved. - */ -#include -#include - -static const char *sp7021_compat[] __initconst = { - "sunplus,sp7021", - NULL -}; - -DT_MACHINE_START(SP7021_DT, "SP7021") - .dt_compat = sp7021_compat, -MACHINE_END