From patchwork Mon May 15 16:02:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 13241725 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 67CA2C77B75 for ; Mon, 15 May 2023 16:03:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=BCTHSnKm4GqUo35swGHp5BVB0FDIfNNE11Rk06K2I/A=; b=gXadC0AVYteIcj VgRIw+LZLZY3xRqL4rf02600KVO1aPeZOlqGvW8L3tTodQ+TDbPEFwor6KGZkq3lpCrifL4bG4Pz5 QhDexer8BisYZaxk4Whsa+vOrwAk4M4+62K0O2zNAAMwtJIix+x2Ep4LcZWMo1CWVELQ4w+UGHKVE 2844O10jay+kt4YmE8g3yhv+qUSMhj6TbCc5Fz578Xsi7lxbL0Pjvt0u/FhnyMfGYlJ3cmNrGVfRp iuyeXH7Q+kLPCp5YTItCAysNQ8tWS8nH8ZlETvxJI+Iif9WG1r/Q4e9sNBMseyQr5IQr6qFDUtLRo giAInVg8BwVyyT64f9Kg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pyafG-002fHM-2I; Mon, 15 May 2023 16:03:10 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pyafA-002fF7-0r for linux-arm-kernel@bombadil.infradead.org; Mon, 15 May 2023 16:03:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Content-Transfer-Encoding :MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From: Sender:Reply-To:Content-ID:Content-Description; bh=CvWvVH18srmviV9eFau3ExXHkDGCjygPOjSsZR1D5Qc=; b=RCQauZKt4MtoQsMG1ZZW7kHyIo mrbipr8oq/CIkIAf5StW9i2Ye6DU16xaPGJlkk8iPomD9KRKgHX0/gkqVLxaO61UOujtgmatL3+jv 8g2ONZNuL0ukqOH7oJPWqCo8UmkR+5hvqzl1zDVoFCoxvsm56hc9NvqQ//H2otsmMmoWQH5O2Aabc QD2n/mcXCLQg7J91g65EO/rGIwjC5Sd8VSdi6/Wc9ySpkdfyuGPZPRt8I9rYhFG8QFGWRwkmIpIT3 GQ9s9NsBaJwtV8wY5xSEgNf1q6C5rFoBMUNu3I2fJes7JxHqd68XX3fHR/d6mDIvTR3MKsxNSXCQZ VW7ZFN9A==; Received: from fllv0015.ext.ti.com ([198.47.19.141]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pyaf4-00BVwT-2m for linux-arm-kernel@lists.infradead.org; Mon, 15 May 2023 16:03:02 +0000 Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 34FG2cN7004409; Mon, 15 May 2023 11:02:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1684166558; bh=CvWvVH18srmviV9eFau3ExXHkDGCjygPOjSsZR1D5Qc=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=si6eZcg/SfwtqS0U/MmbAQmT6BRR8aoEtPKMPRctW22OLegmq2BovFN1mps13tHAg YcgZ4UL9HiEdL32gYzx/3JXeP0A8QFA/hRf0OEMQ8IWK0muziPlh7uvlIjkyhXkxO6 dqFHUoTGJNLwpEiiRyWAdmU/ea58tcw03UE6Bvq8= Received: from DLEE114.ent.ti.com (dlee114.ent.ti.com [157.170.170.25]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 34FG2cF8060787 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 15 May 2023 11:02:38 -0500 Received: from DLEE114.ent.ti.com (157.170.170.25) by DLEE114.ent.ti.com (157.170.170.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Mon, 15 May 2023 11:02:37 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DLEE114.ent.ti.com (157.170.170.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Mon, 15 May 2023 11:02:37 -0500 Received: from lelv0327.itg.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 34FG2ZR3029578; Mon, 15 May 2023 11:02:37 -0500 From: Andrew Davis To: Russell King , Baruch Siach , Vladimir Zapolskiy , Kunihiko Hayashi , Masami Hiramatsu , Arnd Bergmann , Geert Uytterhoeven , Linus Walleij CC: , , Andrew Davis Subject: [PATCH 04/10] ARM: mach-uniphier: Move Socionext UniPhier support into Kconfig.platforms Date: Mon, 15 May 2023 11:02:28 -0500 Message-ID: <20230515160234.289631-4-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230515160234.289631-1-afd@ti.com> References: <20230515160234.289631-1-afd@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230515_170259_185815_C88BE6A1 X-CRM114-Status: GOOD ( 14.01 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This removes the need for a dedicated Kconfig and empty mach directory. Signed-off-by: Andrew Davis --- MAINTAINERS | 1 - arch/arm/Kconfig | 2 -- arch/arm/Kconfig.platforms | 15 +++++++++++++++ arch/arm/mach-uniphier/Kconfig | 15 --------------- 4 files changed, 15 insertions(+), 18 deletions(-) delete mode 100644 arch/arm/mach-uniphier/Kconfig diff --git a/MAINTAINERS b/MAINTAINERS index e0ad886d3163..b4d226f87413 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2977,7 +2977,6 @@ F: Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.yaml F: Documentation/devicetree/bindings/soc/socionext/socionext,uniphier*.yaml F: arch/arm/boot/dts/uniphier* F: arch/arm/include/asm/hardware/cache-uniphier.h -F: arch/arm/mach-uniphier/ F: arch/arm/mm/cache-uniphier.c F: arch/arm64/boot/dts/socionext/uniphier* F: drivers/bus/uniphier-system-bus.c diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 62073a43933c..75d56ad5eb27 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -462,8 +462,6 @@ source "arch/arm/mach-sunxi/Kconfig" source "arch/arm/mach-tegra/Kconfig" -source "arch/arm/mach-uniphier/Kconfig" - source "arch/arm/mach-ux500/Kconfig" source "arch/arm/mach-versatile/Kconfig" diff --git a/arch/arm/Kconfig.platforms b/arch/arm/Kconfig.platforms index 80f5b040e6ef..0e6d7172bf61 100644 --- a/arch/arm/Kconfig.platforms +++ b/arch/arm/Kconfig.platforms @@ -83,3 +83,18 @@ config ARCH_RDA select RDA_TIMER help This enables support for the RDA Micro 8810PL SoC family. + +config ARCH_UNIPHIER + bool "Socionext UniPhier SoCs" + depends on ARCH_MULTI_V7 + select ARCH_HAS_RESET_CONTROLLER + select ARM_AMBA + select ARM_GLOBAL_TIMER + select ARM_GIC + select HAVE_ARM_SCU + select HAVE_ARM_TWD if SMP + select PINCTRL + select RESET_CONTROLLER + help + Support for UniPhier SoC family developed by Socionext Inc. + (formerly, System LSI Business Division of Panasonic Corporation) diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig deleted file mode 100644 index e661d2626675..000000000000 --- a/arch/arm/mach-uniphier/Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -config ARCH_UNIPHIER - bool "Socionext UniPhier SoCs" - depends on ARCH_MULTI_V7 - select ARCH_HAS_RESET_CONTROLLER - select ARM_AMBA - select ARM_GLOBAL_TIMER - select ARM_GIC - select HAVE_ARM_SCU - select HAVE_ARM_TWD if SMP - select PINCTRL - select RESET_CONTROLLER - help - Support for UniPhier SoC family developed by Socionext Inc. - (formerly, System LSI Business Division of Panasonic Corporation)