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)