Merge tag 'imx-clk-fixes-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawng...
authorStephen Boyd <sboyd@kernel.org>
Tue, 25 Feb 2020 16:57:00 +0000 (08:57 -0800)
committerStephen Boyd <sboyd@kernel.org>
Tue, 25 Feb 2020 16:57:00 +0000 (08:57 -0800)
Pull an i.MX clk fix from Shawn Guo:

A fix on i.MX8MN I2C4 and UART1 clock IDs, which clash with PWM2 and
PWM3 ID.  This bug makes I2C4 and UART1 device in i.MX8MN DT point to
PWM2 and PWM3 clock.

* tag 'imx-clk-fixes-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  clk: imx8mn: Fix incorrect clock defines


Trivial merge