Commit 9cc63791 authored by Stephen Boyd's avatar Stephen Boyd

Merge branch 'clk-fix-imx6ul-defs' into clk-fixes

* clk-fix-imx6ul-defs:
  dt-bindings: clock: imx6ul: Do not change the clock definition order
parents c34cc2f2 55c5e0c6
...@@ -235,27 +235,25 @@ ...@@ -235,27 +235,25 @@
#define IMX6UL_CLK_CSI_PODF 222 #define IMX6UL_CLK_CSI_PODF 222
#define IMX6UL_CLK_PLL3_120M 223 #define IMX6UL_CLK_PLL3_120M 223
#define IMX6UL_CLK_KPP 224 #define IMX6UL_CLK_KPP 224
#define IMX6UL_CLK_CKO1_SEL 225 #define IMX6ULL_CLK_ESAI_PRED 225
#define IMX6UL_CLK_CKO1_PODF 226 #define IMX6ULL_CLK_ESAI_PODF 226
#define IMX6UL_CLK_CKO1 227 #define IMX6ULL_CLK_ESAI_EXTAL 227
#define IMX6UL_CLK_CKO2_SEL 228 #define IMX6ULL_CLK_ESAI_MEM 228
#define IMX6UL_CLK_CKO2_PODF 229 #define IMX6ULL_CLK_ESAI_IPG 229
#define IMX6UL_CLK_CKO2 230 #define IMX6ULL_CLK_DCP_CLK 230
#define IMX6UL_CLK_CKO 231 #define IMX6ULL_CLK_EPDC_PRE_SEL 231
#define IMX6ULL_CLK_EPDC_SEL 232
/* For i.MX6ULL */ #define IMX6ULL_CLK_EPDC_PODF 233
#define IMX6ULL_CLK_ESAI_PRED 232 #define IMX6ULL_CLK_EPDC_ACLK 234
#define IMX6ULL_CLK_ESAI_PODF 233 #define IMX6ULL_CLK_EPDC_PIX 235
#define IMX6ULL_CLK_ESAI_EXTAL 234 #define IMX6ULL_CLK_ESAI_SEL 236
#define IMX6ULL_CLK_ESAI_MEM 235 #define IMX6UL_CLK_CKO1_SEL 237
#define IMX6ULL_CLK_ESAI_IPG 236 #define IMX6UL_CLK_CKO1_PODF 238
#define IMX6ULL_CLK_DCP_CLK 237 #define IMX6UL_CLK_CKO1 239
#define IMX6ULL_CLK_EPDC_PRE_SEL 238 #define IMX6UL_CLK_CKO2_SEL 240
#define IMX6ULL_CLK_EPDC_SEL 239 #define IMX6UL_CLK_CKO2_PODF 241
#define IMX6ULL_CLK_EPDC_PODF 240 #define IMX6UL_CLK_CKO2 242
#define IMX6ULL_CLK_EPDC_ACLK 241 #define IMX6UL_CLK_CKO 243
#define IMX6ULL_CLK_EPDC_PIX 242
#define IMX6ULL_CLK_ESAI_SEL 243
#define IMX6UL_CLK_END 244 #define IMX6UL_CLK_END 244
#endif /* __DT_BINDINGS_CLOCK_IMX6UL_H */ #endif /* __DT_BINDINGS_CLOCK_IMX6UL_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment