From patchwork Tue Jul 11 14:20:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 701721 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 3FBD5C001DC for ; Tue, 11 Jul 2023 14:21:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232071AbjGKOVg (ORCPT ); Tue, 11 Jul 2023 10:21:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59276 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231330AbjGKOVf (ORCPT ); Tue, 11 Jul 2023 10:21:35 -0400 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 89518127 for ; Tue, 11 Jul 2023 07:21:12 -0700 (PDT) Received: by mail-lf1-x12d.google.com with SMTP id 2adb3069b0e04-4f95bf5c493so8620364e87.3 for ; Tue, 11 Jul 2023 07:21:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1689085270; x=1691677270; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=SXan3BQLOGVU26VVDfqibPbUTvNWRP/07Lp3Hf/FNck=; b=lqdOYmJum9lMmusdABBEDrPfyUPjmg1sjbjSj1BPzNzMuneGmo7eOt4BUjUfk8hsLF c9ZYo51BCaW/v/SVJqECrHEprdjqX5DqAMt/j0ehhKlz1fKlPyfdy2lyQ4AmTHUsruVm JUmhwfyQq7rfOy41Z/YBktXAS41K89LRxtSYcfkgitdjoSuN0YSvBGSYYUUvw0IgkCym xdDWrSZyl4UdR00HIApafCR54d+zWGEtz686I7ufoGIsv4v+0fedXk+RySVdqPAPSY6c r/SOS0gtdeUgiGvZU4gcpv+Q3XffdjBock02DcNDzVhPd3e4pHyQv0Q8A8MpKxG+oy4M 0KLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689085270; x=1691677270; 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=SXan3BQLOGVU26VVDfqibPbUTvNWRP/07Lp3Hf/FNck=; b=fUctKbySxCbLV48TAcFnjbMvbQgLdal/MoKdIkcbTbi4ZBUf85aY/5aBds2q0vvb2q HswIhPjekYqNw8VV5BrjuKgdRh21u128WFNE0wXv7K9MYs7ceBSUoMGZgVEnFUFGPfSR wNT7l4Pmx/Uj1JiS3rRtPewxqTGw0212R2os5Q1spXoZ6V0he+IZTCkbK+p5So4UnXPW 4bylDAJsP5v2Y80/rfYYCSjkfp1qh5GTZPJpF4QiW2f21SE7IUOVV9ttbREttVkYDaUL 6YjqY3/WahIsInDUWfXgqyXRSHDUR1t6HaOmB5KD93WBx9gpiz0JKBM/SA9YecZ5asIB oHBg== X-Gm-Message-State: ABy/qLZmU0N3cMDsaYmxgtBQSqsM26YkwK2Nz5kmiOGbelHnHXCSacqJ /b7ii8sAuLSraQRfwK3XL9eNiM8jZfz1jvbJ4UI= X-Google-Smtp-Source: APBJJlF/tD2PTLs1zZYNjcNoPQ6bP2DE1k5mx9xYe5Ulksm+zK79IQNLAEUlrHt6/v+3TKR4FlVmoQ== X-Received: by 2002:a05:6512:b99:b0:4f8:68a3:38d5 with SMTP id b25-20020a0565120b9900b004f868a338d5mr16890335lfv.66.1689085249578; Tue, 11 Jul 2023 07:20:49 -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 j14-20020ac2550e000000b004f9fdb0ed8esm333145lfk.304.2023.07.11.07.20.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 07:20:49 -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, Hector Martin , Sven Peter , Alyssa Rosenzweig , asahi@lists.linux.dev Subject: [PATCH v2 04/18] soc: apple: Move power-domain driver to the genpd dir Date: Tue, 11 Jul 2023 16:20:45 +0200 Message-Id: <20230711142045.751570-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-pm@vger.kernel.org To simplify with maintenance let's move the apple power-domain driver to the new genpd directory. Going forward, patches are intended to be managed through a separate git tree, according to MAINTAINERS. Cc: Hector Martin Cc: Sven Peter Cc: Alyssa Rosenzweig Cc: Signed-off-by: Ulf Hansson --- MAINTAINERS | 1 + drivers/genpd/Makefile | 1 + drivers/genpd/apple/Makefile | 2 ++ .../apple/apple-pmgr-pwrstate.c => genpd/apple/pmgr-pwrstate.c} | 0 drivers/soc/apple/Makefile | 2 -- 5 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 drivers/genpd/apple/Makefile rename drivers/{soc/apple/apple-pmgr-pwrstate.c => genpd/apple/pmgr-pwrstate.c} (100%) diff --git a/MAINTAINERS b/MAINTAINERS index ab583b8c5b97..caa221fd0c11 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1904,6 +1904,7 @@ F: drivers/bluetooth/hci_bcm4377.c F: drivers/clk/clk-apple-nco.c F: drivers/cpufreq/apple-soc-cpufreq.c F: drivers/dma/apple-admac.c +F: drivers/genpd/apple/ F: drivers/i2c/busses/i2c-pasemi-core.c F: drivers/i2c/busses/i2c-pasemi-platform.c F: drivers/iommu/apple-dart.c diff --git a/drivers/genpd/Makefile b/drivers/genpd/Makefile index cdba3b9f0c75..91d4a3808981 100644 --- a/drivers/genpd/Makefile +++ b/drivers/genpd/Makefile @@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only obj-y += actions/ obj-y += amlogic/ +obj-y += apple/ diff --git a/drivers/genpd/apple/Makefile b/drivers/genpd/apple/Makefile new file mode 100644 index 000000000000..53665af630be --- /dev/null +++ b/drivers/genpd/apple/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_APPLE_PMGR_PWRSTATE) += pmgr-pwrstate.o diff --git a/drivers/soc/apple/apple-pmgr-pwrstate.c b/drivers/genpd/apple/pmgr-pwrstate.c similarity index 100% rename from drivers/soc/apple/apple-pmgr-pwrstate.c rename to drivers/genpd/apple/pmgr-pwrstate.c diff --git a/drivers/soc/apple/Makefile b/drivers/soc/apple/Makefile index e293770cf66d..b241e6a65e5b 100644 --- a/drivers/soc/apple/Makefile +++ b/drivers/soc/apple/Makefile @@ -1,6 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_APPLE_PMGR_PWRSTATE) += apple-pmgr-pwrstate.o - obj-$(CONFIG_APPLE_RTKIT) += apple-rtkit.o apple-rtkit-y = rtkit.o rtkit-crashlog.o From patchwork Tue Jul 11 14:20:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 701722 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 E1CB9EB64DD for ; Tue, 11 Jul 2023 14:21:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230296AbjGKOVZ (ORCPT ); Tue, 11 Jul 2023 10:21:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230119AbjGKOVY (ORCPT ); Tue, 11 Jul 2023 10:21:24 -0400 Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF72B1728 for ; Tue, 11 Jul 2023 07:21:04 -0700 (PDT) Received: by mail-lj1-x234.google.com with SMTP id 38308e7fff4ca-2b701e41cd3so94685351fa.3 for ; Tue, 11 Jul 2023 07:21:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1689085260; x=1691677260; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=YSKTBplafBxn9qBTvU+oX8v93f247AJHKPJqc+tN6+8=; b=Ey+zgeTXJXrgW1S8K0Df2HHB93lSYF8p6K4gY0bfDIeiDHTT4Ul7iZ020Vm0rg06go 4O8Vw04ajtp0lRaoICRhBBtw/Ony3neabsw0ldmgxkc3WCpJ4iBzxSOO8DR+YdyURz6F gH7ky71KyC0EBC+ZkYebGpLKjNlcnEeqPkZ7HerY7+osh7f5G5KNtui+mziGRaBKD1hC BU2WuleBZJHMzShZ55MNLksXGmpWjvIQmAX0cX3oSLIaVNH6QGGqZe06137GIUbCMzrZ w+fltn9sHuNOgc4TAYY0FdgYOF2166JZLcj1CEFpn09n0Z9uz1+KaeFSaGalnsAByZH+ 75Ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689085260; x=1691677260; 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=YSKTBplafBxn9qBTvU+oX8v93f247AJHKPJqc+tN6+8=; b=BMhlIxSQV9f5Y1b8czrtIelhZEqO5Nq4UxOrnh6w0FLZ0leFaAGneOuzXgNZhZlO2o bbE8oFMx1hAV41Kx26ixGGQPrSElImf4P6y3J1pf4WBevZB82CpOMghtI576NRW1go3u eK8OQXXF9MlLKvhf3lJa/XzvJtAD1LXw22ZgkyLF6BcRpodxgyVSOdEA6ZJo7B+pmZdZ 6+QQtsl8JyQsKhR3QsOi05QCEDFDCQHAMPL7Km+yfLZLMTz5R/UyIRJlKX6ZWtTSvWkG byBJL50VE0gU0LDXHn2tBRpwk3NxwZojh6bpSKLUFNR9cyKAo1mmcJSCNk7uSGdhAqrV RVXg== X-Gm-Message-State: ABy/qLbl+sR6Q2eoGEXwv5tN3cEbmsfT0HXqTDEh8sQPpIV5dHPujziV USow5PKGfvV+sGc3Azxr+yK0uA== X-Google-Smtp-Source: APBJJlG+GC2YoALaqzoQBZEEmGwybOkfQoxBAGxVlcX2RBUiIPLaL+TYohG34JVuyxo45xSfKka+nw== X-Received: by 2002:a2e:924e:0:b0:2b6:cecb:2f0f with SMTP id v14-20020a2e924e000000b002b6cecb2f0fmr13641040ljg.2.1689085259858; Tue, 11 Jul 2023 07:20:59 -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 a6-20020a2e9806000000b002b6bb68c7eesm480090ljj.110.2023.07.11.07.20.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 07:20:59 -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/18] soc: bcm: Move power-domain drivers to the genpd dir Date: Tue, 11 Jul 2023 16:20:56 +0200 Message-Id: <20230711142056.751590-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-pm@vger.kernel.org To simplify with maintenance let's move the bcm power-domain drivers to the new genpd directory. Going forward, patches are intended to be managed through a separate git tree, according to MAINTAINERS. While moving the drivers, we end up with a directory for bcm63xx that only contains a Kconfig file, which seems a bit silly. Let's therefore also move the Kconfig options into the Kconfig file a directory above, as it allows us to drop the directory too. Cc: Florian Fainelli Cc: Ray Jui Cc: Scott Branden Cc: Cc: Signed-off-by: Ulf Hansson --- MAINTAINERS | 4 ++-- drivers/genpd/Makefile | 1 + drivers/genpd/bcm/Makefile | 5 +++++ .../{soc/bcm/bcm63xx => genpd/bcm}/bcm-pmb.c | 0 drivers/{soc => genpd}/bcm/bcm2835-power.c | 0 .../bcm/bcm63xx => genpd/bcm}/bcm63xx-power.c | 0 .../{soc => genpd}/bcm/raspberrypi-power.c | 0 drivers/soc/bcm/Kconfig | 22 ++++++++++++++++++- drivers/soc/bcm/Makefile | 3 --- drivers/soc/bcm/bcm63xx/Kconfig | 21 ------------------ drivers/soc/bcm/bcm63xx/Makefile | 3 --- 11 files changed, 29 insertions(+), 30 deletions(-) create mode 100644 drivers/genpd/bcm/Makefile rename drivers/{soc/bcm/bcm63xx => genpd/bcm}/bcm-pmb.c (100%) rename drivers/{soc => genpd}/bcm/bcm2835-power.c (100%) rename drivers/{soc/bcm/bcm63xx => genpd/bcm}/bcm63xx-power.c (100%) rename drivers/{soc => genpd}/bcm/raspberrypi-power.c (100%) delete mode 100644 drivers/soc/bcm/bcm63xx/Kconfig delete mode 100644 drivers/soc/bcm/bcm63xx/Makefile diff --git a/MAINTAINERS b/MAINTAINERS index caa221fd0c11..77629ab4a5f0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4009,7 +4009,7 @@ F: arch/mips/kernel/*bmips* F: drivers/irqchip/irq-bcm63* F: drivers/irqchip/irq-bcm7* F: drivers/irqchip/irq-brcmstb* -F: drivers/soc/bcm/bcm63xx +F: drivers/genpd/bcm/bcm63xx-power.c F: include/linux/bcm963xx_nvram.h F: include/linux/bcm963xx_tag.h @@ -4224,7 +4224,7 @@ R: Broadcom internal kernel review list L: linux-pm@vger.kernel.org S: Maintained T: git https://github.com/broadcom/stblinux.git -F: drivers/soc/bcm/bcm63xx/bcm-pmb.c +F: drivers/genpd/bcm/bcm-pmb.c F: include/dt-bindings/soc/bcm-pmb.h BROADCOM SPECIFIC AMBA DRIVER (BCMA) diff --git a/drivers/genpd/Makefile b/drivers/genpd/Makefile index 91d4a3808981..6b9e9fe907f3 100644 --- a/drivers/genpd/Makefile +++ b/drivers/genpd/Makefile @@ -2,3 +2,4 @@ obj-y += actions/ obj-y += amlogic/ obj-y += apple/ +obj-y += bcm/ diff --git a/drivers/genpd/bcm/Makefile b/drivers/genpd/bcm/Makefile new file mode 100644 index 000000000000..6bfbe4e4db13 --- /dev/null +++ b/drivers/genpd/bcm/Makefile @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_BCM_PMB) += bcm-pmb.o +obj-$(CONFIG_BCM2835_POWER) += bcm2835-power.o +obj-$(CONFIG_BCM63XX_POWER) += bcm63xx-power.o +obj-$(CONFIG_RASPBERRYPI_POWER) += raspberrypi-power.o diff --git a/drivers/soc/bcm/bcm63xx/bcm-pmb.c b/drivers/genpd/bcm/bcm-pmb.c similarity index 100% rename from drivers/soc/bcm/bcm63xx/bcm-pmb.c rename to drivers/genpd/bcm/bcm-pmb.c diff --git a/drivers/soc/bcm/bcm2835-power.c b/drivers/genpd/bcm/bcm2835-power.c similarity index 100% rename from drivers/soc/bcm/bcm2835-power.c rename to drivers/genpd/bcm/bcm2835-power.c diff --git a/drivers/soc/bcm/bcm63xx/bcm63xx-power.c b/drivers/genpd/bcm/bcm63xx-power.c similarity index 100% rename from drivers/soc/bcm/bcm63xx/bcm63xx-power.c rename to drivers/genpd/bcm/bcm63xx-power.c diff --git a/drivers/soc/bcm/raspberrypi-power.c b/drivers/genpd/bcm/raspberrypi-power.c similarity index 100% rename from drivers/soc/bcm/raspberrypi-power.c rename to drivers/genpd/bcm/raspberrypi-power.c diff --git a/drivers/soc/bcm/Kconfig b/drivers/soc/bcm/Kconfig index 24f92a6e882a..f96906795fa6 100644 --- a/drivers/soc/bcm/Kconfig +++ b/drivers/soc/bcm/Kconfig @@ -42,7 +42,27 @@ config SOC_BRCMSTB If unsure, say N. -source "drivers/soc/bcm/bcm63xx/Kconfig" +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 diff --git a/drivers/soc/bcm/Makefile b/drivers/soc/bcm/Makefile index 0f0efa28d92b..32424b1032c7 100644 --- a/drivers/soc/bcm/Makefile +++ b/drivers/soc/bcm/Makefile @@ -1,5 +1,2 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_BCM2835_POWER) += bcm2835-power.o -obj-$(CONFIG_RASPBERRYPI_POWER) += raspberrypi-power.o -obj-y += bcm63xx/ obj-$(CONFIG_SOC_BRCMSTB) += brcmstb/ diff --git a/drivers/soc/bcm/bcm63xx/Kconfig b/drivers/soc/bcm/bcm63xx/Kconfig deleted file mode 100644 index 355c34482076..000000000000 --- a/drivers/soc/bcm/bcm63xx/Kconfig +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -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 - -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. diff --git a/drivers/soc/bcm/bcm63xx/Makefile b/drivers/soc/bcm/bcm63xx/Makefile deleted file mode 100644 index 557eed3d67bd..000000000000 --- a/drivers/soc/bcm/bcm63xx/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_BCM63XX_POWER) += bcm63xx-power.o -obj-$(CONFIG_BCM_PMB) += bcm-pmb.o From patchwork Tue Jul 11 14:21:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 701720 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 95B99C001DC for ; Tue, 11 Jul 2023 14:22:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232355AbjGKOWH (ORCPT ); Tue, 11 Jul 2023 10:22:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232401AbjGKOVx (ORCPT ); Tue, 11 Jul 2023 10:21:53 -0400 Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0DFE21BDA for ; Tue, 11 Jul 2023 07:21:29 -0700 (PDT) Received: by mail-lf1-x12e.google.com with SMTP id 2adb3069b0e04-4fb9ae4cef6so9296209e87.3 for ; Tue, 11 Jul 2023 07:21:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1689085287; x=1691677287; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=kmUPzGEd9b2mcw9T8mFnw1Yxkb2+JnWrNijHr7xIcuI=; b=StVO58mC4uRlLbQia8BsbrUTAPZ9qwbkvIkGshFkyeiLlWSDJxOglfC/y3mPwBxYZl U+/sy3Uon0nHALLekkVWAiNrHDytJKpDz0QUkgCTdmvkQgyJ9uWk0GbRCasVPBjn5sbB TdVyPB0MEI0iWM4Pp7fM/m2f81LnzzocyErpQRo8/9kvmpVCa0rXh2NJiv1yDF+TSIjG WL/Fswe3GTIZPKWlbB9PZZzqcqWpXs6Jrpkfk1ZaTlm5BzM85peRsuS4PO/XiMjYMxRC BxqxWPIS2FlzLMNRcjBEQN86dbolLmckdG3X11GFp34EoXyQeCnylJpD93Dxt715NdVQ UFVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689085287; x=1691677287; 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=kmUPzGEd9b2mcw9T8mFnw1Yxkb2+JnWrNijHr7xIcuI=; b=gT2qld+Y09mOR8D422CN7PXqwLM6V++DLJtSyRHidJofTpy2kn33e/GQ0q09094akb ywsU1txTyQUuIGCU0gASHB9HyeFWPevWrTrDuO3oIQHy2qbnzSY6S7ETT3QkTD4BZ0r2 JlnIc0Yi7CkQNpgzKBx5OTlGn+LiCp9f5uRzLOAPH9B6Lz1ZgVCT5WdPNHpyssT8Y9dp tgLf5WX2TAZiCjlm94VfpPWTzul0FYkoVaacGc7kdN3gfcTMOHi25+UAKonoK1b5ptf9 /EYcRVNlxuLnZvKmwO4rQn4jgi/hvyZ1BMC+RQP9my7xfwbV1Go2yyyVih2Jh941e9xN 2ILg== X-Gm-Message-State: ABy/qLbMlPCfZbsFIRAES4AGGz6Gra40/n3hxeki98HJrej3PUgCHAv/ 1lOSXoOHH+ADcbWucrx0Y25OoQ== X-Google-Smtp-Source: APBJJlGGd0BJTHp96g3V9AE1cOKMZOPmEz3SSo5nfPuTaPLXgh5DNMltDB/etEPzUkQiIafUXhOV3w== X-Received: by 2002:ac2:51bb:0:b0:4fb:90c6:c31a with SMTP id f27-20020ac251bb000000b004fb90c6c31amr11259667lfk.14.1689085287277; Tue, 11 Jul 2023 07:21:27 -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 x7-20020ac259c7000000b004f84b36a24fsm340318lfn.51.2023.07.11.07.21.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 07:21:26 -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, Bjorn Andersson , Konrad Dybcio , Andy Gross , linux-arm-msm@vger.kernel.org Subject: [PATCH v2 08/18] soc: qcom: Move power-domain drivers to the genpd dir Date: Tue, 11 Jul 2023 16:21:24 +0200 Message-Id: <20230711142124.751652-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-pm@vger.kernel.org To simplify with maintenance let's move the qcom power-domain drivers to the new genpd directory. Going forward, patches are intended to be managed through a separate git tree, according to MAINTAINERS. Cc: Bjorn Andersson Cc: Konrad Dybcio Cc: Andy Gross Cc: Signed-off-by: Ulf Hansson Acked-by: Bjorn Andersson --- MAINTAINERS | 2 +- drivers/genpd/Makefile | 1 + drivers/genpd/qcom/Makefile | 4 ++++ drivers/{soc => genpd}/qcom/cpr.c | 0 drivers/{soc => genpd}/qcom/rpmhpd.c | 0 drivers/{soc => genpd}/qcom/rpmpd.c | 0 drivers/soc/qcom/Makefile | 3 --- 7 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 drivers/genpd/qcom/Makefile rename drivers/{soc => genpd}/qcom/cpr.c (100%) rename drivers/{soc => genpd}/qcom/rpmhpd.c (100%) rename drivers/{soc => genpd}/qcom/rpmpd.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 77629ab4a5f0..9abd868abfc8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -17524,7 +17524,7 @@ L: linux-pm@vger.kernel.org L: linux-arm-msm@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml -F: drivers/soc/qcom/cpr.c +F: drivers/genpd/qcom/cpr.c QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096 M: Ilia Lin diff --git a/drivers/genpd/Makefile b/drivers/genpd/Makefile index 1a0a56925756..dfdea14e2a8a 100644 --- a/drivers/genpd/Makefile +++ b/drivers/genpd/Makefile @@ -4,3 +4,4 @@ obj-y += amlogic/ obj-y += apple/ obj-y += bcm/ obj-y += mediatek/ +obj-y += qcom/ diff --git a/drivers/genpd/qcom/Makefile b/drivers/genpd/qcom/Makefile new file mode 100644 index 000000000000..403dfc5af095 --- /dev/null +++ b/drivers/genpd/qcom/Makefile @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_QCOM_CPR) += cpr.o +obj-$(CONFIG_QCOM_RPMPD) += rpmpd.o +obj-$(CONFIG_QCOM_RPMHPD) += rpmhpd.o diff --git a/drivers/soc/qcom/cpr.c b/drivers/genpd/qcom/cpr.c similarity index 100% rename from drivers/soc/qcom/cpr.c rename to drivers/genpd/qcom/cpr.c diff --git a/drivers/soc/qcom/rpmhpd.c b/drivers/genpd/qcom/rpmhpd.c similarity index 100% rename from drivers/soc/qcom/rpmhpd.c rename to drivers/genpd/qcom/rpmhpd.c diff --git a/drivers/soc/qcom/rpmpd.c b/drivers/genpd/qcom/rpmpd.c similarity index 100% rename from drivers/soc/qcom/rpmpd.c rename to drivers/genpd/qcom/rpmpd.c diff --git a/drivers/soc/qcom/Makefile b/drivers/soc/qcom/Makefile index 99114c71092b..f548a7150bb2 100644 --- a/drivers/soc/qcom/Makefile +++ b/drivers/soc/qcom/Makefile @@ -3,7 +3,6 @@ CFLAGS_rpmh-rsc.o := -I$(src) obj-$(CONFIG_QCOM_AOSS_QMP) += qcom_aoss.o obj-$(CONFIG_QCOM_GENI_SE) += qcom-geni-se.o obj-$(CONFIG_QCOM_COMMAND_DB) += cmd-db.o -obj-$(CONFIG_QCOM_CPR) += cpr.o obj-$(CONFIG_QCOM_GSBI) += qcom_gsbi.o obj-$(CONFIG_QCOM_MDT_LOADER) += mdt_loader.o obj-$(CONFIG_QCOM_OCMEM) += ocmem.o @@ -29,8 +28,6 @@ obj-$(CONFIG_QCOM_STATS) += qcom_stats.o obj-$(CONFIG_QCOM_WCNSS_CTRL) += wcnss_ctrl.o obj-$(CONFIG_QCOM_APR) += apr.o obj-$(CONFIG_QCOM_LLCC) += llcc-qcom.o -obj-$(CONFIG_QCOM_RPMHPD) += rpmhpd.o -obj-$(CONFIG_QCOM_RPMPD) += rpmpd.o obj-$(CONFIG_QCOM_KRYO_L2_ACCESSORS) += kryo-l2-accessors.o obj-$(CONFIG_QCOM_ICC_BWMON) += icc-bwmon.o qcom_ice-objs += ice.o From patchwork Tue Jul 11 14:21:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 701719 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 41C66C001DD for ; Tue, 11 Jul 2023 14:22:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232330AbjGKOW0 (ORCPT ); Tue, 11 Jul 2023 10:22:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232317AbjGKOWG (ORCPT ); Tue, 11 Jul 2023 10:22:06 -0400 Received: from mail-lj1-x22c.google.com (mail-lj1-x22c.google.com [IPv6:2a00:1450:4864:20::22c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9AE7D2114 for ; Tue, 11 Jul 2023 07:21:48 -0700 (PDT) Received: by mail-lj1-x22c.google.com with SMTP id 38308e7fff4ca-2b6ef64342aso92075081fa.3 for ; Tue, 11 Jul 2023 07:21:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1689085304; x=1691677304; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=hgQ8n9LomBfmN5XVIE9V8yRduLBIY8d9iOgPKJiP4zs=; b=xWSdYCQxNymYgnOZZUnd4ZIodCEnApMke9J1PRrQ57R/Uede91putFMbdX7sCvlTLA tB5InT2FwiODgUrIDbyxgbpG+79y/l1WOtH1/tcZICN/AFDjS+91RI3D+FxebIfbEyug PFj+fDv3wfCJTx5EOWDKo4dS8IfAU14R0NpPCvU/DvF2KnXoYDrVNFYIVvXP4v+Ac/NX fVyUe9tb2jGX2Uh70t5vP5JSqDsMPPpwS4Ddyg53/EO4Mb13xwLHxTcSTtvuVgDOLUmK UDn6jyP+Fo3H9+RMXSh5TjdK4o+NS0GPwudFtigwXACKukMRy+8HNFkA+aUc+k5RL/uJ 21pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689085304; x=1691677304; 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=hgQ8n9LomBfmN5XVIE9V8yRduLBIY8d9iOgPKJiP4zs=; b=ErOlRMsTcehcTgeBKB93qFV0cY0eRtvDJJQT+pBV2Mbs4yW6CoCDEtUSXayyHfK0S9 SJ/A2sFTEUkaI2wOfF1qu/mOtGdkt1+fpI4qwzMHYUWZL3nrs/Qt2KagLvCq+asDVPTe 7RSQdTaRqNeX6nAHoW/LRuS8u1agfwSwnv7MngFqTVQmmo70Bv5UmZfgjxlAlTHbJqiU zmqg4eTaypax9wkchy9BzKr7rBQIGqei2nyNF67VO+PC7TGI42D8DEEOMai838SBeC78 FkevIdAupMVjZBu+Rr/73GxJpsGz2zEBKslcUwW5IOsbsRI9jK5kRoOklRkqDZBrQXC/ DRwQ== X-Gm-Message-State: ABy/qLZMrY1gQiuLXhvRIcTR/vD31PikSTVHSMAPVhLlTtroMtHAYuFi zws6y2ZkGfCjoZFfb21xYCWz/Q== X-Google-Smtp-Source: APBJJlEKT6/JfPIQWMIzndgYMxtD7h0zb7OcNaPEMavO1QRqMPj2xl4JjFMYoA+YM6XBYufPqZGF0A== X-Received: by 2002:a2e:3109:0:b0:2b6:de52:357 with SMTP id x9-20020a2e3109000000b002b6de520357mr12200248ljx.40.1689085304038; Tue, 11 Jul 2023 07:21:44 -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 j11-20020a2e3c0b000000b002b6ee0ff9bbsm463489lja.67.2023.07.11.07.21.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 07:21:43 -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, Heiko Stuebner , linux-rockchip@lists.infradead.org Subject: [PATCH v2 10/18] soc: rockchip: Mover power-domain driver to the genpd dir Date: Tue, 11 Jul 2023 16:21:41 +0200 Message-Id: <20230711142141.751692-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-pm@vger.kernel.org To simplify with maintenance let's move the rockchip power-domain driver to the new genpd directory. Going forward, patches are intended to be managed through a separate git tree, according to MAINTAINERS. Cc: Heiko Stuebner Cc: Acked-by: Heiko Stuebner Signed-off-by: Ulf Hansson --- drivers/genpd/Makefile | 1 + drivers/genpd/rockchip/Makefile | 2 ++ .../{soc/rockchip/pm_domains.c => genpd/rockchip/pm-domains.c} | 0 drivers/soc/rockchip/Makefile | 1 - 4 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 drivers/genpd/rockchip/Makefile rename drivers/{soc/rockchip/pm_domains.c => genpd/rockchip/pm-domains.c} (100%) diff --git a/drivers/genpd/Makefile b/drivers/genpd/Makefile index 286598ce7620..c178421e0cbc 100644 --- a/drivers/genpd/Makefile +++ b/drivers/genpd/Makefile @@ -6,3 +6,4 @@ obj-y += bcm/ obj-y += mediatek/ obj-y += qcom/ obj-y += renesas/ +obj-y += rockchip/ diff --git a/drivers/genpd/rockchip/Makefile b/drivers/genpd/rockchip/Makefile new file mode 100644 index 000000000000..8fb9d88a3492 --- /dev/null +++ b/drivers/genpd/rockchip/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_ROCKCHIP_PM_DOMAINS) += pm-domains.o diff --git a/drivers/soc/rockchip/pm_domains.c b/drivers/genpd/rockchip/pm-domains.c similarity index 100% rename from drivers/soc/rockchip/pm_domains.c rename to drivers/genpd/rockchip/pm-domains.c diff --git a/drivers/soc/rockchip/Makefile b/drivers/soc/rockchip/Makefile index 05f31a4e743c..23d414433c8c 100644 --- a/drivers/soc/rockchip/Makefile +++ b/drivers/soc/rockchip/Makefile @@ -4,5 +4,4 @@ # obj-$(CONFIG_ROCKCHIP_GRF) += grf.o obj-$(CONFIG_ROCKCHIP_IODOMAIN) += io-domain.o -obj-$(CONFIG_ROCKCHIP_PM_DOMAINS) += pm_domains.o obj-$(CONFIG_ROCKCHIP_DTPM) += dtpm.o From patchwork Tue Jul 11 14:21:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 701718 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 0577EEB64DC for ; Tue, 11 Jul 2023 14:23:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232894AbjGKOWs (ORCPT ); Tue, 11 Jul 2023 10:22:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232996AbjGKOWc (ORCPT ); Tue, 11 Jul 2023 10:22:32 -0400 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B7FD710F1 for ; Tue, 11 Jul 2023 07:22:10 -0700 (PDT) Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-4fbb281eec6so8964530e87.1 for ; Tue, 11 Jul 2023 07:22:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1689085319; x=1691677319; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=dddDDU7nSqQ7z9wETDWZtkE1+2CRoXBrxvBW6KLelSM=; b=X7oBSxLNSV9eqMcmy3tZzy3/UTRucJkeXs+moEwYFgUXzKNvOU/ipXxS5EPF1AjxfZ lEatW99aDKtOCV62zWAmlpWt8rcJdtMJHS3TbN8jv1oCh6gkU8arsr82eiRUbFbBtPiy +IBf+qVfHIvze2Z6iiTNGXUm/CwvSWSWJEei+XFTfnCsMyCWdzbDZ9xRQQpGZs3DRK+I 9aYGx7iT4PT2sGRoHm72wGpSlrIZRo21EPR+nO51HuDcJk26heozy7aqo2O3D/AGNM8d UGka7ANjBZAaPPoYvbYKTECKfkBg3bf7rt21P1JSW0AayF6lABLN7+2jYOp1fk8xe5Kh ERiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689085319; x=1691677319; 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=dddDDU7nSqQ7z9wETDWZtkE1+2CRoXBrxvBW6KLelSM=; b=Mh9jwImKU1MaVYtz9r2uLSSzLYMO+1gRuYi/BZt3q5zF0Bi0NG+qUPKjrdo3FB1bIM fSdPe2Ji9T14wpwBlDRyJXnxDelasAe6jBtGYqngMSPYBg7D8Q5OVfS5+jx88QzGs1Nf qKICvbknPzDDC88tl5eePbwAyH9J9j7V/tYTWtrtWhfAlRM4YrlULda7UxG3SxH3lkKy 5+4SREW0SQc1UauQNVYy9a/aH6N1P+r435Eg7zjwqt2ASFKLxaEkUGRi3d2RibTmWDZI GvOZzwKFWtuMhTBytb1ekQHNHHNnGwTBsGOYVCX3Lv5lzqX9wIyRJKV7Uqm8XVQegIvZ mguw== X-Gm-Message-State: ABy/qLaKuu25l8Houghc439jw1QqR10noQaXRXBl+sxyCugsevsyA7Vb 1kDgfBZVM1Dl+/Oyd1dS/xgJYw== X-Google-Smtp-Source: APBJJlGUSak0mYQbFyzkK6aQ1G1SAqdalSOyq+vu2t6Gv+qmFZj027l2rjTtVGtmGdzfaHwpmXRLKA== X-Received: by 2002:a05:6512:31d0:b0:4f8:6d54:72fa with SMTP id j16-20020a05651231d000b004f86d5472famr16089053lfe.2.1689085319398; Tue, 11 Jul 2023 07:21:59 -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 v23-20020ac25937000000b004fb2c1e33b3sm336375lfi.243.2023.07.11.07.21.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 07:21:58 -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, Walker Chen , Conor Dooley Subject: [PATCH v2 12/18] soc: starfive: Move the power-domain driver to the genpd dir Date: Tue, 11 Jul 2023 16:21:57 +0200 Message-Id: <20230711142157.751733-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-pm@vger.kernel.org To simplify with maintenance let's move the starfive power-domain driver to the new genpd directory. Going forward, patches are intended to be managed through a separate git tree, according to MAINTAINERS. Cc: Walker Chen Cc: Conor Dooley Signed-off-by: Ulf Hansson --- MAINTAINERS | 2 +- drivers/genpd/Makefile | 1 + drivers/genpd/starfive/Makefile | 2 ++ .../{soc/starfive/jh71xx_pmu.c => genpd/starfive/jh71xx-pmu.c} | 0 drivers/soc/starfive/Makefile | 3 --- 5 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 drivers/genpd/starfive/Makefile rename drivers/{soc/starfive/jh71xx_pmu.c => genpd/starfive/jh71xx-pmu.c} (100%) delete mode 100644 drivers/soc/starfive/Makefile diff --git a/MAINTAINERS b/MAINTAINERS index f444285f1792..4be5dc3fd6dd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -20323,7 +20323,7 @@ STARFIVE JH71XX PMU CONTROLLER DRIVER M: Walker Chen S: Supported F: Documentation/devicetree/bindings/power/starfive* -F: drivers/soc/starfive/jh71xx_pmu.c +F: drivers/genpd/starfive/jh71xx_pmu.c F: include/dt-bindings/power/starfive,jh7110-pmu.h STARFIVE SOC DRIVERS diff --git a/drivers/genpd/Makefile b/drivers/genpd/Makefile index 1cf0ff26a44f..baf2021235a7 100644 --- a/drivers/genpd/Makefile +++ b/drivers/genpd/Makefile @@ -8,3 +8,4 @@ obj-y += qcom/ obj-y += renesas/ obj-y += rockchip/ obj-y += samsung/ +obj-y += starfive/ diff --git a/drivers/genpd/starfive/Makefile b/drivers/genpd/starfive/Makefile new file mode 100644 index 000000000000..975bba2a29a9 --- /dev/null +++ b/drivers/genpd/starfive/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_JH71XX_PMU) += jh71xx-pmu.o diff --git a/drivers/soc/starfive/jh71xx_pmu.c b/drivers/genpd/starfive/jh71xx-pmu.c similarity index 100% rename from drivers/soc/starfive/jh71xx_pmu.c rename to drivers/genpd/starfive/jh71xx-pmu.c diff --git a/drivers/soc/starfive/Makefile b/drivers/soc/starfive/Makefile deleted file mode 100644 index 13b589d6b5f3..000000000000 --- a/drivers/soc/starfive/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 - -obj-$(CONFIG_JH71XX_PMU) += jh71xx_pmu.o From patchwork Tue Jul 11 14:22:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 701717 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 0C0D1C001DD for ; Tue, 11 Jul 2023 14:23:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233545AbjGKOXt (ORCPT ); Tue, 11 Jul 2023 10:23:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232665AbjGKOWo (ORCPT ); Tue, 11 Jul 2023 10:22:44 -0400 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 697B926A9 for ; Tue, 11 Jul 2023 07:22:21 -0700 (PDT) Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-4fbf09a9139so453225e87.2 for ; Tue, 11 Jul 2023 07:22:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1689085327; x=1691677327; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=fs5HDm6ClAZIf3WkkOUYl2r52GqE7LmKxr5cfVC2LLc=; b=jc4XrpikC3c2UuGtvw5CwGWN3nmPyvXxozjIL6j5tRHo/XZib9AMRJX66OHyorPEO8 msrKHJdpC9eP+Wqsn2i+IAzPLH/g/IuEoD9c36i6GFCwEaq9wgsvEguoJ4xviORcFhgv vAT+Y3Wjs5iYZE0S7400sbFyJu8ZHR0jOl+ysnCXzK/K3C4NeV18TqHDS+hpaXDR1b7X gd2U3mWP9Sw9lxmt8TBkYhMYA67lzH5aMqWDJ5DvpVQK7IKVvsXLDFfXRY3/c5cgJwIy 3xv/tgd6/y7WxqRd19RRrsdoANjXq2eHmbrortC/HhtogF2KadfLeUZ2ZX1kZsyiYWRz sSRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689085327; x=1691677327; 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=fs5HDm6ClAZIf3WkkOUYl2r52GqE7LmKxr5cfVC2LLc=; b=CKOSmzKi187VuK+LyFrx2z6uniHWK3EI2nktc4pclidfMuo3HHn+N7Yh+xNqd9Tqlw 439uxnZ5amPkILwe4uZ4OVOKRvN+RVCt2VTKpGPk1oJpTiJrZsPVjslo6TFZXrjvbRHc OBe7363pXMOy7CVe9iXvtU9dJoG+t81Iuz6TfhxsWtYItk+q/HdGf/o1LFG/bKh6kD1h FzgTu8wgVs7E1lbDWI2k0Ok2K9ReivnbUrNYzuGUd1DcDv9BSHhv/5xX2B70F2cxDNvX qcloEoe6HB/VPLA38zhXTQd3sGI2GiwGJFNvfIhDxzw4CAgPNy900tNTzNJG7GAnATtj d3RA== X-Gm-Message-State: ABy/qLbRx6ka9Mg0Y1b4tvANMyIEdB4/QtriurgfdcYWeiryb8wyF3uy 7Aco7clGMSmmw05SPEakrsfRcw== X-Google-Smtp-Source: APBJJlGv0oKmDLjWCKzWfjK0JMEvmmjGq+p5yDLXp8SCG7qJLArfkjI905UBeAZEoXF0MSLIsp07fQ== X-Received: by 2002:a05:6512:3f3:b0:4fb:772a:af19 with SMTP id n19-20020a05651203f300b004fb772aaf19mr11433025lfq.34.1689085327565; Tue, 11 Jul 2023 07:22:07 -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 27-20020ac2483b000000b004f858249932sm342123lft.90.2023.07.11.07.22.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 07:22:06 -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, Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , linux-sunxi@lists.linux.dev Subject: [PATCH v2 13/18] soc: sunxi: Move power-domain driver to the genpd dir Date: Tue, 11 Jul 2023 16:22:04 +0200 Message-Id: <20230711142204.751754-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-pm@vger.kernel.org To simplify with maintenance let's move the sunxi power-domain driver to the new genpd directory. Going forward, patches are intended to be managed through a separate git tree, according to MAINTAINERS. Cc: Chen-Yu Tsai Cc: Jernej Skrabec Cc: Samuel Holland Cc: Signed-off-by: Ulf Hansson Acked-by: Jernej Skrabec --- drivers/genpd/Makefile | 1 + drivers/genpd/sunxi/Makefile | 2 ++ drivers/{soc => genpd}/sunxi/sun20i-ppu.c | 0 drivers/soc/sunxi/Makefile | 1 - 4 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 drivers/genpd/sunxi/Makefile rename drivers/{soc => genpd}/sunxi/sun20i-ppu.c (100%) diff --git a/drivers/genpd/Makefile b/drivers/genpd/Makefile index baf2021235a7..76f2a411e6bc 100644 --- a/drivers/genpd/Makefile +++ b/drivers/genpd/Makefile @@ -9,3 +9,4 @@ obj-y += renesas/ obj-y += rockchip/ obj-y += samsung/ obj-y += starfive/ +obj-y += sunxi/ diff --git a/drivers/genpd/sunxi/Makefile b/drivers/genpd/sunxi/Makefile new file mode 100644 index 000000000000..ec1d7a2fb21d --- /dev/null +++ b/drivers/genpd/sunxi/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_SUN20I_PPU) += sun20i-ppu.o diff --git a/drivers/soc/sunxi/sun20i-ppu.c b/drivers/genpd/sunxi/sun20i-ppu.c similarity index 100% rename from drivers/soc/sunxi/sun20i-ppu.c rename to drivers/genpd/sunxi/sun20i-ppu.c diff --git a/drivers/soc/sunxi/Makefile b/drivers/soc/sunxi/Makefile index 90ff2ebe7655..549159571d4f 100644 --- a/drivers/soc/sunxi/Makefile +++ b/drivers/soc/sunxi/Makefile @@ -1,4 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_SUNXI_MBUS) += sunxi_mbus.o obj-$(CONFIG_SUNXI_SRAM) += sunxi_sram.o -obj-$(CONFIG_SUN20I_PPU) += sun20i-ppu.o From patchwork Tue Jul 11 14:22:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 701715 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 5EE0BEB64DC for ; Tue, 11 Jul 2023 14:23:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233592AbjGKOXx (ORCPT ); Tue, 11 Jul 2023 10:23:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233868AbjGKOXQ (ORCPT ); Tue, 11 Jul 2023 10:23:16 -0400 Received: from mail-lf1-x12c.google.com (mail-lf1-x12c.google.com [IPv6:2a00:1450:4864:20::12c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3453C1989 for ; Tue, 11 Jul 2023 07:22:44 -0700 (PDT) Received: by mail-lf1-x12c.google.com with SMTP id 2adb3069b0e04-4fb7373dd35so8577749e87.1 for ; Tue, 11 Jul 2023 07:22:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1689085351; x=1691677351; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Yw4DGVBDDBg6SI5/SRWJ+maUbLcJsf6ZmIK2Iyv5wTM=; b=ZI9AZbQ84tq8plr5L4sNiYUXlokNI8GUuMEE4Dzle71FWUjExoFyFMLZqZGQmVYTLO CbcJDs9jmvi+tQwPF0F3fi9ko4Qdd/UnkABnpGufcnjnTsYW2a2k9jWUoM3zuZqY2JHI XZNLZUhKfvOzSSVH8Tz23kYGgt/OXQP6EBsUc8wR5d1BZ5pO5qELIXc9LxxQX5KMwHeZ 1RIK3rODYo8cwqNsfyInT19Fzew4rJQ3P6CbFGl/lKHxafYPWx3iVTeZJ00TsEjIVQeY pAEK8l30D31p/+kR8eQpIii8CajV4OtEuuTOt1/dQUBvgcY3EA/HehLPdK/Way7aVphb kLWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689085351; x=1691677351; 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=Yw4DGVBDDBg6SI5/SRWJ+maUbLcJsf6ZmIK2Iyv5wTM=; b=EdJSObDRNW3gpOfr4KEpCTIM9p6CWF9lgf2l1hn28hIqV1FKfVqkz7nzssSvU5qkYa J0VAajGdNdflHULrDgSaJpE4qPU4oCjrhOLB1TLTdNHqcH99ot9WSS27Cc1s1d47bJlt JSA7wvPeGeM9GoGhFHC2zwEY1blmCC5u/hWMMjZ8LavR1CNbTs22dP/DD5kuxSXkBtw0 /7Dhp+gq612I2a/REJzGdvyXN+VyzNs2KX2k7dxvggNpL8/MXkRkyprb/+xnkcJ8dtbN dsb2A4x4GBDDghJRRdPyV7Fz09ypRiUOC+Lfom8hWZmPwgPbr93ikAe/9M5DvEUjm026 mF6A== X-Gm-Message-State: ABy/qLZUMcARg8E+k0nmbyWqajD8txVNHLmrBIxa4bVRgv9VsW7Skdio BhaffE6D3EIsE9W7A2V+6FLRhg== X-Google-Smtp-Source: APBJJlH4J11J970wSN9S0sKheHb05BTteL7vkxcGg2YmvkmjV9l5Uge24eM7h7Q1GSizY9hZgpG9Qw== X-Received: by 2002:a05:6512:10c3:b0:4f8:6253:540 with SMTP id k3-20020a05651210c300b004f862530540mr6550119lfg.19.1689085351135; Tue, 11 Jul 2023 07:22:31 -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 u12-20020a056512094c00b004fba5fc7ed8sm334009lft.278.2023.07.11.07.22.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 07:22:30 -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, Michal Simek Subject: [PATCH v2 16/18] soc: xilinx: Move power-domain driver to the genpd dir Date: Tue, 11 Jul 2023 16:22:28 +0200 Message-Id: <20230711142228.751817-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-pm@vger.kernel.org To simplify with maintenance let's move the xilinx power-domain driver to the new genpd directory. Going forward, patches are intended to be managed through a separate git tree, according to MAINTAINERS. Cc: Michal Simek Signed-off-by: Ulf Hansson --- drivers/genpd/Makefile | 1 + drivers/genpd/xilinx/Makefile | 2 ++ .../zynqmp_pm_domains.c => genpd/xilinx/zynqmp-pm-domains.c} | 0 drivers/soc/xilinx/Makefile | 1 - 4 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 drivers/genpd/xilinx/Makefile rename drivers/{soc/xilinx/zynqmp_pm_domains.c => genpd/xilinx/zynqmp-pm-domains.c} (100%) diff --git a/drivers/genpd/Makefile b/drivers/genpd/Makefile index 193892189f0d..efd955f586e9 100644 --- a/drivers/genpd/Makefile +++ b/drivers/genpd/Makefile @@ -12,3 +12,4 @@ obj-y += starfive/ obj-y += sunxi/ obj-y += tegra/ obj-y += ti/ +obj-y += xilinx/ diff --git a/drivers/genpd/xilinx/Makefile b/drivers/genpd/xilinx/Makefile new file mode 100644 index 000000000000..a706ab699cfa --- /dev/null +++ b/drivers/genpd/xilinx/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_ZYNQMP_PM_DOMAINS) += zynqmp-pm-domains.o diff --git a/drivers/soc/xilinx/zynqmp_pm_domains.c b/drivers/genpd/xilinx/zynqmp-pm-domains.c similarity index 100% rename from drivers/soc/xilinx/zynqmp_pm_domains.c rename to drivers/genpd/xilinx/zynqmp-pm-domains.c diff --git a/drivers/soc/xilinx/Makefile b/drivers/soc/xilinx/Makefile index 41e585bc9c67..33d94395fd87 100644 --- a/drivers/soc/xilinx/Makefile +++ b/drivers/soc/xilinx/Makefile @@ -1,4 +1,3 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_ZYNQMP_POWER) += zynqmp_power.o -obj-$(CONFIG_ZYNQMP_PM_DOMAINS) += zynqmp_pm_domains.o obj-$(CONFIG_XLNX_EVENT_MANAGER) += xlnx_event_manager.o From patchwork Tue Jul 11 14:22:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 701716 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 0E5FBC00528 for ; Tue, 11 Jul 2023 14:23:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233568AbjGKOXv (ORCPT ); Tue, 11 Jul 2023 10:23:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59680 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233994AbjGKOX0 (ORCPT ); Tue, 11 Jul 2023 10:23:26 -0400 Received: from mail-lj1-x22f.google.com (mail-lj1-x22f.google.com [IPv6:2a00:1450:4864:20::22f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BDC8C19BE for ; Tue, 11 Jul 2023 07:22:59 -0700 (PDT) Received: by mail-lj1-x22f.google.com with SMTP id 38308e7fff4ca-2b6ef64342aso92097501fa.3 for ; Tue, 11 Jul 2023 07:22:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1689085369; x=1691677369; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=k3HkS8n/DHjLJ9CSnu0btooLeG2USC/O5hAcB+zQHR0=; b=YFzpDs4qddfLuT2Ja47Tie8E9U6WSvRiitw3Rl6fvE7ZRbRoJ/B1O7jT+omGz2Zkoo Psieekd+8Hyx64OQnlvvI62//QvgBAYh+forEFEZlWdq6K0ex3Fk4oK/XuogaHW4O2RQ KAhZAe/mXovdHvRxuM0igb/7yg/9gPrZwWfcpVg2S6K3ceqZV3rQx1mHdYj1mZYZ1P1X o7nF3oFkjdaKskPFUFPENSh7AVinLMokMVPv7/uFZ56fMFDsJqiZvNPm226qBD8+LE7a D2Z29Jh6edFJJT5FZYRmny/D3dq0IbZ7ylCIMd0ZNN9/F9GaGvkbI1T0A1XG7LZduV36 LZXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689085369; x=1691677369; 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=k3HkS8n/DHjLJ9CSnu0btooLeG2USC/O5hAcB+zQHR0=; b=K8g35/lc1mleutk0JDOR8v+puPooB8tQfJy6wgd0eLCWFrpduWw6s2IX1pgY/lynjo zJSCrhM5f0NpDVKFoAVR3oyvdyYikD4k5z0431csHLBoocsgBv306daQT1E9zjLPF0dH XRydlqT3zzfghREXd4SRjHl19f6orX7N5RTpta3Z0LsBJRszvGPCOMmY/Aukz+TDYszb XlwSfWTmSi9A5SDiyvNbgKhdRkfYkY7NNgXGKLtJt6FYLtHCnywLOu5xbli/mbeHLYGm dUDnzs7mSkIZVtl85gUZMxumCzI//Xw8EGJj9TDhyOXLSLZEpsm4rBdt3fI7aaUPALpk Y84Q== X-Gm-Message-State: ABy/qLbxltBPMOPbZiPgUNVoeCmDPJuvtBohRjtHQkaNERGk5nO2eDmX y4Awq5zt84yTjAtw+J66/iBKnw== X-Google-Smtp-Source: APBJJlHeyQA/rrTBRnhHmFHAQ9RkvQirevuuq4l+s9FWvVcIYzcJfIjCrcqTAVLnbDxJIqDqRKtRxQ== X-Received: by 2002:a2e:b0c7:0:b0:2b6:ec69:7c3b with SMTP id g7-20020a2eb0c7000000b002b6ec697c3bmr12314784ljl.46.1689085369756; Tue, 11 Jul 2023 07:22:49 -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 q6-20020a2e84c6000000b002b69b44fd52sm488065ljh.5.2023.07.11.07.22.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 07:22:49 -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, Linus Walleij Subject: [PATCH v2 18/18] ARM: ux500: Move power-domain driver to the genpd dir Date: Tue, 11 Jul 2023 16:22:47 +0200 Message-Id: <20230711142247.751857-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-pm@vger.kernel.org To simplify with maintenance let's move the ux500 power-domain driver to the new genpd directory. Going forward, patches are intended to be managed through a separate git tree, according to MAINTAINERS. Cc: Linus Walleij Signed-off-by: Ulf Hansson Reviewed-by: Linus Walleij --- MAINTAINERS | 1 + arch/arm/mach-ux500/Makefile | 1 - drivers/genpd/Makefile | 1 + drivers/genpd/st/Makefile | 2 ++ .../pm_domains.c => drivers/genpd/st/ste-ux500-pm-domain.c | 0 5 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 drivers/genpd/st/Makefile rename arch/arm/mach-ux500/pm_domains.c => drivers/genpd/st/ste-ux500-pm-domain.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 633bc6767cd5..377f68e66fb4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2421,6 +2421,7 @@ F: arch/arm/mach-ux500/ F: drivers/clk/clk-nomadik.c F: drivers/clocksource/clksrc-dbx500-prcmu.c F: drivers/dma/ste_dma40* +F: drivers/genpd/st/ste-ux500-pm-domain.c F: drivers/hwspinlock/u8500_hsem.c F: drivers/i2c/busses/i2c-nomadik.c F: drivers/iio/adc/ab8500-gpadc.c diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile index 5e903241bded..270e5676fa02 100644 --- a/arch/arm/mach-ux500/Makefile +++ b/arch/arm/mach-ux500/Makefile @@ -6,4 +6,3 @@ obj-y := pm.o obj-$(CONFIG_UX500_SOC_DB8500) += cpu-db8500.o obj-$(CONFIG_SMP) += platsmp.o -obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o diff --git a/drivers/genpd/Makefile b/drivers/genpd/Makefile index efd955f586e9..c429485c13f6 100644 --- a/drivers/genpd/Makefile +++ b/drivers/genpd/Makefile @@ -8,6 +8,7 @@ obj-y += qcom/ obj-y += renesas/ obj-y += rockchip/ obj-y += samsung/ +obj-y += st/ obj-y += starfive/ obj-y += sunxi/ obj-y += tegra/ diff --git a/drivers/genpd/st/Makefile b/drivers/genpd/st/Makefile new file mode 100644 index 000000000000..8fa5f9855460 --- /dev/null +++ b/drivers/genpd/st/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_ARCH_U8500) += ste-ux500-pm-domain.o diff --git a/arch/arm/mach-ux500/pm_domains.c b/drivers/genpd/st/ste-ux500-pm-domain.c similarity index 100% rename from arch/arm/mach-ux500/pm_domains.c rename to drivers/genpd/st/ste-ux500-pm-domain.c