diff options
| author |   Stephen Boyd <sboyd@kernel.org> | 2020-09-22 12:18:57 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2020-09-22 12:18:57 -0700 |
| commit | db2a28ef95bfdfc19554e3a09310cdaf9af61be6 (patch) | |
| tree | 584ea53dd13b71ee71d1bb92619046b5f62c07ce /include | |
| parent | Linux 5.9-rc1 (diff) | |
| parent | clk: imx: imx21: Remove clock driver (diff) | |
| download | wireguard-linux-db2a28ef95bfdfc19554e3a09310cdaf9af61be6.tar.xz wireguard-linux-db2a28ef95bfdfc19554e3a09310cdaf9af61be6.zip | |
Merge tag 'clk-imx-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into clk-imx
Pull i.MX clk driver updates from Shawn Guo:
- A series from Anson Huang to support building i.MX ARMv8 platforms clock driver as module
- Remove i.MX21 clock driver, as i.MX21 platform support is being dropped
- A couple of minor imx8mp clock correction from Jacky Bai
- Add clock for CRC block found on vf610 SoC
- A couple of clock flag fix-up from Peng Fan
- Minor kerneldoc fix-up for i.MX clock drivers
* tag 'clk-imx-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
clk: imx: imx21: Remove clock driver
clk: imx: gate2: Fix a few typos
clk: imx: Fix and update kerneldoc
clk: imx: fix i.MX7D peripheral clk mux flags
clk: imx: fix composite peripheral flags
clk: imx: Correct the memrepair clock on imx8mp
clk: imx: Correct the root clk of media ldb on imx8mp
clk: imx: vf610: Add CRC clock
clk: imx: Explicitly include bits.h
clk: imx8qxp: Support building i.MX8QXP clock driver as module
clk: imx8m: Support module build
clk: imx: Add clock configuration for ARMv7 platforms
clk: imx: Support building i.MX common clock driver as module
clk: composite: Export clk_hw_register_composite()
clk: imx6sl: Use BIT(x) to avoid shifting signed 32-bit value by 31 bits
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/clock/imx8mp-clock.h | 2 | ||||
| -rw-r--r-- | include/dt-bindings/clock/vf610-clock.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/dt-bindings/clock/imx8mp-clock.h b/include/dt-bindings/clock/imx8mp-clock.h index 7a23f289b27f..e8d68fbb6e3f 100644 --- a/include/dt-bindings/clock/imx8mp-clock.h +++ b/include/dt-bindings/clock/imx8mp-clock.h @@ -180,7 +180,7 @@ #define IMX8MP_CLK_MEDIA_MIPI_PHY1_REF 171 #define IMX8MP_CLK_MEDIA_DISP1_PIX 172 #define IMX8MP_CLK_MEDIA_CAM2_PIX 173 -#define IMX8MP_CLK_MEDIA_MIPI_PHY2_REF 174 +#define IMX8MP_CLK_MEDIA_LDB 174 #define IMX8MP_CLK_MEDIA_MIPI_CSI2_ESC 175 #define IMX8MP_CLK_PCIE2_CTRL 176 #define IMX8MP_CLK_PCIE2_PHY 177 diff --git a/include/dt-bindings/clock/vf610-clock.h b/include/dt-bindings/clock/vf610-clock.h index 0f2d60e884dc..373644e46747 100644 --- a/include/dt-bindings/clock/vf610-clock.h +++ b/include/dt-bindings/clock/vf610-clock.h @@ -196,6 +196,7 @@ #define VF610_CLK_TCON0 187 #define VF610_CLK_TCON1 188 #define VF610_CLK_CAAM 189 -#define VF610_CLK_END 190 +#define VF610_CLK_CRC 190 +#define VF610_CLK_END 191 #endif /* __DT_BINDINGS_CLOCK_VF610_H */ |