diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2016-11-29 10:40:24 -0800 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-02-09 22:45:42 +0100 |
| commit | 229b8b5d898d4a9d7c3e14a1057f4cb70948472f (patch) | |
| tree | 017d951a87aa2d00c2aab8177574e35b13374dff | |
| parent | 6c94f6356286aad3b02061917db112f37bd19cca (diff) | |
ARM: imx7d: clk: add root clock for keypad port
The keypad port (KPP) module is clocked by the IPG root clock
through clock gate CCM_CCGR170.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
(cherry picked from commit 7b51b6365ebcf65b1054337a5bb0e1879397aae6)
(cherry picked from commit 09c36fb13aa73bac59709c5805f5f9f9e45acee9)
Conflicts:
include/dt-bindings/clock/imx7d-clock.h
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
| -rw-r--r-- | drivers/clk/imx/clk-imx7d.c | 1 | ||||
| -rw-r--r-- | include/dt-bindings/clock/imx7d-clock.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/clk/imx/clk-imx7d.c b/drivers/clk/imx/clk-imx7d.c index cc3cf03c993c..14ac94a1e94e 100644 --- a/drivers/clk/imx/clk-imx7d.c +++ b/drivers/clk/imx/clk-imx7d.c @@ -873,6 +873,7 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node) clks[IMX7D_ADC_ROOT_CLK] = imx_clk_gate4("adc_root_clk", "ipg_root_clk", base + 0x4200, 0); clks[IMX7D_PXP_IPG_CLK] = imx_clk_gate2_shared2("pxp_ipg_clk", "ipg_root_clk", base + 0x44c0, 0, &share_count_pxp); clks[IMX7D_PXP_AXI_CLK] = imx_clk_gate2_shared2("pxp_axi_clk", "main_axi_root_clk", base + 0x44c0, 0, &share_count_pxp); + clks[IMX7D_KPP_ROOT_CLK] = imx_clk_gate4("kpp_root_clk", "ipg_root_clk", base + 0x4aa0, 0); clks[IMX7D_GPT_3M_CLK] = imx_clk_fixed_factor("gpt_3m", "osc", 1, 8); diff --git a/include/dt-bindings/clock/imx7d-clock.h b/include/dt-bindings/clock/imx7d-clock.h index 6b5d908d303e..31223c693da9 100644 --- a/include/dt-bindings/clock/imx7d-clock.h +++ b/include/dt-bindings/clock/imx7d-clock.h @@ -458,6 +458,7 @@ #define IMX7D_PXP_AXI_CLK 444 #define IMX7D_ENET1_IPG_ROOT_CLK 445 #define IMX7D_ENET2_IPG_ROOT_CLK 446 -#define IMX7D_CLK_END 447 +#define IMX7D_KPP_ROOT_CLK 447 +#define IMX7D_CLK_END 448 #endif /* __DT_BINDINGS_CLOCK_IMX7D_H */ |