From patchwork Thu Sep 14 11:17:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 13384999 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AAD13EDE9A4 for ; Thu, 14 Sep 2023 11:17:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236392AbjINLRc (ORCPT ); Thu, 14 Sep 2023 07:17:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49884 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236413AbjINLRc (ORCPT ); Thu, 14 Sep 2023 07:17:32 -0400 Received: from mail-lf1-x135.google.com (mail-lf1-x135.google.com [IPv6:2a00:1450:4864:20::135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15CF31FD2 for ; Thu, 14 Sep 2023 04:17:28 -0700 (PDT) Received: by mail-lf1-x135.google.com with SMTP id 2adb3069b0e04-502e0b7875dso1438591e87.0 for ; Thu, 14 Sep 2023 04:17:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694690246; x=1695295046; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=V3mbgmnyoTrMzfffrRfxAP2RkuD6rjug1WQEvOx/n/U=; b=wWKnfGgixpdGbd7X4MXR4aRd1/BE+XkIMHECkIOmxY0LaUEJeZA+TEbJ0RchFFATaC xna2aBnr2EcZ+f9EXthRf3c0v52ZunDaY6zMaGFfl7RfH/obvvBLUmUFYHBwAKudpwrU Ny57VzA3zRQkhuBdNRXG/Y1BN3zeUv7HbR2j2iKYUj36+TrR2/kKECUJsbYDKQco/pPH z1c8ZfH1hrLh+CZ6L/OpG0B2iHgWF8B1kqq859qpO70GbZhWxk6xKcMcXXdkME+Ov7Bf VDKBbUEnCMD29LOMe5g997FNuvDAryZOuvWHNaRZVqHibUNsKoQ+Z8Uw2bvuBNNbK3Kp 1nww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694690246; x=1695295046; 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=V3mbgmnyoTrMzfffrRfxAP2RkuD6rjug1WQEvOx/n/U=; b=ECQiwEdjMYdwm1pEdKX7CE4odsnn38em/aqfKsmjJpKWqmAqX5+TVvCRp1U2d3GFwa WkHKgBqe3WtfL7jBmNQxGoUZdv/+p6/xWsmisH1QtfQeBhLhPFQJutbsTtClXObNfc3N eSp98PL8YF3j1KgPko5SIw+Lax6mIlvIQOFVdr27Kqjs2Em3/e/DwrerCYSd6r1qW/Tz nmFYK77lpQ5YmMFbr17ApuYqlY8G0Xn0M9/aqGaEpraXuxDgIkeObNrDHuCTKl1FnnHY pojtTwsPzLzJJX4lNpJ+I8ooVZLNN8UIGj+wY/I/P0B56+u5Rnrd2wltlDlkoRPsjhgP 3oTg== X-Gm-Message-State: AOJu0YxdUJxDRMrQx3NTM+XSimKmIXwxGRRH63n9Z+B34XwmnLsuy5A6 A/gaui/AA/ujlcO1LOkXWvwAyg== X-Google-Smtp-Source: AGHT+IEJ5kh0s85nneZdUyXZTaobo6Y9st5U7pZU2uaiIVoFsmea5woLy3l43yDv/hY8fs+c1T43FA== X-Received: by 2002:a05:6512:1585:b0:500:bf33:3add with SMTP id bp5-20020a056512158500b00500bf333addmr6038147lfb.47.1694690246319; Thu, 14 Sep 2023 04:17:26 -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 r9-20020a056512102900b004fe48d0b639sm237143lfr.83.2023.09.14.04.17.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 04:17:25 -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, Florian Fainelli , Ray Jui , Scott Branden , linux-mips@vger.kernel.org, linux-rpi-kernel@lists.infradead.org Subject: [PATCH 05/17] pmdomain: bcm: Move Kconfig options to the pmdomain subsystem Date: Thu, 14 Sep 2023 13:17:21 +0200 Message-Id: <20230914111721.586543-1-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org The Kconfig options belongs closer to the corresponding implementations, hence let's move them from the soc subsystem to the pmdomain subsystem. Cc: Florian Fainelli Cc: Ray Jui Cc: Scott Branden Cc: Cc: Signed-off-by: Ulf Hansson --- drivers/pmdomain/Kconfig | 1 + drivers/pmdomain/bcm/Kconfig | 46 ++++++++++++++++++++++++++++++++++++ drivers/soc/bcm/Kconfig | 42 -------------------------------- 3 files changed, 47 insertions(+), 42 deletions(-) create mode 100644 drivers/pmdomain/bcm/Kconfig diff --git a/drivers/pmdomain/Kconfig b/drivers/pmdomain/Kconfig index 55a9ca191849..a0569a44ff4b 100644 --- a/drivers/pmdomain/Kconfig +++ b/drivers/pmdomain/Kconfig @@ -4,5 +4,6 @@ menu "Power Domains Support" source "drivers/pmdomain/actions/Kconfig" source "drivers/pmdomain/amlogic/Kconfig" source "drivers/pmdomain/apple/Kconfig" +source "drivers/pmdomain/bcm/Kconfig" endmenu diff --git a/drivers/pmdomain/bcm/Kconfig b/drivers/pmdomain/bcm/Kconfig new file mode 100644 index 000000000000..a4ee960b4749 --- /dev/null +++ b/drivers/pmdomain/bcm/Kconfig @@ -0,0 +1,46 @@ +# SPDX-License-Identifier: GPL-2.0-only +menu "Broadcom Power Domains" + +config BCM2835_POWER + bool "BCM2835 power domain driver" + depends on ARCH_BCM2835 || (COMPILE_TEST && OF) + default y if ARCH_BCM2835 + select PM_GENERIC_DOMAINS if PM + select RESET_CONTROLLER + help + This enables support for the BCM2835 power domains and reset + controller. Any usage of power domains by the Raspberry Pi + firmware means that Linux usage of the same power domain + must be accessed using the RASPBERRYPI_POWER driver + +config RASPBERRYPI_POWER + bool "Raspberry Pi power domain driver" + depends on ARCH_BCM2835 || (COMPILE_TEST && OF) + depends on RASPBERRYPI_FIRMWARE=y + select PM_GENERIC_DOMAINS if PM + help + This enables support for the RPi power domains which can be enabled + or disabled via the RPi firmware. + +config BCM_PMB + bool "Broadcom PMB (Power Management Bus) driver" + depends on ARCH_BCMBCA || (COMPILE_TEST && OF) + default ARCH_BCMBCA + select PM_GENERIC_DOMAINS if PM + help + This enables support for the Broadcom's PMB (Power Management Bus) that + is used for disabling and enabling SoC devices. + +if SOC_BCM63XX + +config BCM63XX_POWER + bool "BCM63xx power domain driver" + depends on BMIPS_GENERIC || (COMPILE_TEST && OF) + select PM_GENERIC_DOMAINS if PM + help + This enables support for the BCM63xx power domains controller on + BCM6318, BCM6328, BCM6362 and BCM63268 SoCs. + +endif # SOC_BCM63XX + +endmenu diff --git a/drivers/soc/bcm/Kconfig b/drivers/soc/bcm/Kconfig index f96906795fa6..406617aa3056 100644 --- a/drivers/soc/bcm/Kconfig +++ b/drivers/soc/bcm/Kconfig @@ -1,27 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only menu "Broadcom SoC drivers" -config BCM2835_POWER - bool "BCM2835 power domain driver" - depends on ARCH_BCM2835 || (COMPILE_TEST && OF) - default y if ARCH_BCM2835 - select PM_GENERIC_DOMAINS if PM - select RESET_CONTROLLER - help - This enables support for the BCM2835 power domains and reset - controller. Any usage of power domains by the Raspberry Pi - firmware means that Linux usage of the same power domain - must be accessed using the RASPBERRYPI_POWER driver - -config RASPBERRYPI_POWER - bool "Raspberry Pi power domain driver" - depends on ARCH_BCM2835 || (COMPILE_TEST && OF) - depends on RASPBERRYPI_FIRMWARE=y - select PM_GENERIC_DOMAINS if PM - help - This enables support for the RPi power domains which can be enabled - or disabled via the RPi firmware. - config SOC_BCM63XX bool "Broadcom 63xx SoC drivers" depends on BMIPS_GENERIC || COMPILE_TEST @@ -42,27 +21,6 @@ config SOC_BRCMSTB If unsure, say N. -config BCM_PMB - bool "Broadcom PMB (Power Management Bus) driver" - depends on ARCH_BCMBCA || (COMPILE_TEST && OF) - default ARCH_BCMBCA - select PM_GENERIC_DOMAINS if PM - help - This enables support for the Broadcom's PMB (Power Management Bus) that - is used for disabling and enabling SoC devices. - -if SOC_BCM63XX - -config BCM63XX_POWER - bool "BCM63xx power domain driver" - depends on BMIPS_GENERIC || (COMPILE_TEST && OF) - select PM_GENERIC_DOMAINS if PM - help - This enables support for the BCM63xx power domains controller on - BCM6318, BCM6328, BCM6362 and BCM63268 SoCs. - -endif # SOC_BCM63XX - source "drivers/soc/bcm/brcmstb/Kconfig" endmenu