Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3673a91c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-fixes-5.0-2' of... 

Merge tag 'imx-fixes-5.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes

i.MX fixes for 5.0, 2nd round:

It contains a single fix for i.MX8MQ clock numbers, removing the
duplicate use of 232 and numbering the clocks consecutively.

* tag 'imx-fixes-5.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

:
  dt-bindings: imx8mq: Number clocks consecutively

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents e22dc7be c5b11ee9

include/dt-bindings/clock/imx8mq-clock.h

+13 −13
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ 
#define IMX8MQ_CLK_VPU_G2_ROOT			241



/* SCCG PLL GATE */

#define IMX8MQ_SYS1_PLL_OUT			232

#define IMX8MQ_SYS1_PLL_OUT			242

#define IMX8MQ_SYS2_PLL_OUT			243

#define IMX8MQ_SYS3_PLL_OUT			244

#define IMX8MQ_DRAM_PLL_OUT			245
@@ -372,24 +372,24 @@ 
/* txesc clock */

#define IMX8MQ_CLK_DSI_IPG_DIV                  256



#define IMX8MQ_CLK_TMU_ROOT			265

#define IMX8MQ_CLK_TMU_ROOT			257



/* Display root clocks */

#define IMX8MQ_CLK_DISP_AXI_ROOT		266

#define IMX8MQ_CLK_DISP_APB_ROOT		267

#define IMX8MQ_CLK_DISP_RTRM_ROOT		268

#define IMX8MQ_CLK_DISP_AXI_ROOT		258

#define IMX8MQ_CLK_DISP_APB_ROOT		259

#define IMX8MQ_CLK_DISP_RTRM_ROOT		260



#define IMX8MQ_CLK_OCOTP_ROOT			269

#define IMX8MQ_CLK_OCOTP_ROOT			261



#define IMX8MQ_CLK_DRAM_ALT_ROOT		270

#define IMX8MQ_CLK_DRAM_CORE			271

#define IMX8MQ_CLK_DRAM_ALT_ROOT		262

#define IMX8MQ_CLK_DRAM_CORE			263



#define IMX8MQ_CLK_MU_ROOT			272

#define IMX8MQ_VIDEO2_PLL_OUT			273

#define IMX8MQ_CLK_MU_ROOT			264

#define IMX8MQ_VIDEO2_PLL_OUT			265



#define IMX8MQ_CLK_CLKO2			274

#define IMX8MQ_CLK_CLKO2			266



#define IMX8MQ_CLK_NAND_USDHC_BUS_RAWNAND_CLK	275

#define IMX8MQ_CLK_NAND_USDHC_BUS_RAWNAND_CLK	267



#define IMX8MQ_CLK_END				276

#define IMX8MQ_CLK_END				268

#endif /* __DT_BINDINGS_CLOCK_IMX8MQ_H */