From patchwork Fri Sep 15 09:19:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 723864 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 D4095EE644C for ; Fri, 15 Sep 2023 09:21:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233488AbjIOJVd (ORCPT ); Fri, 15 Sep 2023 05:21:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233471AbjIOJVb (ORCPT ); Fri, 15 Sep 2023 05:21:31 -0400 Received: from mail-lj1-x229.google.com (mail-lj1-x229.google.com [IPv6:2a00:1450:4864:20::229]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 77F4D268A for ; Fri, 15 Sep 2023 02:21:19 -0700 (PDT) Received: by mail-lj1-x229.google.com with SMTP id 38308e7fff4ca-2b9338e4695so29054781fa.2 for ; Fri, 15 Sep 2023 02:21:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1694769678; x=1695374478; 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=mtEkXdqn2AKXcoldY8q7JCFJLuqJ45MWZNi1FoZm5Ic=; b=X1M0eMvW4a64EH7sZyA8kK2N0GzNr59RGMBBZpIc3RcYtuAgmqrM5ETlT5QS8b6qQW sxvyMuzZU6BODd/a3a7SrYiDdE/kj9F41D3UzpKhXW85/6jdhUdRzNrAQ0F1zb+5Y2MW LIayGMeeYhENW74RSm4Or4tnOoeBCPjFOYHHnpshO9OkbN15OggrwpODilT/0J5zxj0p bajfXtmGZm/+HXRi27HzpR+CfwiuZdvZQFj7NfyDSgL//ri2Z0AgZaTeUnv1GqhiHb/V VxZXmZWv7mCiqkC3cEQ3x+24dXlVvmC4OLm1ELsSbBVc9pUd/DPN2ivf+IqTC399GnNK +JHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694769678; x=1695374478; 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=mtEkXdqn2AKXcoldY8q7JCFJLuqJ45MWZNi1FoZm5Ic=; b=kQTs5UAJA8swp6LKW+HjWhuJZ7JWwoag9hn4zcOnJpuKAouRDsWcTH4CKj29jlPjak EDy5TJB4ZYbX81rJ4DIfUgQyHC/62GQqaQNukCqraDfpbqjxo9cteX2Ha3Bp+G8+vz5W ko6TxXTuh8UfGx17EDDKErGP7K66Oh23EKsLzWa2A0dVm5fl64J13xyJ2cSIg4Go8O7M RfGCTKLZ46HQpdjR6gErTPZmXCrG6U52nL2U+IfHWiFMlVFgjLZxYMJ2nUcWmiczFxHq tyckteqtSzID68LNFjgeW2M4PORdTApCNMXZUJvIYuPiRGvJSZwpLr14R+pnegmBxyav 7pwQ== X-Gm-Message-State: AOJu0YwJ3/qLPndHhpGU0o86nMyy+xwuZZfByWjPTJlbGIpGRhlTH7Cq 14wMj/EZP3jQoWgNNeP2ZZi/+w== X-Google-Smtp-Source: AGHT+IFx5SAj9k17uZVn4NqPVoiWz/nsVg3nOnzOEp+JkWLtAilL3VHRVFLGDM2LReEURtgNYbQOYg== X-Received: by 2002:a2e:9987:0:b0:2bc:daa2:7838 with SMTP id w7-20020a2e9987000000b002bcdaa27838mr1012473lji.19.1694769677864; Fri, 15 Sep 2023 02:21:17 -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.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 02:21:17 -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, Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , linux-amlogic@lists.infradead.org Subject: [PATCH v2 03/17] pmdomain: amlogic: Move Kconfig options to the pmdomain subsystem Date: Fri, 15 Sep 2023 11:19:49 +0200 Message-Id: <20230915092003.658361-4-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-pm@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: Neil Armstrong Cc: Kevin Hilman Cc: Jerome Brunet Cc: Martin Blumenstingl Cc: Acked-by: Neil Armstrong Signed-off-by: Ulf Hansson --- drivers/pmdomain/Kconfig | 1 + drivers/pmdomain/amlogic/Kconfig | 39 ++++++++++++++++++++++++++++++++ drivers/soc/amlogic/Kconfig | 35 ---------------------------- 3 files changed, 40 insertions(+), 35 deletions(-) create mode 100644 drivers/pmdomain/amlogic/Kconfig diff --git a/drivers/pmdomain/Kconfig b/drivers/pmdomain/Kconfig index e410c4b8071a..03c8991ad0fd 100644 --- a/drivers/pmdomain/Kconfig +++ b/drivers/pmdomain/Kconfig @@ -2,5 +2,6 @@ menu "PM Domains" source "drivers/pmdomain/actions/Kconfig" +source "drivers/pmdomain/amlogic/Kconfig" endmenu diff --git a/drivers/pmdomain/amlogic/Kconfig b/drivers/pmdomain/amlogic/Kconfig new file mode 100644 index 000000000000..2108729909b5 --- /dev/null +++ b/drivers/pmdomain/amlogic/Kconfig @@ -0,0 +1,39 @@ +# SPDX-License-Identifier: GPL-2.0-only +menu "Amlogic PM Domains" + +config MESON_GX_PM_DOMAINS + tristate "Amlogic Meson GX Power Domains driver" + depends on ARCH_MESON || COMPILE_TEST + depends on PM && OF + default ARCH_MESON + select PM_GENERIC_DOMAINS + select PM_GENERIC_DOMAINS_OF + help + Say yes to expose Amlogic Meson GX Power Domains as + Generic Power Domains. + +config MESON_EE_PM_DOMAINS + tristate "Amlogic Meson Everything-Else Power Domains driver" + depends on ARCH_MESON || COMPILE_TEST + depends on PM && OF + default ARCH_MESON + select PM_GENERIC_DOMAINS + select PM_GENERIC_DOMAINS_OF + help + Say yes to expose Amlogic Meson Everything-Else Power Domains as + Generic Power Domains. + +config MESON_SECURE_PM_DOMAINS + tristate "Amlogic Meson Secure Power Domains driver" + depends on (ARCH_MESON || COMPILE_TEST) && MESON_SM + depends on PM && OF + depends on HAVE_ARM_SMCCC + default ARCH_MESON + select PM_GENERIC_DOMAINS + select PM_GENERIC_DOMAINS_OF + help + Support for the power controller on Amlogic A1/C1 series. + Say yes to expose Amlogic Meson Secure Power Domains as Generic + Power Domains. + +endmenu diff --git a/drivers/soc/amlogic/Kconfig b/drivers/soc/amlogic/Kconfig index 174a9b011461..d08e398bdad4 100644 --- a/drivers/soc/amlogic/Kconfig +++ b/drivers/soc/amlogic/Kconfig @@ -26,41 +26,6 @@ config MESON_GX_SOCINFO Say yes to support decoding of Amlogic Meson GX SoC family information about the type, package and version. -config MESON_GX_PM_DOMAINS - tristate "Amlogic Meson GX Power Domains driver" - depends on ARCH_MESON || COMPILE_TEST - depends on PM && OF - default ARCH_MESON - select PM_GENERIC_DOMAINS - select PM_GENERIC_DOMAINS_OF - help - Say yes to expose Amlogic Meson GX Power Domains as - Generic Power Domains. - -config MESON_EE_PM_DOMAINS - tristate "Amlogic Meson Everything-Else Power Domains driver" - depends on ARCH_MESON || COMPILE_TEST - depends on PM && OF - default ARCH_MESON - select PM_GENERIC_DOMAINS - select PM_GENERIC_DOMAINS_OF - help - Say yes to expose Amlogic Meson Everything-Else Power Domains as - Generic Power Domains. - -config MESON_SECURE_PM_DOMAINS - tristate "Amlogic Meson Secure Power Domains driver" - depends on (ARCH_MESON || COMPILE_TEST) && MESON_SM - depends on PM && OF - depends on HAVE_ARM_SMCCC - default ARCH_MESON - select PM_GENERIC_DOMAINS - select PM_GENERIC_DOMAINS_OF - help - Support for the power controller on Amlogic A1/C1 series. - Say yes to expose Amlogic Meson Secure Power Domains as Generic - Power Domains. - config MESON_MX_SOCINFO bool "Amlogic Meson MX SoC Information driver" depends on (ARM && ARCH_MESON) || COMPILE_TEST