Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

dt-bindings: clock: imx6ul: Do not change the clock definition order

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>
Acked-by: Rob Herring <robh@kernel.org>
Reviewed-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

authored by

Fabio Estevam and committed by
Stephen Boyd
55c5e0c6 ce397d21

+19 -21
+19 -21
include/dt-bindings/clock/imx6ul-clock.h
··· 235 235 #define IMX6UL_CLK_CSI_PODF 222 236 236 #define IMX6UL_CLK_PLL3_120M 223 237 237 #define IMX6UL_CLK_KPP 224 238 - #define IMX6UL_CLK_CKO1_SEL 225 239 - #define IMX6UL_CLK_CKO1_PODF 226 240 - #define IMX6UL_CLK_CKO1 227 241 - #define IMX6UL_CLK_CKO2_SEL 228 242 - #define IMX6UL_CLK_CKO2_PODF 229 243 - #define IMX6UL_CLK_CKO2 230 244 - #define IMX6UL_CLK_CKO 231 245 - 246 - /* For i.MX6ULL */ 247 - #define IMX6ULL_CLK_ESAI_PRED 232 248 - #define IMX6ULL_CLK_ESAI_PODF 233 249 - #define IMX6ULL_CLK_ESAI_EXTAL 234 250 - #define IMX6ULL_CLK_ESAI_MEM 235 251 - #define IMX6ULL_CLK_ESAI_IPG 236 252 - #define IMX6ULL_CLK_DCP_CLK 237 253 - #define IMX6ULL_CLK_EPDC_PRE_SEL 238 254 - #define IMX6ULL_CLK_EPDC_SEL 239 255 - #define IMX6ULL_CLK_EPDC_PODF 240 256 - #define IMX6ULL_CLK_EPDC_ACLK 241 257 - #define IMX6ULL_CLK_EPDC_PIX 242 258 - #define IMX6ULL_CLK_ESAI_SEL 243 238 + #define IMX6ULL_CLK_ESAI_PRED 225 239 + #define IMX6ULL_CLK_ESAI_PODF 226 240 + #define IMX6ULL_CLK_ESAI_EXTAL 227 241 + #define IMX6ULL_CLK_ESAI_MEM 228 242 + #define IMX6ULL_CLK_ESAI_IPG 229 243 + #define IMX6ULL_CLK_DCP_CLK 230 244 + #define IMX6ULL_CLK_EPDC_PRE_SEL 231 245 + #define IMX6ULL_CLK_EPDC_SEL 232 246 + #define IMX6ULL_CLK_EPDC_PODF 233 247 + #define IMX6ULL_CLK_EPDC_ACLK 234 248 + #define IMX6ULL_CLK_EPDC_PIX 235 249 + #define IMX6ULL_CLK_ESAI_SEL 236 250 + #define IMX6UL_CLK_CKO1_SEL 237 251 + #define IMX6UL_CLK_CKO1_PODF 238 252 + #define IMX6UL_CLK_CKO1 239 253 + #define IMX6UL_CLK_CKO2_SEL 240 254 + #define IMX6UL_CLK_CKO2_PODF 241 255 + #define IMX6UL_CLK_CKO2 242 256 + #define IMX6UL_CLK_CKO 243 259 257 #define IMX6UL_CLK_END 244 260 258 261 259 #endif /* __DT_BINDINGS_CLOCK_IMX6UL_H */