Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <0c8938a9-7a26-bf97-51ee-0c271901ec21@linaro.org>
Date:   Fri, 7 Jul 2023 16:42:29 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.12.0
From:   Neil Armstrong <neil.armstrong@linaro.org>
Reply-To: neil.armstrong@linaro.org
Subject: Re: [PATCH 03/18] soc: amlogic: Move power-domain drivers to the
 genpd dir
Content-Language: en-US
To:     Ulf Hansson <ulf.hansson@linaro.org>,
        Arnd Bergmann <arnd@arndb.de>, Olof Johansson <olof@lixom.net>
Cc:     linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
        linux-kernel@vger.kernel.org, Kevin Hilman <khilman@baylibre.com>,
        Jerome Brunet <jbrunet@baylibre.com>,
        Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
        linux-amlogic@lists.infradead.org
References: <20230707140434.723349-1-ulf.hansson@linaro.org>
 <20230707140434.723349-4-ulf.hansson@linaro.org>
Organization: Linaro Developer Services
In-Reply-To: <20230707140434.723349-4-ulf.hansson@linaro.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk

Hi,

On 07/07/2023 16:04, Ulf Hansson wrote:
> Cc: Neil Armstrong <neil.armstrong@linaro.org>
> Cc: Kevin Hilman <khilman@baylibre.com>
> Cc: Jerome Brunet <jbrunet@baylibre.com>
> Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
> Cc: <linux-amlogic@lists.infradead.org>
> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
> ---
>   MAINTAINERS                                        | 1 +
>   drivers/genpd/Makefile                             | 1 +
>   drivers/genpd/amlogic/Makefile                     | 4 ++++
>   drivers/{soc => genpd}/amlogic/meson-ee-pwrc.c     | 0
>   drivers/{soc => genpd}/amlogic/meson-gx-pwrc-vpu.c | 0
>   drivers/{soc => genpd}/amlogic/meson-secure-pwrc.c | 0
>   drivers/soc/Makefile                               | 1 -
>   drivers/soc/amlogic/Makefile                       | 3 ---
>   8 files changed, 6 insertions(+), 4 deletions(-)
>   create mode 100644 drivers/genpd/amlogic/Makefile
>   rename drivers/{soc => genpd}/amlogic/meson-ee-pwrc.c (100%)
>   rename drivers/{soc => genpd}/amlogic/meson-gx-pwrc-vpu.c (100%)
>   rename drivers/{soc => genpd}/amlogic/meson-secure-pwrc.c (100%)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 588769fab516..9b8c9ae2375d 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1843,6 +1843,7 @@ F:	Documentation/devicetree/bindings/phy/amlogic*
>   F:	arch/arm/boot/dts/amlogic/
>   F:	arch/arm/mach-meson/
>   F:	arch/arm64/boot/dts/amlogic/
> +F:	drivers/genpd/amlogic/
>   F:	drivers/mmc/host/meson*
>   F:	drivers/phy/amlogic/
>   F:	drivers/pinctrl/meson/
> diff --git a/drivers/genpd/Makefile b/drivers/genpd/Makefile
> index a2d5b2095915..cdba3b9f0c75 100644
> --- a/drivers/genpd/Makefile
> +++ b/drivers/genpd/Makefile
> @@ -1,2 +1,3 @@
>   # SPDX-License-Identifier: GPL-2.0-only
>   obj-y					+= actions/
> +obj-y					+= amlogic/
> diff --git a/drivers/genpd/amlogic/Makefile b/drivers/genpd/amlogic/Makefile
> new file mode 100644
> index 000000000000..3d58abd574f9
> --- /dev/null
> +++ b/drivers/genpd/amlogic/Makefile
> @@ -0,0 +1,4 @@
> +# SPDX-License-Identifier: GPL-2.0-only
> +obj-$(CONFIG_MESON_GX_PM_DOMAINS) += meson-gx-pwrc-vpu.o
> +obj-$(CONFIG_MESON_EE_PM_DOMAINS) += meson-ee-pwrc.o
> +obj-$(CONFIG_MESON_SECURE_PM_DOMAINS) += meson-secure-pwrc.o
> diff --git a/drivers/soc/amlogic/meson-ee-pwrc.c b/drivers/genpd/amlogic/meson-ee-pwrc.c
> similarity index 100%
> rename from drivers/soc/amlogic/meson-ee-pwrc.c
> rename to drivers/genpd/amlogic/meson-ee-pwrc.c
> diff --git a/drivers/soc/amlogic/meson-gx-pwrc-vpu.c b/drivers/genpd/amlogic/meson-gx-pwrc-vpu.c
> similarity index 100%
> rename from drivers/soc/amlogic/meson-gx-pwrc-vpu.c
> rename to drivers/genpd/amlogic/meson-gx-pwrc-vpu.c
> diff --git a/drivers/soc/amlogic/meson-secure-pwrc.c b/drivers/genpd/amlogic/meson-secure-pwrc.c
> similarity index 100%
> rename from drivers/soc/amlogic/meson-secure-pwrc.c
> rename to drivers/genpd/amlogic/meson-secure-pwrc.c
> diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile
> index 3b0f9fb3b5c8..dc93e1762ca7 100644
> --- a/drivers/soc/Makefile
> +++ b/drivers/soc/Makefile
> @@ -23,7 +23,6 @@ obj-y				+= mediatek/
>   obj-y				+= microchip/
>   obj-y				+= nuvoton/
>   obj-y				+= pxa/
> -obj-y				+= amlogic/
>   obj-y				+= qcom/
>   obj-y				+= renesas/
>   obj-y				+= rockchip/
> diff --git a/drivers/soc/amlogic/Makefile b/drivers/soc/amlogic/Makefile
> index 7b8c5d323f5c..c25f835e6a26 100644
> --- a/drivers/soc/amlogic/Makefile
> +++ b/drivers/soc/amlogic/Makefile
> @@ -2,7 +2,4 @@
>   obj-$(CONFIG_MESON_CANVAS) += meson-canvas.o
>   obj-$(CONFIG_MESON_CLK_MEASURE) += meson-clk-measure.o
>   obj-$(CONFIG_MESON_GX_SOCINFO) += meson-gx-socinfo.o
> -obj-$(CONFIG_MESON_GX_PM_DOMAINS) += meson-gx-pwrc-vpu.o
>   obj-$(CONFIG_MESON_MX_SOCINFO) += meson-mx-socinfo.o
> -obj-$(CONFIG_MESON_EE_PM_DOMAINS) += meson-ee-pwrc.o
> -obj-$(CONFIG_MESON_SECURE_PM_DOMAINS) += meson-secure-pwrc.o

I've a few changes for v6.6, how shall we handle that ?

Acked-by: Neil Armstrong <neil.armstrong@linaro.org>

Thanks !
Neil