From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.kmu-office.ch ([178.209.48.109]:44278 "EHLO mail.kmu-office.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932111AbeFFQ1v (ORCPT ); Wed, 6 Jun 2018 12:27:51 -0400 MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Date: Wed, 06 Jun 2018 18:27:48 +0200 From: Stefan Agner To: Fabio Estevam Cc: sboyd@kernel.org, michael@amarulasolutions.com, stefan.wahren@i2se.com, robh+dt@kernel.org, devicetree@vger.kernel.org, linux-clk@vger.kernel.org, anson.huang@nxp.com, Fabio Estevam Subject: Re: [PATCH v2] dt-bindings: clock: imx6ul: Do not change the clock definition order In-Reply-To: <1527948122-32092-1-git-send-email-festevam@gmail.com> References: <1527948122-32092-1-git-send-email-festevam@gmail.com> Message-ID: <3be11aeea9cd0399837acb201f6226d9@agner.ch> Sender: linux-clk-owner@vger.kernel.org List-ID: On 02.06.2018 16:02, Fabio Estevam wrote: > From: Fabio Estevam > > 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 > Signed-off-by: Fabio Estevam > --- > 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 > +#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 */