| Message ID | 1574825576-91028-5-git-send-email-zhouyanjie@zoho.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Paul Burton |
| Headers | show |
| Series | [1/5] clk: Ingenic: Adjust code to make it compatible with X1830. | expand |
Hi Zhou, Le mer., nov. 27, 2019 at 11:32, Zhou Yanjie <zhouyanjie@zoho.com> a écrit : > Add the USB OTC clock bindings for the X1000 Soc from Ingenic. > > Signed-off-by: Zhou Yanjie <zhouyanjie@zoho.com> > --- > include/dt-bindings/clock/x1000-cgu.h | 23 ++++++++++++----------- > 1 file changed, 12 insertions(+), 11 deletions(-) > > diff --git a/include/dt-bindings/clock/x1000-cgu.h > b/include/dt-bindings/clock/x1000-cgu.h > index bbaebaf..c401fce 100644 > --- a/include/dt-bindings/clock/x1000-cgu.h > +++ b/include/dt-bindings/clock/x1000-cgu.h > @@ -29,16 +29,17 @@ > #define X1000_CLK_MSCMUX 14 > #define X1000_CLK_MSC0 15 > #define X1000_CLK_MSC1 16 > -#define X1000_CLK_SSIPLL 17 > -#define X1000_CLK_SSIMUX 18 > -#define X1000_CLK_SFC 19 > -#define X1000_CLK_I2C0 20 > -#define X1000_CLK_I2C1 21 > -#define X1000_CLK_I2C2 22 > -#define X1000_CLK_UART0 23 > -#define X1000_CLK_UART1 24 > -#define X1000_CLK_UART2 25 > -#define X1000_CLK_SSI 26 > -#define X1000_CLK_PDMA 27 You can't do that. These macros are ABI now, since they are used in the devicetree. Just use the next valid number for your OTG clock. Cheers, -Paul > +#define X1000_CLK_OTG 17 > +#define X1000_CLK_SSIPLL 18 > +#define X1000_CLK_SSIMUX 19 > +#define X1000_CLK_SFC 20 > +#define X1000_CLK_I2C0 21 > +#define X1000_CLK_I2C1 22 > +#define X1000_CLK_I2C2 23 > +#define X1000_CLK_UART0 24 > +#define X1000_CLK_UART1 25 > +#define X1000_CLK_UART2 26 > +#define X1000_CLK_SSI 27 > +#define X1000_CLK_PDMA 28 > > #endif /* __DT_BINDINGS_CLOCK_X1000_CGU_H__ */ > -- > 2.7.4 > >
Hi Paul, On 2019年11月28日 01:19, Paul Cercueil wrote: > Hi Zhou, > > > Le mer., nov. 27, 2019 at 11:32, Zhou Yanjie <zhouyanjie@zoho.com> a > écrit : >> Add the USB OTC clock bindings for the X1000 Soc from Ingenic. >> >> Signed-off-by: Zhou Yanjie <zhouyanjie@zoho.com> >> --- >> include/dt-bindings/clock/x1000-cgu.h | 23 ++++++++++++----------- >> 1 file changed, 12 insertions(+), 11 deletions(-) >> >> diff --git a/include/dt-bindings/clock/x1000-cgu.h >> b/include/dt-bindings/clock/x1000-cgu.h >> index bbaebaf..c401fce 100644 >> --- a/include/dt-bindings/clock/x1000-cgu.h >> +++ b/include/dt-bindings/clock/x1000-cgu.h >> @@ -29,16 +29,17 @@ >> #define X1000_CLK_MSCMUX 14 >> #define X1000_CLK_MSC0 15 >> #define X1000_CLK_MSC1 16 >> -#define X1000_CLK_SSIPLL 17 >> -#define X1000_CLK_SSIMUX 18 >> -#define X1000_CLK_SFC 19 >> -#define X1000_CLK_I2C0 20 >> -#define X1000_CLK_I2C1 21 >> -#define X1000_CLK_I2C2 22 >> -#define X1000_CLK_UART0 23 >> -#define X1000_CLK_UART1 24 >> -#define X1000_CLK_UART2 25 >> -#define X1000_CLK_SSI 26 >> -#define X1000_CLK_PDMA 27 > > You can't do that. These macros are ABI now, since they are used in > the devicetree. Just use the next valid number for your OTG clock. > My fault, I will fix this in v2. > Cheers, > -Paul > >> +#define X1000_CLK_OTG 17 >> +#define X1000_CLK_SSIPLL 18 >> +#define X1000_CLK_SSIMUX 19 >> +#define X1000_CLK_SFC 20 >> +#define X1000_CLK_I2C0 21 >> +#define X1000_CLK_I2C1 22 >> +#define X1000_CLK_I2C2 23 >> +#define X1000_CLK_UART0 24 >> +#define X1000_CLK_UART1 25 >> +#define X1000_CLK_UART2 26 >> +#define X1000_CLK_SSI 27 >> +#define X1000_CLK_PDMA 28 >> >> #endif /* __DT_BINDINGS_CLOCK_X1000_CGU_H__ */ >> -- >> 2.7.4 >> >> > >
diff --git a/include/dt-bindings/clock/x1000-cgu.h b/include/dt-bindings/clock/x1000-cgu.h index bbaebaf..c401fce 100644 --- a/include/dt-bindings/clock/x1000-cgu.h +++ b/include/dt-bindings/clock/x1000-cgu.h @@ -29,16 +29,17 @@ #define X1000_CLK_MSCMUX 14 #define X1000_CLK_MSC0 15 #define X1000_CLK_MSC1 16 -#define X1000_CLK_SSIPLL 17 -#define X1000_CLK_SSIMUX 18 -#define X1000_CLK_SFC 19 -#define X1000_CLK_I2C0 20 -#define X1000_CLK_I2C1 21 -#define X1000_CLK_I2C2 22 -#define X1000_CLK_UART0 23 -#define X1000_CLK_UART1 24 -#define X1000_CLK_UART2 25 -#define X1000_CLK_SSI 26 -#define X1000_CLK_PDMA 27 +#define X1000_CLK_OTG 17 +#define X1000_CLK_SSIPLL 18 +#define X1000_CLK_SSIMUX 19 +#define X1000_CLK_SFC 20 +#define X1000_CLK_I2C0 21 +#define X1000_CLK_I2C1 22 +#define X1000_CLK_I2C2 23 +#define X1000_CLK_UART0 24 +#define X1000_CLK_UART1 25 +#define X1000_CLK_UART2 26 +#define X1000_CLK_SSI 27 +#define X1000_CLK_PDMA 28 #endif /* __DT_BINDINGS_CLOCK_X1000_CGU_H__ */
Add the USB OTC clock bindings for the X1000 Soc from Ingenic. Signed-off-by: Zhou Yanjie <zhouyanjie@zoho.com> --- include/dt-bindings/clock/x1000-cgu.h | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)