diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2019-06-24 20:16:13 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2019-06-24 20:16:30 -0700 |
| commit | 76b77f1dbb16b89b8fca18d51ccee77433a3bde0 (patch) | |
| tree | 14b275575a90bc1b31c333ed16e14263ccc478fd /include | |
| parent | a188339ca5a396acc588e5851ed7e19f66b0ebd9 (diff) | |
| parent | 15c64ff7625513c551e2b50c1ae28f729b61c5d3 (diff) | |
| download | linux-76b77f1dbb16b89b8fca18d51ccee77433a3bde0.tar.bz2 | |
Merge tag 'imx-clk-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into clk-imx
Pull i.MX clk driver changes from Shawn Guo:
- A series from Abel Vesa to switch i.MX6 and i.MX7 clock drivers to
clk_hw based API
- Add GPIO, SNVS and GIC clocks for i.MX8 drivers
- Create a common function imx_mmdc_mask_handshake() for masking MMDC
handshake
- Drop __init for function imx_check_clocks() and imx_register_uart_clocks(),
so that they can be used by i.MX8 clock drivers which use driver model
- Use devm_platform_ioremap_resource() instead of of_iomap() for imx8mq
clock driver
- Mark imx6sx/ul/ull/sll MMDC_P1_IPG and imx8mm DRAM_APB as critical clock.
- Correct imx7ulp nic1_bus_clk and imx8mm audio_pll2_clk clock setting
* tag 'imx-clk-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (38 commits)
clk: imx8mq: Keep uart clocks on during system boot
clk: imx: Remove __init for imx_register_uart_clocks() API
clk: imx6q: fix section mismatch warning
clk: imx8mq: Use devm_platform_ioremap_resource() instead of of_iomap()
clk: imx8mq: Use imx_check_clocks() API directly
clk: imx: Remove __init for imx_check_clocks() API
clk: imx6sll: Switch to clk_hw based API
clk: imx7d: Switch to clk_hw based API
clk: imx6ul: Switch to clk_hw based API
clk: imx6sx: Switch to clk_hw based API
clk: imx6q: Switch to clk_hw based API
clk: imx6sl: Switch to clk_hw based API
clk: imx: Switch wrappers to clk_hw based API
clk: imx: clk-fixup-mux: Switch to clk_hw based API
clk: imx: clk-fixup-div: Switch to clk_hw based API
clk: imx: clk-gate-exclusive: Switch to clk_hw based API
clk: imx: clk-pfd: Switch to clk_hw based API
clk: imx: clk-pllv3: Switch to clk_hw based API
clk: imx: clk-gate2: Switch to clk_hw based API
clk: imx: clk-cpu: Switch to clk_hw based API
...
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/clock/imx8mm-clock.h | 11 | ||||
| -rw-r--r-- | include/dt-bindings/clock/imx8mq-clock.h | 5 |
2 files changed, 14 insertions, 2 deletions
diff --git a/include/dt-bindings/clock/imx8mm-clock.h b/include/dt-bindings/clock/imx8mm-clock.h index 1b4353e7b486..07e6c686f3ef 100644 --- a/include/dt-bindings/clock/imx8mm-clock.h +++ b/include/dt-bindings/clock/imx8mm-clock.h @@ -239,6 +239,15 @@ #define IMX8MM_CLK_NAND_USDHC_BUS_RAWNAND_CLK 222 -#define IMX8MM_CLK_END 223 +#define IMX8MM_CLK_GPIO1_ROOT 223 +#define IMX8MM_CLK_GPIO2_ROOT 224 +#define IMX8MM_CLK_GPIO3_ROOT 225 +#define IMX8MM_CLK_GPIO4_ROOT 226 +#define IMX8MM_CLK_GPIO5_ROOT 227 + +#define IMX8MM_CLK_SNVS_ROOT 228 +#define IMX8MM_CLK_GIC 229 + +#define IMX8MM_CLK_END 230 #endif diff --git a/include/dt-bindings/clock/imx8mq-clock.h b/include/dt-bindings/clock/imx8mq-clock.h index 6677e920dc2d..65463673d25e 100644 --- a/include/dt-bindings/clock/imx8mq-clock.h +++ b/include/dt-bindings/clock/imx8mq-clock.h @@ -400,5 +400,8 @@ #define IMX8MQ_CLK_GPIO4_ROOT 262 #define IMX8MQ_CLK_GPIO5_ROOT 263 -#define IMX8MQ_CLK_END 264 +#define IMX8MQ_CLK_SNVS_ROOT 264 +#define IMX8MQ_CLK_GIC 265 + +#define IMX8MQ_CLK_END 266 #endif /* __DT_BINDINGS_CLOCK_IMX8MQ_H */ |