From patchwork Fri Sep 15 09:19:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 13386672 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 1713AEE644D for ; Fri, 15 Sep 2023 09:21:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233602AbjIOJVj (ORCPT ); Fri, 15 Sep 2023 05:21:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233507AbjIOJVd (ORCPT ); Fri, 15 Sep 2023 05:21:33 -0400 Received: from mail-lj1-x232.google.com (mail-lj1-x232.google.com [IPv6:2a00:1450:4864:20::232]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A98521FE8 for ; Fri, 15 Sep 2023 02:21:21 -0700 (PDT) Received: by mail-lj1-x232.google.com with SMTP id 38308e7fff4ca-2bfbd7d49e7so30481801fa.1 for ; Fri, 15 Sep 2023 02:21:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694769680; x=1695374480; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CP3f1sHM5Nj5iu5CRIA2O8JEDQIcldDJUxmizaosav4=; b=METGsl2OYLmWau3/hjxKQ/nTyQIpV0fRVgG926+BSQdKiMLEDNEmQW48g4p9bpQzga 8viEzWUK4hBS4FohAGXx/Cdm6uzyCoJNd56T1odXCwHDLTtROn9y8dA92lRvZpMwW/A+ U7DVwd7tpX0gbxLYuYuVdvlq0OM7LV7oTVMH3KQoJGs1OuBuHmJcrAAFfP015r7TLc26 NQJ6fnDXPC1Vu+oAsd8p6V4aNPFipcO6a+6NG6GN1mEHEVv8AagzqzVTqeNgu6iq3j6s eGRL1x92WhVpC7ypMsU40jfdTEGDbC7w8SC2JpD3FBnmNrxWNYjqcCaPwwYlSnXQ1jeE jtQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694769680; x=1695374480; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CP3f1sHM5Nj5iu5CRIA2O8JEDQIcldDJUxmizaosav4=; b=YSbZSsOrL0725j2q3saciXInJBERuPJWzv9I6MHtaZaAVNq5vhvTxhl7NTVYGjBqzf u4MGKkKpQQRdeslsB2q5acYuW4orfzdEhwbsHM/ftexDOoqWpx2BFlzCrUDhCmMfW3N1 /nJl6gPCdy9GHeHyTtY8QuYUD18u8CSGKYysqQpP5npn2rxQr8BSpkIlOAHIha48V9l/ Am5Pmv+2FE0d2d+6lXEAdVESDVGPGJeqcM++pycKFkV1W4hvxDRbh1lsuJRlVVSdavtV Jz6PqwrexL4vU/x3y/oXhy2FL2fpNHLexA6x+k73aZkFqSf2qSTe/PB/bP69pQyjBHVo 2rFQ== X-Gm-Message-State: AOJu0YwKcqt08sEnuDM8S6RXBsZN1nh+8g8eXb5FeGRjerT7bxxb/2LH eCTQdW/QLmHhxOi9JgWdByKI6w== X-Google-Smtp-Source: AGHT+IHPlaacG/gOBVJctrl1sdlsMKaUAGjfwl65ptqYhYWAn3prdG0qyTiCr8K2Oo6HMHyZs5IEqQ== X-Received: by 2002:a2e:8887:0:b0:2b6:dc55:c3c7 with SMTP id k7-20020a2e8887000000b002b6dc55c3c7mr1141914lji.20.1694769679779; Fri, 15 Sep 2023 02:21:19 -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 p8-20020a2e7408000000b002b9ec22d9fasm639376ljc.29.2023.09.15.02.21.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 02:21:19 -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 v2 05/17] pmdomain: bcm: Move Kconfig options to the pmdomain subsystem Date: Fri, 15 Sep 2023 11:19:51 +0200 Message-Id: <20230915092003.658361-6-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230915092003.658361-1-ulf.hansson@linaro.org> References: <20230915092003.658361-1-ulf.hansson@linaro.org> 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 Reviewed-by: Philippe Mathieu-Daudé --- 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 482d9e970e14..ddc05d6af100 100644 --- a/drivers/pmdomain/Kconfig +++ b/drivers/pmdomain/Kconfig @@ -4,5 +4,6 @@ menu "PM Domains" 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..9311e90b7707 --- /dev/null +++ b/drivers/pmdomain/bcm/Kconfig @@ -0,0 +1,46 @@ +# SPDX-License-Identifier: GPL-2.0-only +menu "Broadcom PM 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