* [PATCH] dt-bindings: imx8mq: Number clocks consecutively
@ 2019-01-15 16:35 Guido Günther
2019-01-15 16:49 ` Abel Vesa
2019-01-15 16:53 ` Lucas Stach
0 siblings, 2 replies; 5+ messages in thread
From: Guido Günther @ 2019-01-15 16:35 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Stephen Boyd, Lucas Stach, Abel Vesa,
devicetree
Signed-off-by: Guido G�nther <agx@sigxcpu.org>
---
include/dt-bindings/clock/imx8mq-clock.h | 26 ++++++++++++------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/include/dt-bindings/clock/imx8mq-clock.h b/include/dt-bindings/clock/imx8mq-clock.h
index b53be41929be..04f7ac345984 100644
--- a/include/dt-bindings/clock/imx8mq-clock.h
+++ b/include/dt-bindings/clock/imx8mq-clock.h
@@ -350,7 +350,7 @@
#define IMX8MQ_CLK_VPU_G2_ROOT 241
/* SCCG PLL GATE */
-#define IMX8MQ_SYS1_PLL_OUT 232
+#define IMX8MQ_SYS1_PLL_OUT 242
#define IMX8MQ_SYS2_PLL_OUT 243
#define IMX8MQ_SYS3_PLL_OUT 244
#define IMX8MQ_DRAM_PLL_OUT 245
@@ -372,24 +372,24 @@
/* txesc clock */
#define IMX8MQ_CLK_DSI_IPG_DIV 256
-#define IMX8MQ_CLK_TMU_ROOT 265
+#define IMX8MQ_CLK_TMU_ROOT 257
/* Display root clocks */
-#define IMX8MQ_CLK_DISP_AXI_ROOT 266
-#define IMX8MQ_CLK_DISP_APB_ROOT 267
-#define IMX8MQ_CLK_DISP_RTRM_ROOT 268
+#define IMX8MQ_CLK_DISP_AXI_ROOT 258
+#define IMX8MQ_CLK_DISP_APB_ROOT 259
+#define IMX8MQ_CLK_DISP_RTRM_ROOT 260
-#define IMX8MQ_CLK_OCOTP_ROOT 269
+#define IMX8MQ_CLK_OCOTP_ROOT 261
-#define IMX8MQ_CLK_DRAM_ALT_ROOT 270
-#define IMX8MQ_CLK_DRAM_CORE 271
+#define IMX8MQ_CLK_DRAM_ALT_ROOT 262
+#define IMX8MQ_CLK_DRAM_CORE 263
-#define IMX8MQ_CLK_MU_ROOT 272
-#define IMX8MQ_VIDEO2_PLL_OUT 273
+#define IMX8MQ_CLK_MU_ROOT 264
+#define IMX8MQ_VIDEO2_PLL_OUT 265
-#define IMX8MQ_CLK_CLKO2 274
+#define IMX8MQ_CLK_CLKO2 266
-#define IMX8MQ_CLK_NAND_USDHC_BUS_RAWNAND_CLK 275
+#define IMX8MQ_CLK_NAND_USDHC_BUS_RAWNAND_CLK 267
-#define IMX8MQ_CLK_END 276
+#define IMX8MQ_CLK_END 268
#endif /* __DT_BINDINGS_CLOCK_IMX8MQ_H */
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] dt-bindings: imx8mq: Number clocks consecutively
2019-01-15 16:35 [PATCH] dt-bindings: imx8mq: Number clocks consecutively Guido Günther
@ 2019-01-15 16:49 ` Abel Vesa
2019-01-15 16:53 ` Lucas Stach
1 sibling, 0 replies; 5+ messages in thread
From: Abel Vesa @ 2019-01-15 16:49 UTC (permalink / raw)
To: Guido Günther
Cc: Rob Herring, Mark Rutland, Stephen Boyd, Lucas Stach,
devicetree@vger.kernel.org
On 19-01-15 17:35:12, Guido Günther wrote:
You need a commit message here.
> Signed-off-by: Guido Günther <agx@sigxcpu.org>
> ---
>
> include/dt-bindings/clock/imx8mq-clock.h | 26 ++++++++++++------------
> 1 file changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/include/dt-bindings/clock/imx8mq-clock.h b/include/dt-bindings/clock/imx8mq-clock.h
> index b53be41929be..04f7ac345984 100644
> --- a/include/dt-bindings/clock/imx8mq-clock.h
> +++ b/include/dt-bindings/clock/imx8mq-clock.h
> @@ -350,7 +350,7 @@
> #define IMX8MQ_CLK_VPU_G2_ROOT 241
>
> /* SCCG PLL GATE */
> -#define IMX8MQ_SYS1_PLL_OUT 232
> +#define IMX8MQ_SYS1_PLL_OUT 242
Nice catch. And it worked because the IMX8MQ_CLK_HDMI_ROOT (which is also 232)
was not used (and registered).
> #define IMX8MQ_SYS2_PLL_OUT 243
> #define IMX8MQ_SYS3_PLL_OUT 244
> #define IMX8MQ_DRAM_PLL_OUT 245
> @@ -372,24 +372,24 @@
> /* txesc clock */
> #define IMX8MQ_CLK_DSI_IPG_DIV 256
>
> -#define IMX8MQ_CLK_TMU_ROOT 265
> +#define IMX8MQ_CLK_TMU_ROOT 257
>
> /* Display root clocks */
> -#define IMX8MQ_CLK_DISP_AXI_ROOT 266
> -#define IMX8MQ_CLK_DISP_APB_ROOT 267
> -#define IMX8MQ_CLK_DISP_RTRM_ROOT 268
> +#define IMX8MQ_CLK_DISP_AXI_ROOT 258
> +#define IMX8MQ_CLK_DISP_APB_ROOT 259
> +#define IMX8MQ_CLK_DISP_RTRM_ROOT 260
>
> -#define IMX8MQ_CLK_OCOTP_ROOT 269
> +#define IMX8MQ_CLK_OCOTP_ROOT 261
>
> -#define IMX8MQ_CLK_DRAM_ALT_ROOT 270
> -#define IMX8MQ_CLK_DRAM_CORE 271
> +#define IMX8MQ_CLK_DRAM_ALT_ROOT 262
> +#define IMX8MQ_CLK_DRAM_CORE 263
>
> -#define IMX8MQ_CLK_MU_ROOT 272
> -#define IMX8MQ_VIDEO2_PLL_OUT 273
> +#define IMX8MQ_CLK_MU_ROOT 264
> +#define IMX8MQ_VIDEO2_PLL_OUT 265
>
> -#define IMX8MQ_CLK_CLKO2 274
> +#define IMX8MQ_CLK_CLKO2 266
>
> -#define IMX8MQ_CLK_NAND_USDHC_BUS_RAWNAND_CLK 275
> +#define IMX8MQ_CLK_NAND_USDHC_BUS_RAWNAND_CLK 267
>
> -#define IMX8MQ_CLK_END 276
> +#define IMX8MQ_CLK_END 268
> #endif /* __DT_BINDINGS_CLOCK_IMX8MQ_H */
> --
> 2.20.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] dt-bindings: imx8mq: Number clocks consecutively
2019-01-15 16:35 [PATCH] dt-bindings: imx8mq: Number clocks consecutively Guido Günther
2019-01-15 16:49 ` Abel Vesa
@ 2019-01-15 16:53 ` Lucas Stach
2019-01-15 17:30 ` Guido Günther
1 sibling, 1 reply; 5+ messages in thread
From: Lucas Stach @ 2019-01-15 16:53 UTC (permalink / raw)
To: Guido Günther, Rob Herring, Mark Rutland, Stephen Boyd,
Abel Vesa, devicetree, Shawn Guo
Am Dienstag, den 15.01.2019, 17:35 +0100 schrieb Guido Günther:
> Signed-off-by: Guido Günther <agx@sigxcpu.org>
This is a breaking change in terms of devicetree stability. So either
we rush this into 5.0-rcX, before the current definition spreads around
or we need to drop this change. I'll leave this for Shawn (CCed) to
decide.
Regards,
Lucas
> ---
>
> include/dt-bindings/clock/imx8mq-clock.h | 26 ++++++++++++------------
> 1 file changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/include/dt-bindings/clock/imx8mq-clock.h b/include/dt-bindings/clock/imx8mq-clock.h
> index b53be41929be..04f7ac345984 100644
> --- a/include/dt-bindings/clock/imx8mq-clock.h
> +++ b/include/dt-bindings/clock/imx8mq-clock.h
> @@ -350,7 +350,7 @@
> > #define IMX8MQ_CLK_VPU_G2_ROOT 241
>
> /* SCCG PLL GATE */
> > -#define IMX8MQ_SYS1_PLL_OUT 232
> > +#define IMX8MQ_SYS1_PLL_OUT 242
> > #define IMX8MQ_SYS2_PLL_OUT 243
> > #define IMX8MQ_SYS3_PLL_OUT 244
> > #define IMX8MQ_DRAM_PLL_OUT 245
> @@ -372,24 +372,24 @@
> /* txesc clock */
> #define IMX8MQ_CLK_DSI_IPG_DIV 256
>
> > -#define IMX8MQ_CLK_TMU_ROOT 265
> > +#define IMX8MQ_CLK_TMU_ROOT 257
>
> /* Display root clocks */
> > -#define IMX8MQ_CLK_DISP_AXI_ROOT 266
> > -#define IMX8MQ_CLK_DISP_APB_ROOT 267
> > -#define IMX8MQ_CLK_DISP_RTRM_ROOT 268
> > +#define IMX8MQ_CLK_DISP_AXI_ROOT 258
> > +#define IMX8MQ_CLK_DISP_APB_ROOT 259
> > +#define IMX8MQ_CLK_DISP_RTRM_ROOT 260
>
> > -#define IMX8MQ_CLK_OCOTP_ROOT 269
> > +#define IMX8MQ_CLK_OCOTP_ROOT 261
>
> > -#define IMX8MQ_CLK_DRAM_ALT_ROOT 270
> > -#define IMX8MQ_CLK_DRAM_CORE 271
> > +#define IMX8MQ_CLK_DRAM_ALT_ROOT 262
> > +#define IMX8MQ_CLK_DRAM_CORE 263
>
> > -#define IMX8MQ_CLK_MU_ROOT 272
> > -#define IMX8MQ_VIDEO2_PLL_OUT 273
> > +#define IMX8MQ_CLK_MU_ROOT 264
> > +#define IMX8MQ_VIDEO2_PLL_OUT 265
>
> > -#define IMX8MQ_CLK_CLKO2 274
> > +#define IMX8MQ_CLK_CLKO2 266
>
> > -#define IMX8MQ_CLK_NAND_USDHC_BUS_RAWNAND_CLK 275
> > +#define IMX8MQ_CLK_NAND_USDHC_BUS_RAWNAND_CLK 267
>
> > -#define IMX8MQ_CLK_END 276
> > +#define IMX8MQ_CLK_END 268
> #endif /* __DT_BINDINGS_CLOCK_IMX8MQ_H */
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] dt-bindings: imx8mq: Number clocks consecutively
2019-01-15 16:53 ` Lucas Stach
@ 2019-01-15 17:30 ` Guido Günther
2019-01-16 3:33 ` Shawn Guo
0 siblings, 1 reply; 5+ messages in thread
From: Guido Günther @ 2019-01-15 17:30 UTC (permalink / raw)
To: Lucas Stach
Cc: Rob Herring, Mark Rutland, Stephen Boyd, Abel Vesa, devicetree,
Shawn Guo
Hi Lucas,
On Tue, Jan 15, 2019 at 05:53:51PM +0100, Lucas Stach wrote:
> Am Dienstag, den 15.01.2019, 17:35 +0100 schrieb Guido G�nther:
> > Signed-off-by: Guido G�nther <agx@sigxcpu.org>
>
> This is a breaking change in terms of devicetree stability. So either
> we rush this into 5.0-rcX, before the current definition spreads around
> or we need to drop this change. I'll leave this for Shawn (CCed) to
> decide.
Note that 232 is currently used for both IMX8MQ_CLK_HDMI_ROOT and
IMX8MQ_SYS1_PLL_OUT so we need to fix that one up - or need to come up
with a new name and have that duplicate assignment in there forever. So
fixing this for 5.0 would be cool.
Cheers,
-- Guido
>
> Regards,
> Lucas
>
> > ---
> >
> > �include/dt-bindings/clock/imx8mq-clock.h | 26 ++++++++++++------------
> > �1 file changed, 13 insertions(+), 13 deletions(-)
> >
> > diff --git a/include/dt-bindings/clock/imx8mq-clock.h b/include/dt-bindings/clock/imx8mq-clock.h
> > index b53be41929be..04f7ac345984 100644
> > --- a/include/dt-bindings/clock/imx8mq-clock.h
> > +++ b/include/dt-bindings/clock/imx8mq-clock.h
> > @@ -350,7 +350,7 @@
> > > �#define IMX8MQ_CLK_VPU_G2_ROOT 241
> > �
> > �/* SCCG PLL GATE */
> > > -#define IMX8MQ_SYS1_PLL_OUT 232
> > > +#define IMX8MQ_SYS1_PLL_OUT 242
> > > �#define IMX8MQ_SYS2_PLL_OUT 243
> > > �#define IMX8MQ_SYS3_PLL_OUT 244
> > > �#define IMX8MQ_DRAM_PLL_OUT 245
> > @@ -372,24 +372,24 @@
> > �/* txesc clock */
> > �#define IMX8MQ_CLK_DSI_IPG_DIV������������������256
> > �
> > > -#define IMX8MQ_CLK_TMU_ROOT 265
> > > +#define IMX8MQ_CLK_TMU_ROOT 257
> > �
> > �/* Display root clocks */
> > > -#define IMX8MQ_CLK_DISP_AXI_ROOT 266
> > > -#define IMX8MQ_CLK_DISP_APB_ROOT 267
> > > -#define IMX8MQ_CLK_DISP_RTRM_ROOT 268
> > > +#define IMX8MQ_CLK_DISP_AXI_ROOT 258
> > > +#define IMX8MQ_CLK_DISP_APB_ROOT 259
> > > +#define IMX8MQ_CLK_DISP_RTRM_ROOT 260
> > �
> > > -#define IMX8MQ_CLK_OCOTP_ROOT 269
> > > +#define IMX8MQ_CLK_OCOTP_ROOT 261
> > �
> > > -#define IMX8MQ_CLK_DRAM_ALT_ROOT 270
> > > -#define IMX8MQ_CLK_DRAM_CORE 271
> > > +#define IMX8MQ_CLK_DRAM_ALT_ROOT 262
> > > +#define IMX8MQ_CLK_DRAM_CORE 263
> > �
> > > -#define IMX8MQ_CLK_MU_ROOT 272
> > > -#define IMX8MQ_VIDEO2_PLL_OUT 273
> > > +#define IMX8MQ_CLK_MU_ROOT 264
> > > +#define IMX8MQ_VIDEO2_PLL_OUT 265
> > �
> > > -#define IMX8MQ_CLK_CLKO2 274
> > > +#define IMX8MQ_CLK_CLKO2 266
> > �
> > > -#define IMX8MQ_CLK_NAND_USDHC_BUS_RAWNAND_CLK 275
> > > +#define IMX8MQ_CLK_NAND_USDHC_BUS_RAWNAND_CLK 267
> > �
> > > -#define IMX8MQ_CLK_END 276
> > > +#define IMX8MQ_CLK_END 268
> > �#endif /* __DT_BINDINGS_CLOCK_IMX8MQ_H */
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] dt-bindings: imx8mq: Number clocks consecutively
2019-01-15 17:30 ` Guido Günther
@ 2019-01-16 3:33 ` Shawn Guo
0 siblings, 0 replies; 5+ messages in thread
From: Shawn Guo @ 2019-01-16 3:33 UTC (permalink / raw)
To: Guido Günther, Stephen Boyd
Cc: Lucas Stach, Rob Herring, Mark Rutland, Abel Vesa, devicetree
On Tue, Jan 15, 2019 at 06:30:12PM +0100, Guido G�nther wrote:
> Hi Lucas,
> On Tue, Jan 15, 2019 at 05:53:51PM +0100, Lucas Stach wrote:
> > Am Dienstag, den 15.01.2019, 17:35 +0100 schrieb Guido G�nther:
> > > Signed-off-by: Guido G�nther <agx@sigxcpu.org>
> >
> > This is a breaking change in terms of devicetree stability. So either
> > we rush this into 5.0-rcX, before the current definition spreads around
> > or we need to drop this change. I'll leave this for Shawn (CCed) to
> > decide.
>
> Note that 232 is currently used for both IMX8MQ_CLK_HDMI_ROOT and
> IMX8MQ_SYS1_PLL_OUT so we need to fix that one up - or need to come up
> with a new name and have that duplicate assignment in there forever. So
> fixing this for 5.0 would be cool.
I would like to fix it for 5.0.
@Guido,
Please write up a proper commit log as suggested by Abel, add a Fixes
tag and resend (with me copied).
Shawn
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-01-16 3:33 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-15 16:35 [PATCH] dt-bindings: imx8mq: Number clocks consecutively Guido Günther
2019-01-15 16:49 ` Abel Vesa
2019-01-15 16:53 ` Lucas Stach
2019-01-15 17:30 ` Guido Günther
2019-01-16 3:33 ` Shawn Guo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).