clk: meson: g12a: Add the NNA source clocks
Subsystems (4)
cover clk: meson: g12a: Add the NNA source clocks
This patchset adds the Neural Network Accelerator source clocks present on the Amlogic SM1 SoCs family.
Dmitry Shmidt (2):
dt-bindings: clk: g12a-clkc: Add NNA CLK Source clock IDs
clk: meson: g12a: Add support for NNA CLK source clocks
drivers/clk/meson/g12a.c | 119 ++++++++++++++++++++++++++ drivers/clk/meson/g12a.h | 7 +- include/dt-bindings/clock/g12a-clkc.h | 2 + 3 files changed, 127 insertions(+), 1 deletion(-)
Signature · 1 line
2.22.0
PATCH 1/2 dt-bindings: clk: g12a-clkc: Add NNA CLK Source clock IDs
From: Dmitry Shmidt <[email protected]>
This adds the Neural Network Accelerator IP source clocks.
--- include/dt-bindings/clock/g12a-clkc.h | 2 ++ 1 file changed, 2 insertions(+)
include/dt-bindings/clock/g12a-clkc.h +2 -0
@@ -145,5 +145,7 @@#define CLKID_CPU3_CLK 255#define CLKID_SPICC0_SCLK 258#define CLKID_SPICC1_SCLK 261 +#define CLKID_NNA_AXI_CLK 264 +#define CLKID_NNA_CORE_CLK 267#endif /* __G12A_CLKC_H */
Signature · 1 line
2.22.0
Re: [PATCH 1/2] dt-bindings: clk: g12a-clkc: Add NNA CLK Source clock IDs
Quoted 10 lines · Neil Armstrong
From: Dmitry Shmidt <[email protected]>
This adds the Neural Network Accelerator IP source clocks.
Signed-off-by Dmitry Shmidt <[email protected]>Signed-off-by Neil Armstrong <[email protected]>--- include/dt-bindings/clock/g12a-clkc.h | 2 ++ 1 file changed, 2 insertions(+)
PATCH 2/2 clk: meson: g12a: Add support for NNA CLK source clocks
In reply to Neil ArmstrongFrom: Dmitry Shmidt <[email protected]>
This adds the Neural Network Accelerator source clocks hierarchy, it's 2 simple composite clocks to feed the AXI interface and the Core of the Neural Network Accelerator IP.
This IP is only present on the Amlogic SM1 SoCs family.
--- drivers/clk/meson/g12a.c | 119 +++++++++++++++++++++++++++++++++++++++ drivers/clk/meson/g12a.h | 7 ++- 2 files changed, 125 insertions(+), 1 deletion(-)
drivers/clk/meson/g12a.c +119 -0
@@ -3981,6 +3981,113 @@ static struct clk_regmap g12a_spicc1_sclk = { }, }; +/* Neural Network Accelerator source clock */ + +static const struct clk_parent_data nna_clk_parent_data[] = { + { .fw_name ="xtal" , }, + { .hw = &g12a_gp0_pll.hw, }, + { .hw = &g12a_hifi_pll.hw, }, + { .hw = &g12a_fclk_div2p5.hw, }, + { .hw = &g12a_fclk_div3.hw, }, + { .hw = &g12a_fclk_div4.hw, }, + { .hw = &g12a_fclk_div5.hw, }, + { .hw = &g12a_fclk_div7.hw }, +}; + +static struct clk_regmap sm1_nna_axi_clk_sel = { + .data = &(struct clk_regmap_mux_data ){ + .offset =HHI_NNA_CLK_CNTL , + .mask =7 , + .shift =9 , + }, + .hw.init = &(struct clk_init_data ){ + .name ="nna_axi_clk_sel" , + .ops = &clk_regmap_mux_ops, + .parent_data = nna_clk_parent_data, + .num_parents =ARRAY_SIZE (nna_clk_parent_data), + }, +}; + +static struct clk_regmap sm1_nna_axi_clk_div = { + .data = &(struct clk_regmap_div_data ){ + .offset =HHI_NNA_CLK_CNTL , + .shift =0 , + .width =7 , + }, + .hw.init = &(struct clk_init_data ){ + .name ="nna_axi_clk_div" , + .ops = &clk_regmap_divider_ops, + .parent_hws = (const struct clk_hw *[]) { + &sm1_nna_axi_clk_sel.hw + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + }, +}; + +static struct clk_regmap sm1_nna_axi_clk = { + .data = &(struct clk_regmap_gate_data ){ + .offset =HHI_NNA_CLK_CNTL , + .bit_idx =8 , + }, + .hw.init = &(struct clk_init_data ){ + .name ="nna_axi_clk" , + .ops = &clk_regmap_gate_ops, + .parent_hws = (const struct clk_hw *[]) { + &sm1_nna_axi_clk_div.hw + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + }, +}; + +static struct clk_regmap sm1_nna_core_clk_sel = { + .data = &(struct clk_regmap_mux_data ){ + .offset =HHI_NNA_CLK_CNTL , + .mask =7 , + .shift =25 , + }, + .hw.init = &(struct clk_init_data ){ + .name ="nna_core_clk_sel" , + .ops = &clk_regmap_mux_ops, + .parent_data = nna_clk_parent_data, + .num_parents =ARRAY_SIZE (nna_clk_parent_data), + }, +}; + +static struct clk_regmap sm1_nna_core_clk_div = { + .data = &(struct clk_regmap_div_data ){ + .offset =HHI_NNA_CLK_CNTL , + .shift =16 , + .width =7 , + }, + .hw.init = &(struct clk_init_data ){ + .name ="nna_core_clk_div" , + .ops = &clk_regmap_divider_ops, + .parent_hws = (const struct clk_hw *[]) { + &sm1_nna_core_clk_sel.hw + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + }, +}; + +static struct clk_regmap sm1_nna_core_clk = { + .data = &(struct clk_regmap_gate_data ){ + .offset =HHI_NNA_CLK_CNTL , + .bit_idx =24 , + }, + .hw.init = &(struct clk_init_data ){ + .name ="nna_core_clk" , + .ops = &clk_regmap_gate_ops, + .parent_hws = (const struct clk_hw *[]) { + &sm1_nna_core_clk_div.hw + }, + .num_parents =1 , + .flags =CLK_SET_RATE_PARENT , + }, +}; +#define MESON_GATE (_name, _reg, _bit) \ MESON_PCLK(_name, _reg, _bit, &g12a_clk81.hw)
@@ -4779,6 +4886,12 @@ static struct clk_hw_onecell_data sm1_hw_onecell_data = { [CLKID_SPICC1_SCLK_SEL] = &g12a_spicc1_sclk_sel.hw, [CLKID_SPICC1_SCLK_DIV] = &g12a_spicc1_sclk_div.hw, [CLKID_SPICC1_SCLK] = &g12a_spicc1_sclk.hw, + [CLKID_NNA_AXI_CLK_SEL] = &sm1_nna_axi_clk_sel.hw, + [CLKID_NNA_AXI_CLK_DIV] = &sm1_nna_axi_clk_div.hw, + [CLKID_NNA_AXI_CLK] = &sm1_nna_axi_clk.hw, + [CLKID_NNA_CORE_CLK_SEL] = &sm1_nna_core_clk_sel.hw, + [CLKID_NNA_CORE_CLK_DIV] = &sm1_nna_core_clk_div.hw, + [CLKID_NNA_CORE_CLK] = &sm1_nna_core_clk.hw, [NR_CLKS ] =NULL , }, .num = NR_CLKS,
@@ -5020,6 +5133,12 @@ static struct clk_regmap *const g12a_clk_regmaps[] = { &g12a_spicc1_sclk_sel, &g12a_spicc1_sclk_div, &g12a_spicc1_sclk, + &sm1_nna_axi_clk_sel, + &sm1_nna_axi_clk_div, + &sm1_nna_axi_clk, + &sm1_nna_core_clk_sel, + &sm1_nna_core_clk_div, + &sm1_nna_core_clk, }; static const struct reg_sequence g12a_init_regs[] = {
drivers/clk/meson/g12a.h +6 -1
@@ -70,6 +70,7 @@#define HHI_MALI_CLK_CNTL 0x1b0#define HHI_VPU_CLKC_CNTL 0x1b4#define HHI_VPU_CLK_CNTL 0x1bC +#define HHI_NNA_CLK_CNTL 0x1C8#define HHI_HDMI_CLK_CNTL 0x1CC#define HHI_VDEC_CLK_CNTL 0x1E0#define HHI_VDEC2_CLK_CNTL 0x1E4
@@ -259,8 +260,12 @@#define CLKID_SPICC0_SCLK_DIV 257#define CLKID_SPICC1_SCLK_SEL 259#define CLKID_SPICC1_SCLK_DIV 260 +#define CLKID_NNA_AXI_CLK_SEL 262 +#define CLKID_NNA_AXI_CLK_DIV 263 +#define CLKID_NNA_CORE_CLK_SEL 265 +#define CLKID_NNA_CORE_CLK_DIV 266 -#define NR_CLKS 262 +#define NR_CLKS 268/* include the CLKIDs that have been made part of the DT binding */ #include <dt-bindings/clock/g12a-clkc.h>
Signature · 1 line
2.22.0
Quoted 11 lines · Neil Armstrong
This patchset adds the Neural Network Accelerator source clocks present on the Amlogic SM1 SoCs family.
Dmitry Shmidt (2):
dt-bindings: clk: g12a-clkc: Add NNA CLK Source clock IDs
clk: meson: g12a: Add support for NNA CLK source clocksdrivers/clk/meson/g12a.c | 119 ++++++++++++++++++++++++++ drivers/clk/meson/g12a.h | 7 +- include/dt-bindings/clock/g12a-clkc.h | 2 + 3 files changed, 127 insertions(+), 1 deletion(-)
Applied, Thx
This series was applied to khilman/linux-amlogic.git (refs/heads/for-next).
Hello:
This series was applied to khilman/linux-amlogic.git (refs/heads/for-next).
Quoted 8 lines · On Wed, 10 Jun 2020 10:30:10 +0200 you wrote:
This patchset adds the Neural Network Accelerator source clocks present on the Amlogic SM1 SoCs family.
Dmitry Shmidt (2):
dt-bindings: clk: g12a-clkc: Add NNA CLK Source clock IDs
clk: meson: g12a: Add support for NNA CLK source clocks[...]
Here is a summary with links:
- [1/2] dt-bindings: clk: g12a-clkc: Add NNA CLK Source clock IDs
https://git.kernel.org/khilman/linux-amlogic/c/df06230106e95347ec613f1707a704b04737c59b - [2/2] clk: meson: g12a: Add support for NNA CLK source clocks https://git.kernel.org/khilman/linux-amlogic/c/2f1efa5340eff9af36c9a7347bb97abd726128a0
You are awesome, thank you!
Signature · 7 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/pwbot _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic