diff options
| author |   Stephen Boyd <sboyd@kernel.org> | 2020-02-25 08:57:00 -0800 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2020-02-25 08:57:00 -0800 |
| commit | 20055448dc1b439c87d0cb602e6d0469b0a3aaad (patch) | |
| tree | c0631621ff61edc3621ac196bed995ceff5e8258 /include | |
| parent | clk: qcom: dispcc: Remove support of disp_cc_mdss_rscc_ahb_clk (diff) | |
| parent | clk: imx8mn: Fix incorrect clock defines (diff) | |
| download | linux-dev-20055448dc1b439c87d0cb602e6d0469b0a3aaad.tar.xz linux-dev-20055448dc1b439c87d0cb602e6d0469b0a3aaad.zip | |
Merge tag 'imx-clk-fixes-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into clk-fixes
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/clock/imx8mn-clock.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/dt-bindings/clock/imx8mn-clock.h b/include/dt-bindings/clock/imx8mn-clock.h index 0f2b8423ce1d..65ac6eb6c733 100644 --- a/include/dt-bindings/clock/imx8mn-clock.h +++ b/include/dt-bindings/clock/imx8mn-clock.h @@ -122,8 +122,8 @@ #define IMX8MN_CLK_I2C1 105 #define IMX8MN_CLK_I2C2 106 #define IMX8MN_CLK_I2C3 107 -#define IMX8MN_CLK_I2C4 118 -#define IMX8MN_CLK_UART1 119 +#define IMX8MN_CLK_I2C4 108 +#define IMX8MN_CLK_UART1 109 #define IMX8MN_CLK_UART2 110 #define IMX8MN_CLK_UART3 111 #define IMX8MN_CLK_UART4 112 |