| Message ID | 1527948122-32092-1-git-send-email-festevam@gmail.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Sat, Jun 02, 2018 at 11:02:02AM -0300, Fabio Estevam wrote: > From: Fabio Estevam <fabio.estevam@nxp.com> > > Commit f5a4670de966 ("clk: imx: Add new clo01 and clo2 controlled > by CCOSR") introduced the CLK_CLKO definitions, but didn't put them > at the end of the list, which may cause dtb breakage when running an old > dtb with a newer kernel. > > In order to avoid that, simply add the new CLK_CKO clock definitions > at the end of the list. > > Fixes: f5a4670de966 ("clk: imx: Add new clo01 and clo2 controlled by CCOSR") > Reported-by: Stefan Wahren <stefan.wahren@i2se.com> > Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> > --- > Changes since v1: > - Use 12 char for the commit id > > include/dt-bindings/clock/imx6ul-clock.h | 40 +++++++++++++++----------------- > 1 file changed, 19 insertions(+), 21 deletions(-) Acked-by: Rob Herring <robh@kernel.org> -- To unsubscribe from this list: send the line "unsubscribe linux-clk" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 02.06.2018 16:02, Fabio Estevam wrote: > From: Fabio Estevam <fabio.estevam@nxp.com> > > Commit f5a4670de966 ("clk: imx: Add new clo01 and clo2 controlled > by CCOSR") introduced the CLK_CLKO definitions, but didn't put them > at the end of the list, which may cause dtb breakage when running an old > dtb with a newer kernel. > > In order to avoid that, simply add the new CLK_CKO clock definitions > at the end of the list. > > Fixes: f5a4670de966 ("clk: imx: Add new clo01 and clo2 controlled by CCOSR") > Reported-by: Stefan Wahren <stefan.wahren@i2se.com> > Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> > --- > Changes since v1: > - Use 12 char for the commit id > > include/dt-bindings/clock/imx6ul-clock.h | 40 +++++++++++++++----------------- > 1 file changed, 19 insertions(+), 21 deletions(-) > > diff --git a/include/dt-bindings/clock/imx6ul-clock.h > b/include/dt-bindings/clock/imx6ul-clock.h > index 9564597..0aa1d9c 100644 > --- a/include/dt-bindings/clock/imx6ul-clock.h > +++ b/include/dt-bindings/clock/imx6ul-clock.h > @@ -235,27 +235,25 @@ > #define IMX6UL_CLK_CSI_PODF 222 > #define IMX6UL_CLK_PLL3_120M 223 > #define IMX6UL_CLK_KPP 224 > -#define IMX6UL_CLK_CKO1_SEL 225 > -#define IMX6UL_CLK_CKO1_PODF 226 > -#define IMX6UL_CLK_CKO1 227 > -#define IMX6UL_CLK_CKO2_SEL 228 > -#define IMX6UL_CLK_CKO2_PODF 229 > -#define IMX6UL_CLK_CKO2 230 > -#define IMX6UL_CLK_CKO 231 > - > -/* For i.MX6ULL */ > -#define IMX6ULL_CLK_ESAI_PRED 232 > -#define IMX6ULL_CLK_ESAI_PODF 233 > -#define IMX6ULL_CLK_ESAI_EXTAL 234 > -#define IMX6ULL_CLK_ESAI_MEM 235 > -#define IMX6ULL_CLK_ESAI_IPG 236 > -#define IMX6ULL_CLK_DCP_CLK 237 > -#define IMX6ULL_CLK_EPDC_PRE_SEL 238 > -#define IMX6ULL_CLK_EPDC_SEL 239 > -#define IMX6ULL_CLK_EPDC_PODF 240 > -#define IMX6ULL_CLK_EPDC_ACLK 241 > -#define IMX6ULL_CLK_EPDC_PIX 242 > -#define IMX6ULL_CLK_ESAI_SEL 243 > +#define IMX6ULL_CLK_ESAI_PRED 225 > +#define IMX6ULL_CLK_ESAI_PODF 226 > +#define IMX6ULL_CLK_ESAI_EXTAL 227 > +#define IMX6ULL_CLK_ESAI_MEM 228 > +#define IMX6ULL_CLK_ESAI_IPG 229 > +#define IMX6ULL_CLK_DCP_CLK 230 > +#define IMX6ULL_CLK_EPDC_PRE_SEL 231 > +#define IMX6ULL_CLK_EPDC_SEL 232 > +#define IMX6ULL_CLK_EPDC_PODF 233 > +#define IMX6ULL_CLK_EPDC_ACLK 234 > +#define IMX6ULL_CLK_EPDC_PIX 235 > +#define IMX6ULL_CLK_ESAI_SEL 236 Nit: Add an empty line here? Reviewed-by: Stefan Agner <stefan@agner.ch> > +#define IMX6UL_CLK_CKO1_SEL 237 > +#define IMX6UL_CLK_CKO1_PODF 238 > +#define IMX6UL_CLK_CKO1 239 > +#define IMX6UL_CLK_CKO2_SEL 240 > +#define IMX6UL_CLK_CKO2_PODF 241 > +#define IMX6UL_CLK_CKO2 242 > +#define IMX6UL_CLK_CKO 243 > #define IMX6UL_CLK_END 244 > > #endif /* __DT_BINDINGS_CLOCK_IMX6UL_H */ -- To unsubscribe from this list: send the line "unsubscribe linux-clk" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Stefan, On Wed, Jun 6, 2018 at 1:27 PM, Stefan Agner <stefan@agner.ch> wrote: >> +#define IMX6ULL_CLK_ESAI_SEL 236 > > Nit: Add an empty line here? The lack of an empty line is on purpose because I wanted to avoid someone thinking: "Oh, there is hole here, let me fill it with new clocks here" :-) > Reviewed-by: Stefan Agner <stefan@agner.ch> Thanks for reviewing! -- To unsubscribe from this list: send the line "unsubscribe linux-clk" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoting Fabio Estevam (2018-06-02 07:02:02) > From: Fabio Estevam <fabio.estevam@nxp.com> > > Commit f5a4670de966 ("clk: imx: Add new clo01 and clo2 controlled > by CCOSR") introduced the CLK_CLKO definitions, but didn't put them > at the end of the list, which may cause dtb breakage when running an old > dtb with a newer kernel. > > In order to avoid that, simply add the new CLK_CKO clock definitions > at the end of the list. > > Fixes: f5a4670de966 ("clk: imx: Add new clo01 and clo2 controlled by CCOSR") > Reported-by: Stefan Wahren <stefan.wahren@i2se.com> > Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> > --- Applied to clk-fixes -- To unsubscribe from this list: send the line "unsubscribe linux-clk" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/dt-bindings/clock/imx6ul-clock.h b/include/dt-bindings/clock/imx6ul-clock.h index 9564597..0aa1d9c 100644 --- a/include/dt-bindings/clock/imx6ul-clock.h +++ b/include/dt-bindings/clock/imx6ul-clock.h @@ -235,27 +235,25 @@ #define IMX6UL_CLK_CSI_PODF 222 #define IMX6UL_CLK_PLL3_120M 223 #define IMX6UL_CLK_KPP 224 -#define IMX6UL_CLK_CKO1_SEL 225 -#define IMX6UL_CLK_CKO1_PODF 226 -#define IMX6UL_CLK_CKO1 227 -#define IMX6UL_CLK_CKO2_SEL 228 -#define IMX6UL_CLK_CKO2_PODF 229 -#define IMX6UL_CLK_CKO2 230 -#define IMX6UL_CLK_CKO 231 - -/* For i.MX6ULL */ -#define IMX6ULL_CLK_ESAI_PRED 232 -#define IMX6ULL_CLK_ESAI_PODF 233 -#define IMX6ULL_CLK_ESAI_EXTAL 234 -#define IMX6ULL_CLK_ESAI_MEM 235 -#define IMX6ULL_CLK_ESAI_IPG 236 -#define IMX6ULL_CLK_DCP_CLK 237 -#define IMX6ULL_CLK_EPDC_PRE_SEL 238 -#define IMX6ULL_CLK_EPDC_SEL 239 -#define IMX6ULL_CLK_EPDC_PODF 240 -#define IMX6ULL_CLK_EPDC_ACLK 241 -#define IMX6ULL_CLK_EPDC_PIX 242 -#define IMX6ULL_CLK_ESAI_SEL 243 +#define IMX6ULL_CLK_ESAI_PRED 225 +#define IMX6ULL_CLK_ESAI_PODF 226 +#define IMX6ULL_CLK_ESAI_EXTAL 227 +#define IMX6ULL_CLK_ESAI_MEM 228 +#define IMX6ULL_CLK_ESAI_IPG 229 +#define IMX6ULL_CLK_DCP_CLK 230 +#define IMX6ULL_CLK_EPDC_PRE_SEL 231 +#define IMX6ULL_CLK_EPDC_SEL 232 +#define IMX6ULL_CLK_EPDC_PODF 233 +#define IMX6ULL_CLK_EPDC_ACLK 234 +#define IMX6ULL_CLK_EPDC_PIX 235 +#define IMX6ULL_CLK_ESAI_SEL 236 +#define IMX6UL_CLK_CKO1_SEL 237 +#define IMX6UL_CLK_CKO1_PODF 238 +#define IMX6UL_CLK_CKO1 239 +#define IMX6UL_CLK_CKO2_SEL 240 +#define IMX6UL_CLK_CKO2_PODF 241 +#define IMX6UL_CLK_CKO2 242 +#define IMX6UL_CLK_CKO 243 #define IMX6UL_CLK_END 244 #endif /* __DT_BINDINGS_CLOCK_IMX6UL_H */