| Message ID | 20230707140434.723349-4-ulf.hansson@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | None | expand |
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
On Fri, 7 Jul 2023 at 16:42, Neil Armstrong <neil.armstrong@linaro.org> wrote: > > 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 ? 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. Beyond v6.6-rc1 I plan to help with maintenance in practice and run my own separate git tree. > > Acked-by: Neil Armstrong <neil.armstrong@linaro.org> > > Thanks ! > Neil Thanks! Kind regards Uffe
On 07/07/2023 16:54, Ulf Hansson wrote: > On Fri, 7 Jul 2023 at 16:42, Neil Armstrong <neil.armstrong@linaro.org> wrote: >> >> 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 ? > > 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. > > Beyond v6.6-rc1 I plan to help with maintenance in practice and run > my own separate git tree. If it helps I can send you a PR with only the pwrc changes you can merge before applying this serie. Neil > >> >> Acked-by: Neil Armstrong <neil.armstrong@linaro.org> >> >> Thanks ! >> Neil > > Thanks! > > Kind regards > Uffe
On Fri, 7 Jul 2023 at 17:12, <neil.armstrong@linaro.org> wrote: > > On 07/07/2023 16:54, Ulf Hansson wrote: > > On Fri, 7 Jul 2023 at 16:42, Neil Armstrong <neil.armstrong@linaro.org> wrote: > >> > >> 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 ? > > > > 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. > > > > Beyond v6.6-rc1 I plan to help with maintenance in practice and run > > my own separate git tree. > > If it helps I can send you a PR with only the pwrc changes you can merge > before applying this serie. Right, that could be a good idea, but let's defer to Arnd before we agree on the way forward. Kind regards Uffe
Hi Ulf, On Fri, Jul 7, 2023 at 4:04 PM Ulf Hansson <ulf.hansson@linaro.org> wrote: [...] > --- 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/ I think this change has to be dropped (see below)... > 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 ...as drivers/soc/amlogic contains drivers which are not moved (in addition to the genpd drivers there's also SoC info and canvas drivers). Best regards, Martin
On Fri, Jul 7, 2023, at 16:54, Ulf Hansson wrote: > On Fri, 7 Jul 2023 at 16:42, Neil Armstrong <neil.armstrong@linaro.org> 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
On Fri, Jul 07, 2023 at 05:27:39PM +0200, Ulf Hansson wrote: > On Fri, 7 Jul 2023 at 17:12, <neil.armstrong@linaro.org> wrote: > > > > On 07/07/2023 16:54, Ulf Hansson wrote: > > > On Fri, 7 Jul 2023 at 16:42, Neil Armstrong <neil.armstrong@linaro.org> wrote: > > >> > > >> 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 ? > > > > > > 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. > > > > > > Beyond v6.6-rc1 I plan to help with maintenance in practice and run > > > my own separate git tree. > > > > If it helps I can send you a PR with only the pwrc changes you can merge > > before applying this serie. > > Right, that could be a good idea, but let's defer to Arnd before we > agree on the way forward. > How about sharing an immutable branch/tag with patch 1, then each one of us can merge that together with the soc-specific change, followed by any subsequent patches - leading up to the next merge window. Stephen will have a merge conflict in drivers/genpd/Makefile as each soc-specific addition comes in, and Arnd will see this conflict too. But this is going to be extremely trivial. But apart from this, there will not be any conflicts or additional branching constraints for us... Regards, Bjorn > Kind regards > Uffe > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
On Sun, 9 Jul 2023 at 04:21, Bjorn Andersson <andersson@kernel.org> wrote: > > On Fri, Jul 07, 2023 at 05:27:39PM +0200, Ulf Hansson wrote: > > On Fri, 7 Jul 2023 at 17:12, <neil.armstrong@linaro.org> wrote: > > > > > > On 07/07/2023 16:54, Ulf Hansson wrote: > > > > On Fri, 7 Jul 2023 at 16:42, Neil Armstrong <neil.armstrong@linaro.org> wrote: > > > >> > > > >> 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 ? > > > > > > > > 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. > > > > > > > > Beyond v6.6-rc1 I plan to help with maintenance in practice and run > > > > my own separate git tree. > > > > > > If it helps I can send you a PR with only the pwrc changes you can merge > > > before applying this serie. > > > > Right, that could be a good idea, but let's defer to Arnd before we > > agree on the way forward. > > > > How about sharing an immutable branch/tag with patch 1, then each one of > us can merge that together with the soc-specific change, followed by any > subsequent patches - leading up to the next merge window. > > Stephen will have a merge conflict in drivers/genpd/Makefile as each > soc-specific addition comes in, and Arnd will see this conflict too. But > this is going to be extremely trivial. But apart from this, there will > not be any conflicts or additional branching constraints for us... > If I understand correctly, you are suggesting that each platform maintainer should merge the immutable branch with patch1 - and that I should send the patches (based on the immutable branch) to each of the platform maintainers to manage. Instead of one pull request with everything directly to Arnd, right? This still means that Arnd will have to resolve the conflicts as the pull requests arrive in his inbox. Although, I guess what you are looking for is less work for the soc/ maintainers, which seems reasonable. Although, in that case, I might as well share an immutable branch with the complete series, rather than just patch1. That should help Arnd too, I think. Again, let's leave the call to Arnd on what to do. Kind regards Uffe
On Mon, Jul 10, 2023, at 14:37, Ulf Hansson wrote: > On Sun, 9 Jul 2023 at 04:21, Bjorn Andersson <andersson@kernel.org> wrote: >> On Fri, Jul 07, 2023 at 05:27:39PM +0200, Ulf Hansson wrote: > > If I understand correctly, you are suggesting that each platform > maintainer should merge the immutable branch with patch1 - and that I > should send the patches (based on the immutable branch) to each of the > platform maintainers to manage. Instead of one pull request with > everything directly to Arnd, right? > > This still means that Arnd will have to resolve the conflicts as the > pull requests arrive in his inbox. > > Although, I guess what you are looking for is less work for the soc/ > maintainers, which seems reasonable. Although, in that case, I might > as well share an immutable branch with the complete series, rather > than just patch1. That should help Arnd too, I think. > > Again, let's leave the call to Arnd on what to do. I think it's much easier for me to pick up a single branch with all of your patches. For platform maintainers, other changes can go one of two ways: - send a normal pull requests with changes against the same files, and have me take care of any conflicts where they arise. Since most of the changes are just simple file moves rather than changing file contents, 'git mergetool' handles these fine is most cases - If there is a non-obvious merge, the entire genpd branch can be shared as an immutable branch, with patches for a particular platform rebased on top of that branch. Arnd
On Fri, 7 Jul 2023 at 20:25, Martin Blumenstingl <martin.blumenstingl@googlemail.com> wrote: > > Hi Ulf, > > On Fri, Jul 7, 2023 at 4:04 PM Ulf Hansson <ulf.hansson@linaro.org> wrote: > [...] > > --- 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/ > I think this change has to be dropped (see below)... > > > 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 > ...as drivers/soc/amlogic contains drivers which are not moved (in > addition to the genpd drivers there's also SoC info and canvas > drivers). Yes, you are certainly correct, thanks for spotting this! Kind regards Uffe
On Mon, Jul 10, 2023 at 02:45:12PM +0200, Arnd Bergmann wrote: > On Mon, Jul 10, 2023, at 14:37, Ulf Hansson wrote: > > On Sun, 9 Jul 2023 at 04:21, Bjorn Andersson <andersson@kernel.org> wrote: > >> On Fri, Jul 07, 2023 at 05:27:39PM +0200, Ulf Hansson wrote: > > > > If I understand correctly, you are suggesting that each platform > > maintainer should merge the immutable branch with patch1 - and that I > > should send the patches (based on the immutable branch) to each of the > > platform maintainers to manage. Instead of one pull request with > > everything directly to Arnd, right? > > That's what I suggest, yes. > > This still means that Arnd will have to resolve the conflicts as the > > pull requests arrive in his inbox. > > Yes, we will have N maintainers modifying drivers/genpd/Makefile, all adding their single obj-y line. A quite trivial conflict to manage. > > Although, I guess what you are looking for is less work for the soc/ > > maintainers, which seems reasonable. Although, in that case, I might > > as well share an immutable branch with the complete series, rather > > than just patch1. That should help Arnd too, I think. > > > > Again, let's leave the call to Arnd on what to do. > > I think it's much easier for me to pick up a single branch with > all of your patches. For platform maintainers, other changes can > go one of two ways: > > - send a normal pull requests with changes against the same > files, and have me take care of any conflicts where they > arise. Since most of the changes are just simple file moves > rather than changing file contents, 'git mergetool' handles > these fine is most cases > > - If there is a non-obvious merge, the entire genpd branch > can be shared as an immutable branch, with patches for > a particular platform rebased on top of that branch. > I already have a set of patches to these drivers in my tree for v6.6, in their current location. I'm afraid I am unable to see how we're going to handle the merge conflict you're going to create in linux-next. Perhaps you're proposing to just never publish Ulf's patches to linux-next? By me merging the immutable patch 1 and the qcom-patch, the conflicts would be minimal, and except for the genpd/Makefile entirely handled by me. Regards, Bjorn
On Thu, 13 Jul 2023 at 02:45, Bjorn Andersson <andersson@kernel.org> wrote: > > On Mon, Jul 10, 2023 at 02:45:12PM +0200, Arnd Bergmann wrote: > > On Mon, Jul 10, 2023, at 14:37, Ulf Hansson wrote: > > > On Sun, 9 Jul 2023 at 04:21, Bjorn Andersson <andersson@kernel.org> wrote: > > >> On Fri, Jul 07, 2023 at 05:27:39PM +0200, Ulf Hansson wrote: > > > > > > If I understand correctly, you are suggesting that each platform > > > maintainer should merge the immutable branch with patch1 - and that I > > > should send the patches (based on the immutable branch) to each of the > > > platform maintainers to manage. Instead of one pull request with > > > everything directly to Arnd, right? > > > > > That's what I suggest, yes. > > > > This still means that Arnd will have to resolve the conflicts as the > > > pull requests arrive in his inbox. > > > > > Yes, we will have N maintainers modifying drivers/genpd/Makefile, all > adding their single obj-y line. A quite trivial conflict to manage. > > > > Although, I guess what you are looking for is less work for the soc/ > > > maintainers, which seems reasonable. Although, in that case, I might > > > as well share an immutable branch with the complete series, rather > > > than just patch1. That should help Arnd too, I think. > > > > > > Again, let's leave the call to Arnd on what to do. > > > > I think it's much easier for me to pick up a single branch with > > all of your patches. For platform maintainers, other changes can > > go one of two ways: > > > > - send a normal pull requests with changes against the same > > files, and have me take care of any conflicts where they > > arise. Since most of the changes are just simple file moves > > rather than changing file contents, 'git mergetool' handles > > these fine is most cases > > > > - If there is a non-obvious merge, the entire genpd branch > > can be shared as an immutable branch, with patches for > > a particular platform rebased on top of that branch. > > > > I already have a set of patches to these drivers in my tree for v6.6, in > their current location. Right. > > I'm afraid I am unable to see how we're going to handle the merge > conflict you're going to create in linux-next. Perhaps you're proposing > to just never publish Ulf's patches to linux-next? > > By me merging the immutable patch 1 and the qcom-patch, the conflicts > would be minimal, and except for the genpd/Makefile entirely handled by > me. If you would merge the immutable branch containing the complete series, that should work too, rather than just patch1, right? As a heads up, I am planning to send the pull request with the v2 series tomorrow, allowing a few more acks to arrive. At that point I will announce the immutable branch too. Kind regards Uffe
On Thu, Jul 13, 2023 at 11:50:29AM +0200, Ulf Hansson wrote: > On Thu, 13 Jul 2023 at 02:45, Bjorn Andersson <andersson@kernel.org> wrote: > > > > On Mon, Jul 10, 2023 at 02:45:12PM +0200, Arnd Bergmann wrote: > > > On Mon, Jul 10, 2023, at 14:37, Ulf Hansson wrote: > > > > On Sun, 9 Jul 2023 at 04:21, Bjorn Andersson <andersson@kernel.org> wrote: > > > >> On Fri, Jul 07, 2023 at 05:27:39PM +0200, Ulf Hansson wrote: > > > > > > > > If I understand correctly, you are suggesting that each platform > > > > maintainer should merge the immutable branch with patch1 - and that I > > > > should send the patches (based on the immutable branch) to each of the > > > > platform maintainers to manage. Instead of one pull request with > > > > everything directly to Arnd, right? > > > > > > > > That's what I suggest, yes. > > > > > > This still means that Arnd will have to resolve the conflicts as the > > > > pull requests arrive in his inbox. > > > > > > > > Yes, we will have N maintainers modifying drivers/genpd/Makefile, all > > adding their single obj-y line. A quite trivial conflict to manage. > > > > > > Although, I guess what you are looking for is less work for the soc/ > > > > maintainers, which seems reasonable. Although, in that case, I might > > > > as well share an immutable branch with the complete series, rather > > > > than just patch1. That should help Arnd too, I think. > > > > > > > > Again, let's leave the call to Arnd on what to do. > > > > > > I think it's much easier for me to pick up a single branch with > > > all of your patches. For platform maintainers, other changes can > > > go one of two ways: > > > > > > - send a normal pull requests with changes against the same > > > files, and have me take care of any conflicts where they > > > arise. Since most of the changes are just simple file moves > > > rather than changing file contents, 'git mergetool' handles > > > these fine is most cases > > > > > > - If there is a non-obvious merge, the entire genpd branch > > > can be shared as an immutable branch, with patches for > > > a particular platform rebased on top of that branch. > > > > > > > I already have a set of patches to these drivers in my tree for v6.6, in > > their current location. > > Right. > > > > > I'm afraid I am unable to see how we're going to handle the merge > > conflict you're going to create in linux-next. Perhaps you're proposing > > to just never publish Ulf's patches to linux-next? > > > > By me merging the immutable patch 1 and the qcom-patch, the conflicts > > would be minimal, and except for the genpd/Makefile entirely handled by > > me. > > If you would merge the immutable branch containing the complete > series, that should work too, rather than just patch1, right? > I believe git should sort that out as well. If so I have no concerns with that option. Regards, Bjorn > As a heads up, I am planning to send the pull request with the v2 > series tomorrow, allowing a few more acks to arrive. At that point I > will announce the immutable branch too. > > Kind regards > Uffe
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
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%)