From patchwork Thu Sep 14 11:17:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 13385009 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 99D2FEDE9A7 for ; Thu, 14 Sep 2023 11:18:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=EtxRD9pJKBgR72Na3xM1z4yQ2jUjcpF0LT3iY+TeSPw=; b=dSqM+14w+LTQsi K29cqKZYF/zoLKh3YEIHGVr2cVlnkvnBf1YLcF+eVhvOtRZoZfig4Hd7oAb3M81YYXSV93z1ZsB8+ MdwA6yNTKHJ/y0oJCYuqQLngoHoooqxzIZwW8eK/zXVlEnJdPR0FcyMR0RdG5486z+MMyRNGOBAJz jEzyUB0/Ow85ohNMN5DDGz3jcCTAwPy0P6ackCGLyrzhzIh5ZcMRw7nJz+l4SrHNv7sV8vqcnVHaG 44xsL0DoMvRMyArdVnq7xg17usX7oGVbxZ/51YUHSms/FcNTdX+guHXkw6wCc4B8niE6oZBQav0TO RwIdBBOMBWNhI9nzKaAw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qgkLt-008DMW-0i; Thu, 14 Sep 2023 11:17:41 +0000 Received: from mail-lj1-x22e.google.com ([2a00:1450:4864:20::22e]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qgkLq-008DKq-2u for linux-arm-kernel@lists.infradead.org; Thu, 14 Sep 2023 11:17:40 +0000 Received: by mail-lj1-x22e.google.com with SMTP id 38308e7fff4ca-2b962c226ceso12347711fa.3 for ; Thu, 14 Sep 2023 04:17:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694690255; x=1695295055; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=FEe0O9FNWF0PRk2EeQvO8Dbf6wLGmNuQMW1XScp3I4I=; b=O49Yqbk9UfxZF0SXITF48wMwWEp40QF2kNaQ4Jr6DKn3h/yvVL6+ZeaUqMcONztv77 PvTxvIXVDNXV7ph5YvVVd5ndwc/BuqxaQV+g/dvlBCQYg9eZMj0E8Ps9HYBAh30YP4wW 8N/4cXlDnz6h3E34zPlX7Bvdscu4AweVrh+KvQVUuWDPre70OYwlNM7cAk17RwZ75qrr NwsXcu7o2I3d3961WWJ0oDbXqne9fysJT9KQRNhot0YSqHSCj4sER6gU9R7VM3agSYtx eia6vOGvlLB16I7fSD6igd2yclEb0deyTsuwoDQl+znUJPQ3gk16UVGOr9TSvOwHVYmL UlwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694690255; x=1695295055; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=FEe0O9FNWF0PRk2EeQvO8Dbf6wLGmNuQMW1XScp3I4I=; b=oWMjQe8LlV1cmWkkW8kw1OJonj3ZpbHn1WT3Iwj2cnH5KoO0guWsUKVjdkLrSrH5gh MDuG7n0p9aITgCsg+3bBjsHpbL2EMj5aR17g/MsrpW2sC1M1Rqbxnl9xxwHrUmOlb0mT LAPuq3PFds5fh58s/aJLJZUQszb7QaFkCEhTjgQtaelM3vgzByqTRRaUCqQeWhziY6p0 6SK+kDRQZvusQ0t0T9iMwY+kfntXbf5Z6NfdZPt1cLtHiHdMoUROHbUaKYsV9VtS0hW2 SY4eQ5ygonbJLHVAOfnXE7Bml5xiFYdVsMPSdRSsLgM3qI8QGcjhqMeeil9YEFimfy1m si7A== X-Gm-Message-State: AOJu0Yzj5eF6T5KbPKdeJNAnCg8MAwD9jyAPBdLxfK2Dk9hb2KOXFV+n dSt3OpxqnwyR9L6LiugJ7DPegA== X-Google-Smtp-Source: AGHT+IGaEOK/RpuGALw8XgYDXCUZMKnfRxZ33kxqHOwpa09VEzdpFcREoV9i67p91oXBarsERZBEbA== X-Received: by 2002:a2e:b045:0:b0:2b9:3883:a765 with SMTP id d5-20020a2eb045000000b002b93883a765mr4950619ljl.31.1694690254937; Thu, 14 Sep 2023 04:17:34 -0700 (PDT) Received: from uffe-tuxpro14.. (h-94-254-63-18.NA.cust.bahnhof.se. [94.254.63.18]) by smtp.gmail.com with ESMTPSA id h13-20020a2eb0ed000000b002b9e65912cesm226190ljl.140.2023.09.14.04.17.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 04:17:34 -0700 (PDT) From: Ulf Hansson To: Arnd Bergmann , Olof Johansson Cc: Ulf Hansson , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Shawn Guo , Sascha Hauer , Fabio Estevam , Peng Fan , kernel@pengutronix.de, linux-imx@nxp.com Subject: [PATCH 06/17] pmdomain: imx: Move Kconfig options to the pmdomain subsystem Date: Thu, 14 Sep 2023 13:17:31 +0200 Message-Id: <20230914111731.586564-1-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230914_041738_934946_DAEB133B X-CRM114-Status: GOOD ( 16.84 ) 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 The Kconfig options belongs closer to the corresponding implementations, hence let's move them from the soc- and firmware subsystem to the pmdomain subsystem. Cc: Shawn Guo Cc: Sascha Hauer Cc: Fabio Estevam Cc: Peng Fan Cc: Cc: Signed-off-by: Ulf Hansson Acked-by: Shawn Guo --- drivers/firmware/imx/Kconfig | 6 ------ drivers/pmdomain/Kconfig | 1 + drivers/pmdomain/imx/Kconfig | 29 +++++++++++++++++++++++++++++ drivers/soc/imx/Kconfig | 19 ------------------- 4 files changed, 30 insertions(+), 25 deletions(-) create mode 100644 drivers/pmdomain/imx/Kconfig diff --git a/drivers/firmware/imx/Kconfig b/drivers/firmware/imx/Kconfig index c027d99f2a59..183613f82a11 100644 --- a/drivers/firmware/imx/Kconfig +++ b/drivers/firmware/imx/Kconfig @@ -22,9 +22,3 @@ config IMX_SCU This driver manages the IPC interface between host CPU and the SCU firmware running on M4. - -config IMX_SCU_PD - bool "IMX SCU Power Domain driver" - depends on IMX_SCU - help - The System Controller Firmware (SCFW) based power domain driver. diff --git a/drivers/pmdomain/Kconfig b/drivers/pmdomain/Kconfig index a0569a44ff4b..8a02523b62ce 100644 --- a/drivers/pmdomain/Kconfig +++ b/drivers/pmdomain/Kconfig @@ -5,5 +5,6 @@ source "drivers/pmdomain/actions/Kconfig" source "drivers/pmdomain/amlogic/Kconfig" source "drivers/pmdomain/apple/Kconfig" source "drivers/pmdomain/bcm/Kconfig" +source "drivers/pmdomain/imx/Kconfig" endmenu diff --git a/drivers/pmdomain/imx/Kconfig b/drivers/pmdomain/imx/Kconfig new file mode 100644 index 000000000000..ef964df0f856 --- /dev/null +++ b/drivers/pmdomain/imx/Kconfig @@ -0,0 +1,29 @@ +# SPDX-License-Identifier: GPL-2.0-only +menu "i.MX Power Domains" + +config IMX_GPCV2_PM_DOMAINS + bool "i.MX GPCv2 PM domains" + depends on ARCH_MXC || (COMPILE_TEST && OF) + depends on PM + select PM_GENERIC_DOMAINS + select REGMAP_MMIO + default y if SOC_IMX7D + +config IMX8M_BLK_CTRL + bool + default SOC_IMX8M && IMX_GPCV2_PM_DOMAINS + depends on PM_GENERIC_DOMAINS + depends on COMMON_CLK + +config IMX9_BLK_CTRL + bool + default SOC_IMX9 && IMX_GPCV2_PM_DOMAINS + depends on PM_GENERIC_DOMAINS + +config IMX_SCU_PD + bool "IMX SCU Power Domain driver" + depends on IMX_SCU + help + The System Controller Firmware (SCFW) based power domain driver. + +endmenu diff --git a/drivers/soc/imx/Kconfig b/drivers/soc/imx/Kconfig index 76a4593baf0a..2a90ddd20104 100644 --- a/drivers/soc/imx/Kconfig +++ b/drivers/soc/imx/Kconfig @@ -1,14 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only menu "i.MX SoC drivers" -config IMX_GPCV2_PM_DOMAINS - bool "i.MX GPCv2 PM domains" - depends on ARCH_MXC || (COMPILE_TEST && OF) - depends on PM - select PM_GENERIC_DOMAINS - select REGMAP_MMIO - default y if SOC_IMX7D - config SOC_IMX8M tristate "i.MX8M SoC family support" depends on ARCH_MXC || COMPILE_TEST @@ -28,15 +20,4 @@ config SOC_IMX9 help If you say yes here, you get support for the NXP i.MX9 family -config IMX8M_BLK_CTRL - bool - default SOC_IMX8M && IMX_GPCV2_PM_DOMAINS - depends on PM_GENERIC_DOMAINS - depends on COMMON_CLK - -config IMX9_BLK_CTRL - bool - default SOC_IMX9 && IMX_GPCV2_PM_DOMAINS - depends on PM_GENERIC_DOMAINS - endmenu