Re: [PATCH 03/18] soc: amlogic: Move power-domain drivers to the genpd dir

From: Arnd Bergmann
Date: Fri Jul 07 2023 - 15:06:30 EST


On Fri, Jul 7, 2023, at 16:54, Ulf Hansson wrote:
> On Fri, 7 Jul 2023 at 16:42, Neil Armstrong <neil.armstrong@xxxxxxxxxx> wrote:

>> > @@ -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 ?
>
> I think we should continue to use the soc tree until v6.6-rc1 (or if
> Arnd have some other ideas), there are some more thoughts around this
> in the cover letter.

Right, I think I can handle the merge conflicts as I add stuff
to the soc tree.

Arnd