Re: [PATCH 1/2] dt-bindings: firmware: imx: sync with SCFW kit v1.13.0

[Viorel Suman]

On 22-09-16 09:43:51, Ahmad Fatoum wrote:
> Hello,
> 
> On 15.09.22 20:18, Viorel Suman (OSS) wrote:
> > From: Viorel Suman <viorel.suman@xxxxxxx>
> > 
> > Sync defines with the latest available SCFW kit version 1.13.0,
> > may be found at the address below:
> > 
> > https://www.nxp.com/webapp/Download?colCode=L5.15.32_2.0.0_SCFWKIT-1.13.0&appType=license
> > 
> > Signed-off-by: Viorel Suman <viorel.suman@xxxxxxx>
> > ---
> >  include/dt-bindings/firmware/imx/rsrc.h | 299 ++++++++++++++++--------
> >  1 file changed, 203 insertions(+), 96 deletions(-)
> > 
> > diff --git a/include/dt-bindings/firmware/imx/rsrc.h b/include/dt-bindings/firmware/imx/rsrc.h
> > index 43885056557c..a4c68f394986 100644
> > --- a/include/dt-bindings/firmware/imx/rsrc.h
> > +++ b/include/dt-bindings/firmware/imx/rsrc.h
> > @@ -13,34 +13,38 @@
> >   * never be changed or removed (only added to at the end of the list).
> 
> Above comment literally says that you should never remove defines below.
> Please provide a better justification why you deem breaking DT backward
> compatibility acceptable.
> 
> Thanks,
> Ahmad
> 
> >   */
> >  
> > -#define IMX_SC_R_A53			0
> > -#define IMX_SC_R_A53_0			1
> > -#define IMX_SC_R_A53_1			2
> > -#define IMX_SC_R_A53_2			3
> > -#define IMX_SC_R_A53_3			4
...

Hi Ahmad,

The defines you mentioned are not removed, just redefined in the
backward compatibility section added in the end of the patch.
The patch follows the same approach as in SCFW kit v1.13.0, so
it's much easier to synchronize them.

+/*
+ * Compatibility defines for sc_rsrc_t
+ */
+#define IMX_SC_R_A35                   IMX_SC_R_AP_2
+#define IMX_SC_R_A35_0                 IMX_SC_R_AP_2_0
+#define IMX_SC_R_A35_1                 IMX_SC_R_AP_2_1
+#define IMX_SC_R_A35_2                 IMX_SC_R_AP_2_2
+#define IMX_SC_R_A35_3                 IMX_SC_R_AP_2_3
+#define IMX_SC_R_A53                   IMX_SC_R_AP_0
+#define IMX_SC_R_A53_0                 IMX_SC_R_AP_0_0
+#define IMX_SC_R_A53_1                 IMX_SC_R_AP_0_1
+#define IMX_SC_R_A53_2                 IMX_SC_R_AP_0_2
+#define IMX_SC_R_A53_3                 IMX_SC_R_AP_0_3
...

The only renamed defines are below, the reason is that
VPU_UART and VPUCORE* defines were replaced with ENET defines
in SCFW kit long time ago, to quote the author:
   "The VPU UARTs haven't existed since QM A0 was supported."

> > -#define IMX_SC_R_VPU_UART		366
> > -#define IMX_SC_R_VPUCORE		367
> > -#define IMX_SC_R_VPUCORE_0		368
> > -#define IMX_SC_R_VPUCORE_1		369
> > -#define IMX_SC_R_VPUCORE_2		370
> > -#define IMX_SC_R_VPUCORE_3		371
> > +#define IMX_SC_R_ENET_0_A2		366
> > +#define IMX_SC_R_ENET_1_A0		367
> > +#define IMX_SC_R_ENET_1_A1		368
> > +#define IMX_SC_R_ENET_1_A2		369
> > +#define IMX_SC_R_ENET_1_A3		370
> > +#define IMX_SC_R_ENET_1_A4		371

Regards,
Viorel