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: 94211 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp7035478vqo; Mon, 15 May 2023 09:14:34 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6dAepQ5HtgiHrURxrfNwm37IRuEdiq1kKYbNFHJvuEW/KJwPrYOrfBQ8wGWhU+PkEF2h3T X-Received: by 2002:a17:902:c453:b0:1a9:a672:12b8 with SMTP id m19-20020a170902c45300b001a9a67212b8mr27742956plm.68.1684167274271; Mon, 15 May 2023 09:14:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684167274; cv=none; d=google.com; s=arc-20160816; b=rh4zCF+db/HA1OeAbImB6gTbUZfb7X1Xy2bIv5JUa7dCf8PNK7X7W7NiX+T2oAlOB3 gzejWOU9XMHUWNFPfJtVmI2/3BY/xj0RVOrwZi3p8c8Kn992z9q7+t42HUw2jOoe+0WL 52mr1RvuEX+vNXw7fpySGbNn4gyY6MAfSpZedxWKLH/QXbN9bUSlmbEIq3uLk8o+07Ma NOhGJwHgeinN9Ajj+qAGao2E6HMjbb/M7Day/oyvbakeQUYjZA8AgjMfDOXVrp4rqBPl Cw+OUst8QNTpYD2BphaayQhipO4RS4ft79Oy+DxEnFmKRGoxUGGUJjGmvKragg0VJNfr DG0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=Oa6IBatsIaVeBtx9IqnQa720cOdZAC2k9zv9qk3N9Lk=; b=bnBw2qTbHXORlK9rOIjhImuY82mATl77R9SGh0yqfYTD8vV1FsSjtsc/C2nEeBgXBh MT7VXrICfAqaIPairGSVgauqWcPNzhW9ww5W9LI62DJYl7r5MkzLyAsXT3tKRBVp972X lUyfO+wo50OcjkPnzuRuiYsOmwmJrW5vIcbkSghTuGUo5dFu4sS0S7HBhlIcRCZ6K8NU zgbUo+un/Q9qofY6bPpLs2SYes6Fql1R5VvqiMyxYvn5XYqnb85o1Uc8xhQFGIzwpVdH xgTY0RmfjTHtpQTUYs4Ub+cUMSlvrel2J6g7rfJdel6GZqBN3Qhcdj7e+3LWWN0BLE0M 4VKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=boe9RsqS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e9-20020a17090301c900b001a24521e826si17574596plh.61.2023.05.15.09.14.19; Mon, 15 May 2023 09:14:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=boe9RsqS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242525AbjEOQDi (ORCPT + 99 others); Mon, 15 May 2023 12:03:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242182AbjEOQDQ (ORCPT ); Mon, 15 May 2023 12:03:16 -0400 Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 999D3E4A for ; Mon, 15 May 2023 09:03:12 -0700 (PDT) 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-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765977383882428095?= X-GMAIL-MSGID: =?utf-8?q?1765977383882428095?= 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: 94206 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp7032434vqo; Mon, 15 May 2023 09:10:26 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5ykigQAtOn1szQJ/IqrhQxRss2sw44NINsTKsM85fnmGMCe1Y8gVnUblnfaFc/ZEJWLLH2 X-Received: by 2002:a17:902:d4c9:b0:1ac:731f:8f52 with SMTP id o9-20020a170902d4c900b001ac731f8f52mr33783256plg.47.1684167026087; Mon, 15 May 2023 09:10:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684167026; cv=none; d=google.com; s=arc-20160816; b=nJ/Y3uNIR2eeJ4BTc3vw0OxlgPW29CqFZ+fZ0GwQrkwvD8Ax9JhkmOMga+DCOXcqR3 Zh5+Mo4F3Tah0w8SqnJiQDSJFzMTfbD3QNT2se6NVc1EMs4W1Gyg2aEtfaLVtKoSBW5R ULN3RI9Bqy8RaAQmSwszQfiQ0EYdYTNhI50CefdlSTklpOUHKiskUREP7vxYJhQIQmhW utb2BDgmTgaf1NkpHE4xYF9itEysASlZ8UsPpZpIwq3Zad8u4mIpT1QjIRPVLBRKzZ9c aHSEOLaANKdKTqidMy+V3kI8eu04ZIalgFJ5C784oK05rQE3x2VBhanD/NGH5hWItI0E mYUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=sO2n3QpgEqsuayu9y+SZkmQDkAI3LQSlLH/Zd1n/S98=; b=u8CHcM9MSsSevdslLQYobZIFK3ZcPid6LwJTGKhptZrzKYAxKFQ6KdJTbiI5LeSlYU fwrnoMsHU3QchjqRNfQV7Nq6W7gmUAFvdCUd+6SUvUW41MWayh9AWDddU/bmwyGZHM3N GkX0pgEgvF2J9+EPQeEzvZTDEcF+X1EcAKIdcoBLuvlOQD42lPlGkQ+NVk2F3QfHNxQ2 kT1Xm2YKE+SKqr7TmYdwN2Xx3Lqtc7KtGj89DZ9tGjaZ1NfRiVBsJdthOkMa+HWvdWX+ f6uT/dwXlxEYU/jZ6sGp5PpA14cEjMp97f42CzSIPVFxlJL2sEkwsYJ+R14XfTyWMIAz 7lQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=yQ2wAcwr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i8-20020a170902c94800b001a66c501a46si18501787pla.136.2023.05.15.09.10.13; Mon, 15 May 2023 09:10:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=yQ2wAcwr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242423AbjEOQDa (ORCPT + 99 others); Mon, 15 May 2023 12:03:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242327AbjEOQDO (ORCPT ); Mon, 15 May 2023 12:03:14 -0400 Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B10BA3 for ; Mon, 15 May 2023 09:03:10 -0700 (PDT) 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-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765977123187343908?= X-GMAIL-MSGID: =?utf-8?q?1765977123187343908?= 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: 94207 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp7033051vqo; Mon, 15 May 2023 09:11:13 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4IAUn/+x8pyPgWZQdOHh9BaDJSD/4I8KKJ0/nIa7NJ3LXHMeSmUV8I/AS+qR5JV76vlpxo X-Received: by 2002:a17:902:ea11:b0:1ac:7f56:de04 with SMTP id s17-20020a170902ea1100b001ac7f56de04mr32778738plg.45.1684167073444; Mon, 15 May 2023 09:11:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684167073; cv=none; d=google.com; s=arc-20160816; b=wAWUh/m74dWYvYw/KULk5MukmsJsnMH8ur+GIdDaqvvNAM386Wsx8HuM5DmsVdQ5qZ d32x0fXMFeEfl6dVXCgk+SLufaTYzerggGEYezpdC0YAXxVRoGq6pHYtno0+nAxnhYFU 8N77PxJCCnyjgLNpvWRh+aTOOLiaZv5rUHSORbfGNm2uwbaM+JmjosqCKNVthvdl8YD4 OG80cfrGSpeUV/UEiAChTVXg/n7hdSZhF0wAN7DuFLMrgKjvWvMcPpIVVNeqA2R6R+UT GhKOwK+78vgbbF6qjD96fnHQwcVbQ2h6O+fXS9TVySI+u7HAG85Us4leKnpFl3ZI5oRa uJew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=a5SYVmAok1YJ/oGVJSMi5rZ+H8GMZeDc8MDpgYsIOFo=; b=nciPnGfTl3dvC9kEbVbW4hcEOKHcwlpV/n3syaiwR7yjX9c+ZxDPMm3stqkzOJZeeF 8w3qb9w7IIQ8MbuPg/4Xe2CwGv1dUiORhNIxIZzWB2JAcWfMpYJmFwirJofCvdCFdtgp Q/7BR+2/AYL4tH4BTV5ROSDmEV6LMnA1tvc7KgD4ipViqC+QeC4LX5LyKhqmojYHFvQz lTpobnspAnCqzGu6U9d1uMEBgHw2F2W2JLEJqzQg3uBnMC4pHnNyNbzI9Q5MbukTeVuE iv992HswC1tvXd/ohtaRazDJEumHmisjQUg1rHVjgErddg1wrN0WBqxaJxt49ygyCFn0 cd3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=x2ziy4Uc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s10-20020a170902b18a00b001ac4f733007si5316036plr.549.2023.05.15.09.10.59; Mon, 15 May 2023 09:11:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=x2ziy4Uc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242191AbjEOQDS (ORCPT + 99 others); Mon, 15 May 2023 12:03:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242141AbjEOQDJ (ORCPT ); Mon, 15 May 2023 12:03:09 -0400 Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36EE219D for ; Mon, 15 May 2023 09:03:08 -0700 (PDT) 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-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765977173255946545?= X-GMAIL-MSGID: =?utf-8?q?1765977173255946545?= 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: 94213 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp7036281vqo; Mon, 15 May 2023 09:15:44 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6mfzHb0LjWYXRwJJ9uMcdELm1qv5KPYYG+JtCzSMk0ue8ClKmnJl4OLKVKzz7EY4aWKRD+ X-Received: by 2002:a17:903:2292:b0:1a9:bdf8:f551 with SMTP id b18-20020a170903229200b001a9bdf8f551mr40390648plh.69.1684167343286; Mon, 15 May 2023 09:15:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684167343; cv=none; d=google.com; s=arc-20160816; b=LwxHl2uDLd7p3/lcMPN8tjpYlIuyepc9fYwv6CSbpXLoS4qPYVu/ILGaprdBYPMunu uZuhTNEicwg6hVcJoVO0Cyl77Kr55vk6U4z8WRcUIfpO6KbqAWtZeQzW/G5YP73ErkWS aWQcPDWnXlixIeMJrqV8/orLLqFCEnzsW9mbAy0qLXUykvW9LDFqDSesUB6EwzMcLz2p FLvXJoRXjyyyEqYh/N8ZHFO8znPW3pWSvYzlklfdtcQRbcrT9mOrlhi3l3+2Fyu+VjqW eTGrlaYbyUOglzbbda32IKBR8/+PaKwcfYEwrnbgI2ycj53oRe5xXg44dv4ppOW5pCa4 LPmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=CvWvVH18srmviV9eFau3ExXHkDGCjygPOjSsZR1D5Qc=; b=SiPGX1uGXERuMwSK3uhh5ynoSK9K75RiVwYUlfXgZmuJAsm+uVlST1Oi9lnbhPStnY LSkTeNLt6Ygn492zWhCuN01IN7klW+iCslE6pH5eoU+yDKGdkXg8ZnvbCNgSb1LkCiqP j7OFyRQM+jHW7pf/35Iv64V+eQrwxU5MHwW2Bt5rqEWVEbI5bUiCkwf1Zt1WJscFmf8h JzmWXfop9OZWpxQFluPUFaFKDCuv36qf+a8rbCVY2Od8zuZCJSdmqC1NUGtdPXnLIhQJ 75Ih34ZW8371lzuQlEuhkY0AtfvnO6oiwo7eqHxoFC8m5DiV6+NV6uKERlSLfOg2xxfZ EA2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b="si6eZcg/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b9-20020a170902a9c900b001ab1ba2572csi14876024plr.240.2023.05.15.09.15.28; Mon, 15 May 2023 09:15:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b="si6eZcg/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242546AbjEOQDs (ORCPT + 99 others); Mon, 15 May 2023 12:03:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34580 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242375AbjEOQDQ (ORCPT ); Mon, 15 May 2023 12:03:16 -0400 Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B28B010EA for ; Mon, 15 May 2023 09:03:11 -0700 (PDT) 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-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765977456154539292?= X-GMAIL-MSGID: =?utf-8?q?1765977456154539292?= 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: 94205 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp7027622vqo; Mon, 15 May 2023 09:04:27 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6Cq+9FsabbeSTc2l534c+uAom7hycrt8UeQi2Qu2aoZCVOJgdS+LI+dJ9eSeyBjfa4P/N4 X-Received: by 2002:a05:6a20:1613:b0:106:5dff:5db5 with SMTP id l19-20020a056a20161300b001065dff5db5mr3010458pzj.1.1684166667386; Mon, 15 May 2023 09:04:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684166667; cv=none; d=google.com; s=arc-20160816; b=R1pCUj8h97fYIx4ns0UqqiL7oVRRtKMRvwLhLZfCA6EWzlmrZKwkHxZ3p5jZhranpq /EvTajYewrRfLhYTBtijllBHW66phVVxUb+ivrnvY+vRTmKNXlxPGQ6cp+RY4a+LtNZw sU3PLfO96lcsCekCHzzBTfnONFeLvZWX5jBxyoXPvzsdQjYOF+nmmqxUoU0Ca9OdxxYm 3Ul6JCuaNSs1VE2qcdSRItd2ITpF89JqoDl3B3c9uJS2DUpaMQR8tW1MRDMYGP7vk0m6 WqL2Q7HGJTwL1SFCjLa3gbHT6v5JBOFmNspmdsgvN2ZReHGK/C51XpcGeFvSSUyL3I02 qitw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=fWiAiLfECMa60sdqN8J4wC3WNRsL94eqtGa4ZSYPaxE=; b=gtNU/6HpuixcEqW1RhQbVg5bzITfy8WbcQSNykybtiwbKxhH+8HzLbUP5prZ8SVyQB TxfSJYWqkR/ej+KSj7KKrqJBy0hCXRR/T4YqpNA5ox/X5C1a76c260gUzSRcDWEGE3if of0xz2yZyEUj4NjUydFN8X30tBpKSIXk1ANZV2nu4oQ0hIGdHLo/eOjyAErIGQY4UcqR XDisxlLLOAq60w0ol6SdI2G+XV6Nx8H5qJpmB2dnt3+ffY+dLZhAH8xg20UPL7/vM2NE mohURwtX1gViT7PI+BMwP0ljQFUkmN68iWbHtpvXQkQOalV44dchUuIEJMASUGCJBbNI D64Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=FgAVNlsQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p37-20020a635b25000000b005250385bfdbsi16482865pgb.549.2023.05.15.09.04.13; Mon, 15 May 2023 09:04:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=FgAVNlsQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242272AbjEOQDM (ORCPT + 99 others); Mon, 15 May 2023 12:03:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241655AbjEOQDI (ORCPT ); Mon, 15 May 2023 12:03:08 -0400 Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8DC9BA3 for ; Mon, 15 May 2023 09:03:06 -0700 (PDT) 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-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765976747591977318?= X-GMAIL-MSGID: =?utf-8?q?1765976747591977318?= 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: 94210 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp7035447vqo; Mon, 15 May 2023 09:14:32 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5NhYyfnxo/zz8tY1SNx3Ouiy4HiMJpV4WX/L/yoYnZ8CDOZR3cgMXl081T3eM9j9WcNr2z X-Received: by 2002:a17:902:f682:b0:1a6:db0a:8005 with SMTP id l2-20020a170902f68200b001a6db0a8005mr42301667plg.68.1684167271721; Mon, 15 May 2023 09:14:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684167271; cv=none; d=google.com; s=arc-20160816; b=AOo1e4TzvpINQRcVEbbmqKtfj51vLXWy3VOF26F2GbWbi43G0EUMrX5/X2Jdje+b0g GgIS+0w9b54ha+PcSOKctQtH22H/zjpoIlXhuQsdiinynCSh1O+/43DvzEwwGWh6k8in 1PAql2SHsSTzBYlFjML0uF5P0+nu/kn5X2CZleI1OuSoGmKFX4h5yyTSGV5Umk9CFb+Z hGP9JIM5AayrH5CG8bv2RAfFaeKQDap5Fr/HuxQ61f+satc3OMo8euLS2Pl9bpVnkvOR 6XvwyjZOuYHAT15p7uUNyLG4HH7CqjQJMjL8tHPeABHZrHJtYhrcoHmNpBiacaW9Z1IX q/wQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=PH427ORrMteRZ+FasmOGCOeb5m6y7D+/2XMu0ot4hLM=; b=xQuJNpWwO1N/Lurs7ef8ejV42sY90S64qsxp+hUm7lsWzmzyZe4lojf0fOdWlHTbYj UHUkN23aNfpBNv97GNv2KogHMEk7W2+jG+DONTcfODdk6Wio5y/REnhl19alj2JhM8ZZ DFUD7FcWLDXBieu9Tdtr0W3mh6+0QgnWEjThDy81nNSo7HNzKiSb4quF3CrsGPdVYEMJ 1P6l+/YP3bn6AMqSQ1Ar52EHSUXtwSbwbsqjI1RMDMtOPXU464c8XKdwh558VXy20+p7 xhYANQ7GS3nIzjA5Z27HQOmeYURrS0yHBgzBfp3M9CC1OATOH5JFVPfdBHowa3vBnQXL GAbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=DYeM+3zh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ja4-20020a170902efc400b001aaec5cffb2si15324954plb.280.2023.05.15.09.14.11; Mon, 15 May 2023 09:14:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=DYeM+3zh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242541AbjEOQDp (ORCPT + 99 others); Mon, 15 May 2023 12:03:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242152AbjEOQDP (ORCPT ); Mon, 15 May 2023 12:03:15 -0400 Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C9B2F9 for ; Mon, 15 May 2023 09:03:12 -0700 (PDT) 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-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765977381309094815?= X-GMAIL-MSGID: =?utf-8?q?1765977381309094815?= 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: 94215 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp7037144vqo; Mon, 15 May 2023 09:16:55 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7LIMiiBIQjoqkcH4J4B/V71LWfLc/5yz2KYQYswfPJ+UARTIOmXS7oZKcdulEF8BJQh0gp X-Received: by 2002:a05:6a20:4291:b0:100:efa1:eab0 with SMTP id o17-20020a056a20429100b00100efa1eab0mr33701972pzj.2.1684167415188; Mon, 15 May 2023 09:16:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684167415; cv=none; d=google.com; s=arc-20160816; b=RagVgvoG5gE1AeCPW2dQObZ+vZIyKwsh7TWIcK4bSPJdz+ALAZMCuLjucQr+mYwEjw YbmOaAABxSLeAXzAbgwu/2lhNkkzg4dMxRxnm2vK41gNiC9N8A3eff6JQwIJUmMmZTmY gonXXF6+UC9DDpWZeASoEfi5Okf67UdkPuaPaS6poYwWinNCwCimshw/Y7CcJsXZ28yr 1vBKrrjZ1yt1GsqiwAduUyGgJMWPHd0sCBOmHvrhb/FyqGRAmonmrmdbxQbiuC30di5D Bm5S9wq0bdQwatX2V3GRNop2lKyYFKbP5OUsmwq2mtH1FtcQTaJuE4Olae+z9YecOEGw bKDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=af5c91Q+vqJOwLmdyh9Q8efsWJmeqrOcwNcvgIRxRNY=; b=eqAB+ZyL4YNJ/cqaftIfF9f2fYrk4aviPgSwkaEKddGtCe6eDnoQx/l32pzf2lCBeZ T98MsT3b0HBBjiVXhNO8VY/YH27EoSnW9mdnKxTY05I8ETCZV/FEsNwYhARdmsPRUPRR pyobkH2iiFBRxBXl9gA7o/KXQMk0s9fbMf3J9Od01qFfdHwKPM1TJvd2yxDKyN++86Wi 4lursuK89uYbXPTaY4CV0wN61bxmpIhSm/TwGbs9zznhcY0dhmobisLTy+BgW6lHgk/p 4QIwxZc+rrZ/pF5kc9AQ0RUQeQB7DSSvZ7uX+yGC2AfUaIxn9P4CJvQrMSIJdAi+IH8H kMKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=SP84bAZe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bt30-20020a63291e000000b00520d737cf49si15814733pgb.271.2023.05.15.09.16.39; Mon, 15 May 2023 09:16:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=SP84bAZe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242482AbjEOQDe (ORCPT + 99 others); Mon, 15 May 2023 12:03:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34540 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242364AbjEOQDO (ORCPT ); Mon, 15 May 2023 12:03:14 -0400 Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81F3E199 for ; Mon, 15 May 2023 09:03:11 -0700 (PDT) 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-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765977531631587068?= X-GMAIL-MSGID: =?utf-8?q?1765977531631587068?= 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: 94208 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp7033406vqo; Mon, 15 May 2023 09:11:41 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4P/ZtauFufFLxuz3qhd4bf5kg7SpEqj9ZhpZwOeYcF6hWCAzTq4OZFgI+/Qn2pRD9K1ke4 X-Received: by 2002:a05:6a00:188d:b0:636:f899:46a0 with SMTP id x13-20020a056a00188d00b00636f89946a0mr48458874pfh.15.1684167101098; Mon, 15 May 2023 09:11:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684167101; cv=none; d=google.com; s=arc-20160816; b=CraYdm3zR9By+oLVnvJrc5ontpIdRNnLJI7VnM43iVs/syMSRxyKXK4XPGnjNc9yQM YUTLMESKzSpHN/2Koc89SXMf1ZbdB3NegxPO1Vy/XR+gudGCkP4WyriDaHYTnwKP0Pc7 WaIdzy4ixQUXPuxJJTbNrR6UOtDA71xeOzBTU2aLq9UJcDx9XgBu6FqnH0bxayVI0kZl K5e0yC9yCShz4AetBsYrPVgEbJQMKbrs+ZgqLCXyvj1JXVGuNToM5JndIXABG2eCnObj brmhkzQca1TbugwRBNN0JYyUf/suqWssLHJxkAFagPoyKWmg1nONSRSUGqLT3tYgBE85 urBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=e568jHeft8X7DiMKrnio7Zpsq4AqsydpRcGoANzkNRo=; b=bklGk5ONG0eh/hFf2mYvRmVkmcGA+hgscCQNPAOrqnLMj2bxjZwKKiCUisZhZ2GTrc 75M9eFZ54brKlrqwJewotUAfXIrgxMSghUxE11khXpnN+XfzpXhi+hf5Lr0n9JtBMsJd Gaj7451ezvSJ0qIhZgPci9sLDMu4vtL6yeayduP4702jezNCEobSQ2XG0u0KMtRU1E3r Em1DbMzibPy1rtQj8CaeFicwh99xLfND5G1ae2Fl5D0d3jzxano/EHkSSzylTVuol8Yf /zD0HOD8rRsmEOpkVljraepUB0sqqXAL7Q6lO6ORbNOU3QEuYsFAbuWvTC+iEZme1TLi NTyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=d7QYdVwR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b1-20020aa78ec1000000b0063b506e148asi17403934pfr.90.2023.05.15.09.11.26; Mon, 15 May 2023 09:11:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=d7QYdVwR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242536AbjEOQDm (ORCPT + 99 others); Mon, 15 May 2023 12:03:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34464 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241655AbjEOQDP (ORCPT ); Mon, 15 May 2023 12:03:15 -0400 Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E45510F7 for ; Mon, 15 May 2023 09:03:12 -0700 (PDT) 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-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765977202215730034?= X-GMAIL-MSGID: =?utf-8?q?1765977202215730034?= 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: 94209 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp7033911vqo; Mon, 15 May 2023 09:12:25 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6P3j05w+DE2R4zMP/xJTWwgK9DVTo8G9OBGfvumBNiXM9D9hmXEF1+Usnl9oEbLQJgnxY4 X-Received: by 2002:a05:6a00:190e:b0:646:2ec8:3360 with SMTP id y14-20020a056a00190e00b006462ec83360mr32895699pfi.23.1684167145546; Mon, 15 May 2023 09:12:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684167145; cv=none; d=google.com; s=arc-20160816; b=Kjx3bXoymllsmAEsLRoTcyikD1EfnNKbtcnPvZgRvK9yx1amRfES2tVdFezAWeUm+S gEjPzV1F47PJ3esni/F+lR65zVbfGAd5OlTR4yPLTbRJ5stdIiCL1NIA72x9MoXi/bAH jsCf3GQRqHwtE1Qh9IofUu95nF5hmpRhTDs78eHHBNrwosEqSot7JbgQXoLhsTliQgK+ 9gaJUQOnMncw0NnSTzghA/QGXeANW3oVzuFsrJfndWg6JpuMfq2rKW5avMCTjqyJ9I5y R0V4UNrj0WSCHOePfZ8NqOiZn6K52e6B9NlVwRHWgJk2hn66Sc1DKgDP03+ZwCETynnL xWFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=5eShS47428T2bRPRMMSWbirvyOAz0ibuKCszyB2qk5A=; b=Z5gQbro44a0xJPNFaiphIis+9mL1hftqb4rdtBsFDB0faLMk5BHYLwxp0YkJPEYD1F zWsyb/Xu/d9OL2IbPRuEAPg3ARA0ouyEDbmsasN7JqJ/N2SWftw0GitA7v9PQGUFvcjW 3nbcI95yRGoKL15fVqwEfNgERhxUiZeSzpi6HTs8Bu9cDgIbsv/oYgSRJlMWEFsDeb0+ dYiUPSX37AKzB6HcyLzXaGPHJcbOJq1mBNepaAzuoQPfxbeP1Gd227OKAzRJDzfxtvXx +9mbvnSMbKE+2R15ISY6BoAUiLY/sXDDFV6XA0RQ7D9EDt8pFfwvTpPTt+aW5TXFnZBG En7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=T0g1YukM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 70-20020a621749000000b00643b0e26777si16899107pfx.8.2023.05.15.09.12.10; Mon, 15 May 2023 09:12:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=T0g1YukM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242358AbjEOQD1 (ORCPT + 99 others); Mon, 15 May 2023 12:03:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242229AbjEOQDM (ORCPT ); Mon, 15 May 2023 12:03:12 -0400 Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 849CBE5A for ; Mon, 15 May 2023 09:03:09 -0700 (PDT) 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-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765977248864799498?= X-GMAIL-MSGID: =?utf-8?q?1765977248864799498?= 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: 94212 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp7035566vqo; Mon, 15 May 2023 09:14:41 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7yHg9c+l6WEsuz5zESnwe8sN56hkV+MhdIHSAqvhWnbg831XypA3sJ2FgJh/tPfrqbW/xt X-Received: by 2002:a17:902:9005:b0:1ad:eb16:35e2 with SMTP id a5-20020a170902900500b001adeb1635e2mr9063081plp.66.1684167281577; Mon, 15 May 2023 09:14:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684167281; cv=none; d=google.com; s=arc-20160816; b=aGzmFeZTXL0naDJEMTy64orw891gyMzqaUO6KboQgeEbz3ujmc2W+GXy2cL7J6MPnc dqjksQwc6nqJn7Z40ztH9UDFSwGbOkctcZIwDv9tO1kxwzBQC07P3oDHqna4OcOqZjRv lccQfizqoEUVOox8OuVJ160jqF6wjTFfIfeo/NSgM3Yo6SLSV+Muh/tfIXf5PdYh1tgZ 1aiTOsD1jD+vhAHciFMlI0GRwLhm9m0LQ3p3o073sQahn9olT2Y7zrbbQ3Ix1GFsBPyi 0l3y5r5CaTfWQmRBvLnFBIbLyCtibtUYNjlv4bJdY7pIP5P7u0CNP/8DOkeyv9pcxGCd qy5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=NyxnYDfYOZQyNyIiR3B05+UIDCkBUdv/tTr9EGJ+AJc=; b=JyMjsFjTbahpmVRUgpoKzVFwob2Er75UXwj5pOBHIJGkkBFSzWtFcVqVUKb/g2z2iO fzAzM8fpUbhGZEThpWei2c/iWrXaFcnDvOxeJHiHsynSv4vs991nzwtLKVs3Yj/P+605 ErKG8xEzjlNYtEnDnbXCc0pRAe4R8wGbgzChxT93pcA4tS0QsFXOSVa9xsJn3982aE93 sodn2nlDOlSQABYhw11YhQkmvM0TsPxWfCzMNq3pthMz1klB31OovsixUl21BtAzjJSj 7LcEtnTBYBn1PazRjXubrh7u6yuh7P+IuuTX5SDw5Mi8UKMtzNIteWR8l6VhcHd7/DEt ZgtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=yKdJQ5BB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j2-20020a170902da8200b001ab03aca06csi17354566plx.643.2023.05.15.09.14.26; Mon, 15 May 2023 09:14:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=yKdJQ5BB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242552AbjEOQDy (ORCPT + 99 others); Mon, 15 May 2023 12:03:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34484 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242402AbjEOQDR (ORCPT ); Mon, 15 May 2023 12:03:17 -0400 Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0674E1987 for ; Mon, 15 May 2023 09:03:12 -0700 (PDT) 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-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765977391454776309?= X-GMAIL-MSGID: =?utf-8?q?1765977391454776309?= 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