[PATCH 2/2] mfd: db8500-prcmu: Handle missing FW variant

[PATCH 2/2] mfd: db8500-prcmu: Handle missing FW variant

[Linus Walleij]

There was an "unknown" firmware variant turning up in the wild
causing problems in the clock driver. Add this missing variant
and clarify that varian 11 and 15 are Samsung variants, as this
is now very well known from released products.

Cc: Michael Turquette <mturquette@baylibre.com>
Cc: Stephen Boyd <sboyd@kernel.org>
Cc: linux-clk@vger.kernel.org
Cc: phone-devel@vger.kernel.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
Clock maintainers: could you please ACK this so Lee can take
this into the MFD tree? The chances of merge collisions are
zero, this code changes very seldom.
---
 drivers/clk/ux500/u8500_of_clk.c | 3 ++-
 drivers/mfd/db8500-prcmu.c       | 6 ++++--
 include/linux/mfd/dbx500-prcmu.h | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/clk/ux500/u8500_of_clk.c b/drivers/clk/ux500/u8500_of_clk.c
index 0aedd42fad52..528c5bb397cc 100644
--- a/drivers/clk/ux500/u8500_of_clk.c
+++ b/drivers/clk/ux500/u8500_of_clk.c
@@ -99,10 +99,11 @@ static void u8500_clk_init(struct device_node *np)
 	if (fw_version != NULL) {
 		switch (fw_version->project) {
 		case PRCMU_FW_PROJECT_U8500_C2:
-		case PRCMU_FW_PROJECT_U8500_MBL:
+		case PRCMU_FW_PROJECT_U8500_SSG1:
 		case PRCMU_FW_PROJECT_U8520:
 		case PRCMU_FW_PROJECT_U8420:
 		case PRCMU_FW_PROJECT_U8420_SYSCLK:
+		case PRCMU_FW_PROJECT_U8500_SSG2:
 			sgaclk_parent = "soc0_pll";
 			break;
 		default:
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index dea4e4e8bed5..ca1145f1a11a 100644
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -2565,14 +2565,16 @@ static char *fw_project_name(u32 project)
 		return "U8500 C4";
 	case PRCMU_FW_PROJECT_U9500_MBL:
 		return "U9500 MBL";
-	case PRCMU_FW_PROJECT_U8500_MBL:
-		return "U8500 MBL";
+	case PRCMU_FW_PROJECT_U8500_SSG1:
+		return "U8500 Samsung 1";
 	case PRCMU_FW_PROJECT_U8500_MBL2:
 		return "U8500 MBL2";
 	case PRCMU_FW_PROJECT_U8520:
 		return "U8520 MBL";
 	case PRCMU_FW_PROJECT_U8420:
 		return "U8420";
+	case PRCMU_FW_PROJECT_U8500_SSG2:
+		return "U8500 Samsung 2";
 	case PRCMU_FW_PROJECT_U8420_SYSCLK:
 		return "U8420-sysclk";
 	case PRCMU_FW_PROJECT_U9540:
diff --git a/include/linux/mfd/dbx500-prcmu.h b/include/linux/mfd/dbx500-prcmu.h
index e6ee2ec35de9..cbf9d7619493 100644
--- a/include/linux/mfd/dbx500-prcmu.h
+++ b/include/linux/mfd/dbx500-prcmu.h
@@ -186,10 +186,11 @@ enum ddr_pwrst {
 #define PRCMU_FW_PROJECT_U8500_C3	8
 #define PRCMU_FW_PROJECT_U8500_C4	9
 #define PRCMU_FW_PROJECT_U9500_MBL	10
-#define PRCMU_FW_PROJECT_U8500_MBL	11 /* Customer specific */
+#define PRCMU_FW_PROJECT_U8500_SSG1	11 /* Samsung specific */
 #define PRCMU_FW_PROJECT_U8500_MBL2	12 /* Customer specific */
 #define PRCMU_FW_PROJECT_U8520		13
 #define PRCMU_FW_PROJECT_U8420		14
+#define PRCMU_FW_PROJECT_U8500_SSG2	15 /* Samsung specific */
 #define PRCMU_FW_PROJECT_U8420_SYSCLK	17
 #define PRCMU_FW_PROJECT_A9420		20
 /* [32..63] 9540 and derivatives */
-- 
2.31.1

Re: [PATCH 2/2] mfd: db8500-prcmu: Handle missing FW variant

[Lee Jones]

On Mon, 02 Aug 2021, Linus Walleij wrote:

> There was an "unknown" firmware variant turning up in the wild
> causing problems in the clock driver. Add this missing variant
> and clarify that varian 11 and 15 are Samsung variants, as this
> is now very well known from released products.
> 
> Cc: Michael Turquette <mturquette@baylibre.com>
> Cc: Stephen Boyd <sboyd@kernel.org>
> Cc: linux-clk@vger.kernel.org
> Cc: phone-devel@vger.kernel.org
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> Clock maintainers: could you please ACK this so Lee can take
> this into the MFD tree? The chances of merge collisions are
> zero, this code changes very seldom.
> ---
>  drivers/clk/ux500/u8500_of_clk.c | 3 ++-

>  drivers/mfd/db8500-prcmu.c       | 6 ++++--
>  include/linux/mfd/dbx500-prcmu.h | 3 ++-

Acked-by: Lee Jones <lee.jones@linaro.org>

>  3 files changed, 8 insertions(+), 4 deletions(-)

-- 
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH 2/2] mfd: db8500-prcmu: Handle missing FW variant

[Linus Walleij]

On Mon, Aug 2, 2021 at 9:47 AM Lee Jones <lee.jones@linaro.org> wrote:
> On Mon, 02 Aug 2021, Linus Walleij wrote:
>
> > There was an "unknown" firmware variant turning up in the wild
> > causing problems in the clock driver. Add this missing variant
> > and clarify that varian 11 and 15 are Samsung variants, as this
> > is now very well known from released products.
> >
> > Cc: Michael Turquette <mturquette@baylibre.com>
> > Cc: Stephen Boyd <sboyd@kernel.org>
> > Cc: linux-clk@vger.kernel.org
> > Cc: phone-devel@vger.kernel.org
> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> > ---
> > Clock maintainers: could you please ACK this so Lee can take
> > this into the MFD tree? The chances of merge collisions are
> > zero, this code changes very seldom.
> > ---
> >  drivers/clk/ux500/u8500_of_clk.c | 3 ++-
>
> >  drivers/mfd/db8500-prcmu.c       | 6 ++++--
> >  include/linux/mfd/dbx500-prcmu.h | 3 ++-
>
> Acked-by: Lee Jones <lee.jones@linaro.org>

Actually I intended for the clock people to ACK it for you
but since it is completely independent of 1/2 it actually works
either way, maybe they will rather pick it up, who knows? :D

Yours,
Linus Walleij

Re: [PATCH 2/2] mfd: db8500-prcmu: Handle missing FW variant

[Lee Jones]

On Thu, 05 Aug 2021, Linus Walleij wrote:

> On Mon, Aug 2, 2021 at 9:47 AM Lee Jones <lee.jones@linaro.org> wrote:
> > On Mon, 02 Aug 2021, Linus Walleij wrote:
> >
> > > There was an "unknown" firmware variant turning up in the wild
> > > causing problems in the clock driver. Add this missing variant
> > > and clarify that varian 11 and 15 are Samsung variants, as this
> > > is now very well known from released products.
> > >
> > > Cc: Michael Turquette <mturquette@baylibre.com>
> > > Cc: Stephen Boyd <sboyd@kernel.org>
> > > Cc: linux-clk@vger.kernel.org
> > > Cc: phone-devel@vger.kernel.org
> > > Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> > > ---
> > > Clock maintainers: could you please ACK this so Lee can take
> > > this into the MFD tree? The chances of merge collisions are
> > > zero, this code changes very seldom.
> > > ---
> > >  drivers/clk/ux500/u8500_of_clk.c | 3 ++-
> >
> > >  drivers/mfd/db8500-prcmu.c       | 6 ++++--
> > >  include/linux/mfd/dbx500-prcmu.h | 3 ++-
> >
> > Acked-by: Lee Jones <lee.jones@linaro.org>
> 
> Actually I intended for the clock people to ACK it for you
> but since it is completely independent of 1/2 it actually works
> either way, maybe they will rather pick it up, who knows? :D

That's fine too.

I assume they will not require an immutable branch, as the turn-over
in this file is very low.

-- 
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH 2/2] mfd: db8500-prcmu: Handle missing FW variant

[Stephen Boyd]

Quoting Lee Jones (2021-08-05 01:00:09)
> On Thu, 05 Aug 2021, Linus Walleij wrote:
> 
> > On Mon, Aug 2, 2021 at 9:47 AM Lee Jones <lee.jones@linaro.org> wrote:
> > > On Mon, 02 Aug 2021, Linus Walleij wrote:
> > >
> > > > There was an "unknown" firmware variant turning up in the wild
> > > > causing problems in the clock driver. Add this missing variant
> > > > and clarify that varian 11 and 15 are Samsung variants, as this
> > > > is now very well known from released products.
> > > >
> > > > Cc: Michael Turquette <mturquette@baylibre.com>
> > > > Cc: Stephen Boyd <sboyd@kernel.org>
> > > > Cc: linux-clk@vger.kernel.org
> > > > Cc: phone-devel@vger.kernel.org
> > > > Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> > > > ---
> > > > Clock maintainers: could you please ACK this so Lee can take
> > > > this into the MFD tree? The chances of merge collisions are
> > > > zero, this code changes very seldom.
> > > > ---
> > > >  drivers/clk/ux500/u8500_of_clk.c | 3 ++-
> > >
> > > >  drivers/mfd/db8500-prcmu.c       | 6 ++++--
> > > >  include/linux/mfd/dbx500-prcmu.h | 3 ++-
> > >
> > > Acked-by: Lee Jones <lee.jones@linaro.org>
> > 
> > Actually I intended for the clock people to ACK it for you
> > but since it is completely independent of 1/2 it actually works
> > either way, maybe they will rather pick it up, who knows? :D
> 
> That's fine too.
> 
> I assume they will not require an immutable branch, as the turn-over
> in this file is very low.
> 

Seems fine to go through mfd. Isn't there some other ux500 patch on the
list though?

Re: [PATCH 2/2] mfd: db8500-prcmu: Handle missing FW variant

[Linus Walleij]

On Fri, Aug 6, 2021 at 1:51 AM Stephen Boyd <sboyd@kernel.org> wrote:

> > I assume they will not require an immutable branch, as the turn-over
> > in this file is very low.
>
> Seems fine to go through mfd. Isn't there some other ux500 patch on the
> list though?

Not for clocking, maybe more MFD stuff so merging to MFD should be
the best option.

Yours,
Linus Walleij

Re: [PATCH 2/2] mfd: db8500-prcmu: Handle missing FW variant

[Stephen Boyd]

Quoting Linus Walleij (2021-08-01 16:33:14)
> There was an "unknown" firmware variant turning up in the wild
> causing problems in the clock driver. Add this missing variant
> and clarify that varian 11 and 15 are Samsung variants, as this
> is now very well known from released products.
> 
> Cc: Michael Turquette <mturquette@baylibre.com>
> Cc: Stephen Boyd <sboyd@kernel.org>
> Cc: linux-clk@vger.kernel.org
> Cc: phone-devel@vger.kernel.org
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---

Acked-by: Stephen Boyd <sboyd@kernel.org>

Re: [PATCH 2/2] mfd: db8500-prcmu: Handle missing FW variant

[Lee Jones]

On Mon, 02 Aug 2021, Linus Walleij wrote:

> There was an "unknown" firmware variant turning up in the wild
> causing problems in the clock driver. Add this missing variant
> and clarify that varian 11 and 15 are Samsung variants, as this
> is now very well known from released products.
> 
> Cc: Michael Turquette <mturquette@baylibre.com>
> Cc: Stephen Boyd <sboyd@kernel.org>
> Cc: linux-clk@vger.kernel.org
> Cc: phone-devel@vger.kernel.org
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> Clock maintainers: could you please ACK this so Lee can take
> this into the MFD tree? The chances of merge collisions are
> zero, this code changes very seldom.
> ---
>  drivers/clk/ux500/u8500_of_clk.c | 3 ++-
>  drivers/mfd/db8500-prcmu.c       | 6 ++++--
>  include/linux/mfd/dbx500-prcmu.h | 3 ++-
>  3 files changed, 8 insertions(+), 4 deletions(-)

Applied, thanks.

-- 
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog