From patchwork Mon Nov 13 14:43:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 164520 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1250091vqg; Mon, 13 Nov 2023 06:46:06 -0800 (PST) X-Google-Smtp-Source: AGHT+IGewa5jgzSC5vSNXjJ8502S1YH5kfqSqLE8b4L3MwG8t9aGDhXXNhVB/ThBUvjY37vliPFZ X-Received: by 2002:a05:6e02:1c27:b0:359:4fde:6294 with SMTP id m7-20020a056e021c2700b003594fde6294mr10586351ilh.23.1699886766763; Mon, 13 Nov 2023 06:46:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699886766; cv=none; d=google.com; s=arc-20160816; b=f38TnoTYNumWlwICP+J1VmGrrWke5SLa026xYNlzADoB0oq/eJWcrh1SuA5tY+2NK+ Fk8KCfEC22zftFCvNRBphRkufyT8q4lEbR8WHmR3OhUyZr1NInrf1hNqb5ljLh8m1Ass c8KYpPugsF7mMV5J/vziel021w5j5QHCd+zLzfdS19s3xUrvsR6ij0GS613lJgXJkcj1 tgzVcy2+1loozaCVBdedxO9KZeCNDRUujypZAR8cLFmMGNbfJYvhSM+Ws7qUDmLaS6jT kOQOAxRdsuxCT9XGzHw3RrnKedqqkPg9lMB+bmneKHCoDqFc2S1sM0P9kh69ahLtdeoO sMqQ== 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=2SyH5C6gOJmXesbqq8s7jtqwxCiGGHT1GOwL0ZOwhnQ=; fh=K3zJQyTKBLAkBucIcWM7aB9VmIORN+yDy3I0HaPGyfk=; b=W/4PoZbw9n4P6x2rvuQ4inv/BKP9KP6woE+oJDlulZsRb+Ab4btffOD2PGtw34fa1m Oj+PypZQWt9vcRk/8GeT7zzPMX6sTSVGxHck7IgGnlGA5ShSve8yUMs7vM/zuMTGhYqs P5k81KpMs5rGrJvL07DRou+Q/NYV99HuYgL9zUVkUbaGAdAKWia9mVU8bXML3Q3LoQNf WEYjwO6QyDvqU+JPhDfb16qICguNsJG6MWVMw4ibxHjA0jgKZ5Z0Fz3qc4aAQodrSYs2 TTbzEbVMF322eb80M2EBli4xLtL9l2NrJIn39XaQ0rQ0GYpur7TbfwiaOgzuGtvIjhZO +Htg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=zJpLzYSV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id h38-20020a63f926000000b005acf0458523si5457184pgi.612.2023.11.13.06.46.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 06:46:06 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=zJpLzYSV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id CE9CF809C904; Mon, 13 Nov 2023 06:45:07 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230253AbjKMOoo (ORCPT + 29 others); Mon, 13 Nov 2023 09:44:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229612AbjKMOom (ORCPT ); Mon, 13 Nov 2023 09:44:42 -0500 Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7891210FB for ; Mon, 13 Nov 2023 06:44:38 -0800 (PST) Received: from fllv0034.itg.ti.com ([10.64.40.246]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 3ADEi4Y8019402; Mon, 13 Nov 2023 08:44:04 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1699886644; bh=2SyH5C6gOJmXesbqq8s7jtqwxCiGGHT1GOwL0ZOwhnQ=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=zJpLzYSVyeh4NYyHTiYMY/bdtcIGJDFlKSyiHaiQey6TgMn7N1cQV1IdObnA6PfAq Cf1caAMffkMQr85885EMqq/aPJWLXIwP9t5vicopxJ4NahRLv59qZbArrnN/ygCD+5 yfNQQ4J75UgCSA2oKleM2RAwP1GvXgcXq3SUX2KU= Received: from DFLE109.ent.ti.com (dfle109.ent.ti.com [10.64.6.30]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 3ADEi40q094092 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 13 Nov 2023 08:44:04 -0600 Received: from DFLE110.ent.ti.com (10.64.6.31) by DFLE109.ent.ti.com (10.64.6.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Mon, 13 Nov 2023 08:44:03 -0600 Received: from fllv0039.itg.ti.com (10.64.41.19) 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 via Frontend Transport; Mon, 13 Nov 2023 08:44:03 -0600 Received: from fllv0040.itg.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 3ADEi0tw065232; Mon, 13 Nov 2023 08:44:03 -0600 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 v3 4/9] ARM: mach-uniphier: Move Socionext UniPhier support into Kconfig.platforms Date: Mon, 13 Nov 2023 08:43:54 -0600 Message-ID: <20231113144359.174140-5-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231113144359.174140-1-afd@ti.com> References: <20231113144359.174140-1-afd@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Mon, 13 Nov 2023 06:45:08 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782460466473466788 X-GMAIL-MSGID: 1782460466473466788 This removes the need for a dedicated Kconfig and empty mach directory. Signed-off-by: Andrew Davis Reviewed-by: Masami Hiramatsu (Google) --- 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 97f51d5ec1cfd..b1ee757a4306d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2957,7 +2957,6 @@ F: Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.yaml F: Documentation/devicetree/bindings/soc/socionext/socionext,uniphier*.yaml F: arch/arm/boot/dts/socionext/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 e1aeaf25d7aab..cfdfba4d52e19 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -466,8 +466,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 80f5b040e6ef4..0e6d7172bf61e 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 e661d26266751..0000000000000 --- 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)