arm: mach-k3: Fixes for j721e/j7200 clock data and drivers
Subsystems (4)
cover arm: mach-k3: Fixes for j721e/j7200 clock data and drivers
Hi,
This series contains several fixes for TI j721e and j7200 platforms data and also some fixes for TI clock drivers that make use of this data.
All fixes are related to PLL post dividers reporting the wrong frequency, and now the new frequencies for below clocks match what registers are actually configured for.
Clock: Old Frequency -> New Frequency
-----------------------------------------postdiv2_16fft_main_0_hsdivout6_clk: 66666667 -> 200000000 postdiv2_16fft_main_1_hsdivout5_clk: 320000000 -> 960000000 postdiv2_16fft_main_1_hsdivout7_clk: 320000000 -> 960000000
Regards,
Dave
Dave Gerlach (2):
arm: mach-k3: Add note to auto-generated files
clk: ti: k3-pll: Change DIV_CTRL programming to read-modify-write
Suman Anna (3):
arm: mach-k3: j721e: Fix clk-data parenting for postdiv PLL clocks
arm: mach-k3: j7200: Fix clk-data parenting for postdiv PLL clocks
clk: ti: k3: Update driver to account for divider flags
arch/arm/mach-k3/j7200/clk-data.c | 87 ++++++++++++----------- arch/arm/mach-k3/j7200/dev-data.c | 2 + arch/arm/mach-k3/j721e/clk-data.c | 113 +++++++++++++++--------------- arch/arm/mach-k3/j721e/dev-data.c | 2 + drivers/clk/ti/clk-k3-pll.c | 13 +++- drivers/clk/ti/clk-k3.c | 4 +- include/k3-clk.h | 30 ++++---- 7 files changed, 137 insertions(+), 114 deletions(-)
Signature · 1 line
2.28.0
PATCH 1/5 arm: mach-k3: j721e: Fix clk-data parenting for postdiv PLL clocks
From: Suman Anna <[email protected]>
The TI K3 Fractional PLLs use two programmable POSTDIV1 and POSTDIV2 divisors to generate the final FOUTPOSTDIV clock. These are in sequence with POSTDIV2 following the POSTDIV1 clock. The current J721E clock data has the POSTDIV2 clock as the parent for the POSTDIV1 clock, which is opposite of the actual implementation. Fix the data by simply adjusting the register bit-shifts.
The Main PLL1 POSTDIV clocks were also defined incorrectly using Main PLL0 register values, fix these as well.
--- arch/arm/mach-k3/j721e/clk-data.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/mach-k3/j721e/clk-data.c +4 -4
@@ -463,8 +463,8 @@ static const struct clk_data clk_list[] = {CLK_MUX ("wkup_fref_clksel_out0" , wkup_fref_clksel_out0_parents,2 ,0x43008050 ,8 ,1 ,0 ),CLK_MUX ("main_pll_hfosc_sel_out1" , main_pll_hfosc_sel_out1_parents,2 ,0x43008084 ,0 ,1 ,0 ),CLK_PLL_DEFFREQ ("pllfrac2_ssmod_16fft_main_1_foutvcop_clk" ,"main_pll_hfosc_sel_out1" ,0x681000 ,0 ,1920000000 ), -CLK_DIV ("pllfrac2_ssmod_16fft_main_1_foutpostdiv_clk_subdiv" ,"pllfrac2_ssmod_16fft_main_1_foutvcop_clk" ,0x680038 ,24 ,3 ,0 ), -CLK_DIV ("pllfrac2_ssmod_16fft_main_1_foutpostdiv_clk" ,"pllfrac2_ssmod_16fft_main_1_foutpostdiv_clk_subdiv" ,0x680038 ,16 ,3 ,0 ), +CLK_DIV ("pllfrac2_ssmod_16fft_main_1_foutpostdiv_clk_subdiv" ,"pllfrac2_ssmod_16fft_main_1_foutvcop_clk" ,0x681038 ,16 ,3 ,0 ), +CLK_DIV ("pllfrac2_ssmod_16fft_main_1_foutpostdiv_clk" ,"pllfrac2_ssmod_16fft_main_1_foutpostdiv_clk_subdiv" ,0x681038 ,24 ,3 ,0 ),CLK_PLL ("pllfrac2_ssmod_16fft_mcu_0_foutvcop_clk" ,"wkup_fref_clksel_out0" ,0x40d00000 ,0 ),CLK_PLL_DEFFREQ ("pllfrac2_ssmod_16fft_mcu_1_foutvcop_clk" ,"wkup_fref_clksel_out0" ,0x40d01000 ,0 ,2400000000 ), CLK_PLL_DEFFREQ("pllfrac2_ssmod_16fft_mcu_2_foutvcop_clk", "wkup_fref_clksel_out0", 0x40d02000, 0, 2000000000),
@@ -523,8 +523,8 @@ static const struct clk_data clk_list[] = {CLK_DIV ("hsdiv4_16fft_mcu_2_hsdivout3_clk" ,"pllfrac2_ssmod_16fft_mcu_2_foutvcop_clk" ,0x40d0208c ,0 ,7 ,0 ),CLK_FIXED_RATE ("j7_wakeup_16ff_wkup_0_wkup_rcosc_32k_clk" ,32000 ,0 ),CLK_PLL ("pllfrac2_ssmod_16fft_main_0_foutvcop_clk" ,"main_pll_hfosc_sel_out0" ,0x680000 ,0 ), -CLK_DIV ("pllfrac2_ssmod_16fft_main_0_foutpostdiv_clk_subdiv" ,"pllfrac2_ssmod_16fft_main_0_foutvcop_clk" ,0x680038 ,24 ,3 ,0 ), -CLK_DIV ("pllfrac2_ssmod_16fft_main_0_foutpostdiv_clk" ,"pllfrac2_ssmod_16fft_main_0_foutpostdiv_clk_subdiv" ,0x680038 ,16 ,3 ,0 ), +CLK_DIV ("pllfrac2_ssmod_16fft_main_0_foutpostdiv_clk_subdiv" ,"pllfrac2_ssmod_16fft_main_0_foutvcop_clk" ,0x680038 ,16 ,3 ,0 ), +CLK_DIV ("pllfrac2_ssmod_16fft_main_0_foutpostdiv_clk" ,"pllfrac2_ssmod_16fft_main_0_foutpostdiv_clk_subdiv" ,0x680038 ,24 ,3 ,0 ),CLK_PLL ("pllfrac2_ssmod_16fft_main_13_foutvcop_clk" ,"main_pll_hfosc_sel_out13" ,0x68d000 ,0 ),CLK_PLL ("pllfrac2_ssmod_16fft_main_14_foutvcop_clk" ,"main_pll_hfosc_sel_out14" ,0x68e000 ,0 ), CLK_PLL("pllfrac2_ssmod_16fft_main_16_foutvcop_clk", "main_pll_hfosc_sel_out16", 0x690000, 0),
Signature · 1 line
2.28.0
PATCH 2/5 arm: mach-k3: j7200: Fix clk-data parenting for postdiv PLL clocks
In reply to Dave GerlachFrom: Suman Anna <[email protected]>
The TI K3 Fractional PLLs use two programmable POSTDIV1 and POSTDIV2 divisors to generate the final FOUTPOSTDIV clock. These are in sequence with POSTDIV2 following the POSTDIV1 clock. The current J7200 clock data has the POSTDIV2 clock as the parent for the POSTDIV1 clock, which is opposite of the actual implementation. Fix the data by simply adjusting the register bit-shifts.
The Main PLL1 POSTDIV clocks were also defined incorrectly using Main PLL0 register values, fix these as well.
--- arch/arm/mach-k3/j7200/clk-data.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/mach-k3/j7200/clk-data.c +4 -4
@@ -319,8 +319,8 @@ static const struct clk_data clk_list[] = {CLK_MUX ("wkup_fref_clksel_out0" , wkup_fref_clksel_out0_parents,2 ,0x43008050 ,8 ,1 ,0 ),CLK_MUX ("main_pll_hfosc_sel_out1" , main_pll_hfosc_sel_out1_parents,2 ,0x43008084 ,0 ,1 ,0 ),CLK_PLL_DEFFREQ ("pllfracf_ssmod_16fft_main_1_foutvcop_clk" ,"main_pll_hfosc_sel_out1" ,0x681000 ,0 ,1920000000 ), -CLK_DIV ("pllfracf_ssmod_16fft_main_1_foutpostdiv_clk_subdiv" ,"pllfracf_ssmod_16fft_main_1_foutvcop_clk" ,0x680038 ,24 ,3 ,0 ), -CLK_DIV ("pllfracf_ssmod_16fft_main_1_foutpostdiv_clk" ,"pllfracf_ssmod_16fft_main_1_foutpostdiv_clk_subdiv" ,0x680038 ,16 ,3 ,0 ), +CLK_DIV ("pllfracf_ssmod_16fft_main_1_foutpostdiv_clk_subdiv" ,"pllfracf_ssmod_16fft_main_1_foutvcop_clk" ,0x681038 ,16 ,3 ,0 ), +CLK_DIV ("pllfracf_ssmod_16fft_main_1_foutpostdiv_clk" ,"pllfracf_ssmod_16fft_main_1_foutpostdiv_clk_subdiv" ,0x681038 ,24 ,3 ,0 ),CLK_PLL ("pllfracf_ssmod_16fft_mcu_0_foutvcop_clk" ,"wkup_fref_clksel_out0" ,0x40d00000 ,0 ),CLK_PLL_DEFFREQ ("pllfracf_ssmod_16fft_mcu_1_foutvcop_clk" ,"wkup_fref_clksel_out0" ,0x40d01000 ,0 ,2400000000 ), CLK_PLL_DEFFREQ("pllfracf_ssmod_16fft_mcu_2_foutvcop_clk", "wkup_fref_clksel_out0", 0x40d02000, 0, 2000000000),
@@ -360,8 +360,8 @@ static const struct clk_data clk_list[] = {CLK_DIV ("hsdiv4_16fft_mcu_2_hsdivout2_clk" ,"pllfracf_ssmod_16fft_mcu_2_foutvcop_clk" ,0x40d02088 ,0 ,7 ,0 ),CLK_DIV ("hsdiv4_16fft_mcu_2_hsdivout3_clk" ,"pllfracf_ssmod_16fft_mcu_2_foutvcop_clk" ,0x40d0208c ,0 ,7 ,0 ),CLK_PLL ("pllfracf_ssmod_16fft_main_0_foutvcop_clk" ,"main_pll_hfosc_sel_out0" ,0x680000 ,0 ), -CLK_DIV ("pllfracf_ssmod_16fft_main_0_foutpostdiv_clk_subdiv" ,"pllfracf_ssmod_16fft_main_0_foutvcop_clk" ,0x680038 ,24 ,3 ,0 ), -CLK_DIV ("pllfracf_ssmod_16fft_main_0_foutpostdiv_clk" ,"pllfracf_ssmod_16fft_main_0_foutpostdiv_clk_subdiv" ,0x680038 ,16 ,3 ,0 ), +CLK_DIV ("pllfracf_ssmod_16fft_main_0_foutpostdiv_clk_subdiv" ,"pllfracf_ssmod_16fft_main_0_foutvcop_clk" ,0x680038 ,16 ,3 ,0 ), +CLK_DIV ("pllfracf_ssmod_16fft_main_0_foutpostdiv_clk" ,"pllfracf_ssmod_16fft_main_0_foutpostdiv_clk_subdiv" ,0x680038 ,24 ,3 ,0 ),CLK_PLL ("pllfracf_ssmod_16fft_main_12_foutvcop_clk" ,"main_pll_hfosc_sel_out12" ,0x68c000 ,0 ),CLK_PLL ("pllfracf_ssmod_16fft_main_14_foutvcop_clk" ,"main_pll_hfosc_sel_out14" ,0x68e000 ,0 ), CLK_PLL("pllfracf_ssmod_16fft_main_2_foutvcop_clk", "main_pll_hfosc_sel_out2", 0x682000, 0),
Signature · 1 line
2.28.0
PATCH 3/5 arm: mach-k3: Add note to auto-generated files
In reply to Dave GerlachAdd a note to the automatically generated clk-data and dev-data files for j721e and j7200 to indicate that they are in fact auto-generated and should not be hand edited.
--- arch/arm/mach-k3/j7200/clk-data.c | 2 ++ arch/arm/mach-k3/j7200/dev-data.c | 2 ++ arch/arm/mach-k3/j721e/clk-data.c | 2 ++ arch/arm/mach-k3/j721e/dev-data.c | 2 ++ 4 files changed, 8 insertions(+)
arch/arm/mach-k3/j7200/clk-data.c +2 -0
@@ -2,6 +2,8 @@/* * J7200 specific clock platform data * +* This file is auto generated. Please do not edit directly. +* * Copyright (C) 2020-2021 Texas Instruments Incorporated - http://www.ti.com/ */ #include "k3-clk.h"
arch/arm/mach-k3/j7200/dev-data.c +2 -0
@@ -2,6 +2,8 @@/* * J7200 specific device platform data * +* This file is auto generated. Please do not edit directly. +* * Copyright (C) 2020-2021 Texas Instruments Incorporated - http://www.ti.com/ */ #include "k3-dev.h"
arch/arm/mach-k3/j721e/clk-data.c +2 -0
@@ -2,6 +2,8 @@/* * J721E specific clock platform data * +* This file is auto generated. Please do not edit directly. +* * Copyright (C) 2020-2021 Texas Instruments Incorporated - http://www.ti.com/ */ #include "k3-clk.h"
arch/arm/mach-k3/j721e/dev-data.c +2 -0
@@ -2,6 +2,8 @@/* * J721E specific device platform data * +* This file is auto generated. Please do not edit directly. +* * Copyright (C) 2020-2021 Texas Instruments Incorporated - http://www.ti.com/ */ #include "k3-dev.h"
Signature · 1 line
2.28.0
Re: [PATCH 3/5] arm: mach-k3: Add note to auto-generated files
Quoted 5 lines · Dave Gerlach
Add a note to the automatically generated clk-data and dev-data files for j721e and j7200 to indicate that they are in fact auto-generated and should not be hand edited.
Signed-off-by Dave Gerlach <[email protected]>
Are there any guidelines/README to do this autogeneration?
Thanks and regards,
Lokesh
Quoted 60 lines
--- arch/arm/mach-k3/j7200/clk-data.c | 2 ++ arch/arm/mach-k3/j7200/dev-data.c | 2 ++ arch/arm/mach-k3/j721e/clk-data.c | 2 ++ arch/arm/mach-k3/j721e/dev-data.c | 2 ++ 4 files changed, 8 insertions(+)arch/arm/mach-k3/j7200/clk-data.c +2
-0@@ -2,6 +2,8 @@/* * J7200 specific clock platform data * +* This file is auto generated. Please do not edit directly. +* * Copyright (C) 2020-2021 Texas Instruments Incorporated - http://www.ti.com/ */ #include "k3-clk.h" arch/arm/mach-k3/j7200/dev-data.c +2
-0@@ -2,6 +2,8 @@/* * J7200 specific device platform data * +* This file is auto generated. Please do not edit directly. +* * Copyright (C) 2020-2021 Texas Instruments Incorporated - http://www.ti.com/ */ #include "k3-dev.h" arch/arm/mach-k3/j721e/clk-data.c +2
-0@@ -2,6 +2,8 @@/* * J721E specific clock platform data * +* This file is auto generated. Please do not edit directly. +* * Copyright (C) 2020-2021 Texas Instruments Incorporated - http://www.ti.com/ */ #include "k3-clk.h" arch/arm/mach-k3/j721e/dev-data.c +2
-0@@ -2,6 +2,8 @@/* * J721E specific device platform data * +* This file is auto generated. Please do not edit directly. +* * Copyright (C) 2020-2021 Texas Instruments Incorporated - http://www.ti.com/ */ #include "k3-dev.h"
Re: [PATCH 3/5] arm: mach-k3: Add note to auto-generated files
Hi,
Quoted 11 lines · Lokesh Vutla
Quoted 5 lines · Dave Gerlach
Add a note to the automatically generated clk-data and dev-data files for j721e and j7200 to indicate that they are in fact auto-generated and should not be hand edited.
Signed-off-by Dave Gerlach <[email protected]>Are there any guidelines/README to do this autogeneration?
Currently there is not.
Regards,
Dave
Quoted 63 lines
Thanks and regards,
LokeshQuoted 60 lines
--- arch/arm/mach-k3/j7200/clk-data.c | 2 ++ arch/arm/mach-k3/j7200/dev-data.c | 2 ++ arch/arm/mach-k3/j721e/clk-data.c | 2 ++ arch/arm/mach-k3/j721e/dev-data.c | 2 ++ 4 files changed, 8 insertions(+)arch/arm/mach-k3/j7200/clk-data.c +2
-0@@ -2,6 +2,8 @@/* * J7200 specific clock platform data * +* This file is auto generated. Please do not edit directly. +* * Copyright (C) 2020-2021 Texas Instruments Incorporated - http://www.ti.com/ */ #include "k3-clk.h" arch/arm/mach-k3/j7200/dev-data.c +2
-0@@ -2,6 +2,8 @@/* * J7200 specific device platform data * +* This file is auto generated. Please do not edit directly. +* * Copyright (C) 2020-2021 Texas Instruments Incorporated - http://www.ti.com/ */ #include "k3-dev.h" arch/arm/mach-k3/j721e/clk-data.c +2
-0@@ -2,6 +2,8 @@/* * J721E specific clock platform data * +* This file is auto generated. Please do not edit directly. +* * Copyright (C) 2020-2021 Texas Instruments Incorporated - http://www.ti.com/ */ #include "k3-clk.h" arch/arm/mach-k3/j721e/dev-data.c +2
-0@@ -2,6 +2,8 @@/* * J721E specific device platform data * +* This file is auto generated. Please do not edit directly. +* * Copyright (C) 2020-2021 Texas Instruments Incorporated - http://www.ti.com/ */ #include "k3-dev.h"
Re: [PATCH 3/5] arm: mach-k3: Add note to auto-generated files
In reply to Lokesh VutlaHi Dave,
Quoted 10 lines · Lokesh Vutla
Quoted 5 lines · Dave Gerlach
Add a note to the automatically generated clk-data and dev-data files for j721e and j7200 to indicate that they are in fact auto-generated and should not be hand edited.
Signed-off-by Dave Gerlach <[email protected]>Are there any guidelines/README to do this autogeneration?
And if these are not going to be public, I suggest you rephrase the below sentence to something like
"This file is auto generated. Please report any issues to <contact>".
Quoted 11 lines
Thanks and regards,
LokeshQuoted 7 lines
--- arch/arm/mach-k3/j7200/clk-data.c | 2 ++ arch/arm/mach-k3/j7200/dev-data.c | 2 ++ arch/arm/mach-k3/j721e/clk-data.c | 2 ++ arch/arm/mach-k3/j721e/dev-data.c | 2 ++ 4 files changed, 8 insertions(+)
Quoted 11 lines
arch/arm/mach-k3/j7200/clk-data.c line 7
Quoted 11 lines
arch/arm/mach-k3/j7200/clk-data.c +2
-0@@ -2,6 +2,8 @@/* * J7200 specific clock platform data * +* This file is auto generated. Please do not edit directly. +* * Copyright (C) 2020-2021 Texas Instruments Incorporated - http://www.ti.com/
Btw, while you are at this, can we get all of these links to be updated to use
https://
Quoted 1 line
arch/arm/mach-k3/j7200/clk-data.c line 8
Quoted 1 line
arch/arm/mach-k3/j7200/clk-data.c +0
-0*/
I also prefer a blank line between the license comments and the first header inclusion.
regards
Suman
Quoted 41 lines
Quoted 41 lines
arch/arm/mach-k3/j7200/clk-data.c +0
-0#include "k3-clk.h" arch/arm/mach-k3/j7200/dev-data.c +2
-0@@ -2,6 +2,8 @@/* * J7200 specific device platform data * +* This file is auto generated. Please do not edit directly. +* * Copyright (C) 2020-2021 Texas Instruments Incorporated - http://www.ti.com/ */ #include "k3-dev.h" arch/arm/mach-k3/j721e/clk-data.c +2
-0@@ -2,6 +2,8 @@/* * J721E specific clock platform data * +* This file is auto generated. Please do not edit directly. +* * Copyright (C) 2020-2021 Texas Instruments Incorporated - http://www.ti.com/ */ #include "k3-clk.h" arch/arm/mach-k3/j721e/dev-data.c +2
-0@@ -2,6 +2,8 @@/* * J721E specific device platform data * +* This file is auto generated. Please do not edit directly. +* * Copyright (C) 2020-2021 Texas Instruments Incorporated - http://www.ti.com/ */ #include "k3-dev.h"
PATCH 4/5 clk: ti: k3-pll: Change DIV_CTRL programming to read-modify-write
In reply to Dave GerlachThere are three different divider values in the DIV_CTRL register controlled by the k3-pll driver. Currently the ti_pll_clk_set_rate function writes the entire register when programming plld, even though plld only resides in the lower 6 bits.
Change the plld programming to read-modify-write to only affect the relevant bits for plld and to preserve the other two divider values present in the upper 16 bits, otherwise they will always get set to zero when programming plld.
--- drivers/clk/ti/clk-k3-pll.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/clk/ti/clk-k3-pll.c +11 -2
@@ -2,7 +2,7 @@/* * Texas Instruments K3 SoC PLL clock driver * -* Copyright (C) 2020 Texas Instruments Incorporated - http://www.ti.com/ +* Copyright (C) 2020-2021 Texas Instruments Incorporated - http://www.ti.com/ * Tero Kristo <[email protected]> */
@@ -122,6 +122,7 @@ static ulong ti_pll_clk_set_rate(struct clk *clk, ulong rate)unsigned long pllm;u32 pllfm =0 ;unsigned long plld; +u32 div_ctrl;u32 rem;int shift;
@@ -175,7 +176,15 @@ static ulong ti_pll_clk_set_rate(struct clk *clk, ulong rate)writel (pllm, pll->reg +PLL_16FFT_FREQ_CTRL0 );writel (pllfm, pll->reg +PLL_16FFT_FREQ_CTRL1 ); -writel (plld, pll->reg +PLL_16FFT_DIV_CTRL ); + +/* +* div_ctrl register contains other divider values, so rmw +* only plld and leave existing values alone +*/ + div_ctrl =readl (pll->reg +PLL_16FFT_DIV_CTRL ); + div_ctrl &= ~PLL_16FFT_DIV_CTRL_REF_DIV_MASK ; + div_ctrl |= plld; +writel (div_ctrl, pll->reg +PLL_16FFT_DIV_CTRL ); ctrl &= ~PLL_16FFT_CTRL_BYPASS_EN ; ctrl |=PLL_16FFT_CTRL_PLL_EN ;
Signature · 1 line
2.28.0
PATCH 5/5 clk: ti: k3: Update driver to account for divider flags
In reply to Dave GerlachFrom: Suman Anna <[email protected]>
The K3 SoCs have some PLL output clocks (POSTDIV clocks) which in turn serve as inputs to other HSDIV output clocks. These clocks use the actual value to compute the divider clock rate, and need to be registered with the CLK_DIVIDER_ONE_BASED flags. The current k3-clk driver and data lacks the infrastructure to pass in divider flags. Update the driver and data to account for these divider flags.
--- arch/arm/mach-k3/j7200/clk-data.c | 85 ++++++++++++----------- arch/arm/mach-k3/j721e/clk-data.c | 111 +++++++++++++++--------------- drivers/clk/ti/clk-k3.c | 4 +- include/k3-clk.h | 30 ++++---- 4 files changed, 118 insertions(+), 112 deletions(-)
arch/arm/mach-k3/j7200/clk-data.c +43 -42
@@ -6,6 +6,7 @@* * Copyright (C) 2020-2021 Texas Instruments Incorporated - http://www.ti.com/ */ +#include <linux/clk-provider.h> #include "k3-clk.h" static const char *const gluelogic_hfosc0_clkout_parents[] = {
@@ -321,18 +322,18 @@ static const struct clk_data clk_list[] = {CLK_MUX ("wkup_fref_clksel_out0" , wkup_fref_clksel_out0_parents,2 ,0x43008050 ,8 ,1 ,0 ),CLK_MUX ("main_pll_hfosc_sel_out1" , main_pll_hfosc_sel_out1_parents,2 ,0x43008084 ,0 ,1 ,0 ),CLK_PLL_DEFFREQ ("pllfracf_ssmod_16fft_main_1_foutvcop_clk" ,"main_pll_hfosc_sel_out1" ,0x681000 ,0 ,1920000000 ), -CLK_DIV ("pllfracf_ssmod_16fft_main_1_foutpostdiv_clk_subdiv" ,"pllfracf_ssmod_16fft_main_1_foutvcop_clk" ,0x681038 ,16 ,3 ,0 ), -CLK_DIV ("pllfracf_ssmod_16fft_main_1_foutpostdiv_clk" ,"pllfracf_ssmod_16fft_main_1_foutpostdiv_clk_subdiv" ,0x681038 ,24 ,3 ,0 ), +CLK_DIV ("pllfracf_ssmod_16fft_main_1_foutpostdiv_clk_subdiv" ,"pllfracf_ssmod_16fft_main_1_foutvcop_clk" ,0x681038 ,16 ,3 ,0 ,CLK_DIVIDER_ONE_BASED ), +CLK_DIV ("pllfracf_ssmod_16fft_main_1_foutpostdiv_clk" ,"pllfracf_ssmod_16fft_main_1_foutpostdiv_clk_subdiv" ,0x681038 ,24 ,3 ,0 ,CLK_DIVIDER_ONE_BASED ),CLK_PLL ("pllfracf_ssmod_16fft_mcu_0_foutvcop_clk" ,"wkup_fref_clksel_out0" ,0x40d00000 ,0 ),CLK_PLL_DEFFREQ ("pllfracf_ssmod_16fft_mcu_1_foutvcop_clk" ,"wkup_fref_clksel_out0" ,0x40d01000 ,0 ,2400000000 ),CLK_PLL_DEFFREQ ("pllfracf_ssmod_16fft_mcu_2_foutvcop_clk" ,"wkup_fref_clksel_out0" ,0x40d02000 ,0 ,2000000000 ), -CLK_DIV ("postdiv2_16fft_main_1_hsdivout5_clk" ,"pllfracf_ssmod_16fft_main_1_foutpostdiv_clk" ,0x681094 ,0 ,7 ,0 ), -CLK_DIV ("hsdiv1_16fft_mcu_0_hsdivout0_clk" ,"pllfracf_ssmod_16fft_mcu_0_foutvcop_clk" ,0x40d00080 ,0 ,7 ,0 ), -CLK_DIV ("hsdiv4_16fft_mcu_1_hsdivout3_clk" ,"pllfracf_ssmod_16fft_mcu_1_foutvcop_clk" ,0x40d0108c ,0 ,7 ,0 ), -CLK_DIV ("hsdiv4_16fft_mcu_1_hsdivout4_clk" ,"pllfracf_ssmod_16fft_mcu_1_foutvcop_clk" ,0x40d01090 ,0 ,7 ,0 ), -CLK_DIV_DEFFREQ ("hsdiv4_16fft_mcu_2_hsdivout4_clk" ,"pllfracf_ssmod_16fft_mcu_2_foutvcop_clk" ,0x40d02090 ,0 ,7 ,0 ,166666666 ), +CLK_DIV ("postdiv2_16fft_main_1_hsdivout5_clk" ,"pllfracf_ssmod_16fft_main_1_foutpostdiv_clk" ,0x681094 ,0 ,7 ,0 ,0 ), +CLK_DIV ("hsdiv1_16fft_mcu_0_hsdivout0_clk" ,"pllfracf_ssmod_16fft_mcu_0_foutvcop_clk" ,0x40d00080 ,0 ,7 ,0 ,0 ), +CLK_DIV ("hsdiv4_16fft_mcu_1_hsdivout3_clk" ,"pllfracf_ssmod_16fft_mcu_1_foutvcop_clk" ,0x40d0108c ,0 ,7 ,0 ,0 ), +CLK_DIV ("hsdiv4_16fft_mcu_1_hsdivout4_clk" ,"pllfracf_ssmod_16fft_mcu_1_foutvcop_clk" ,0x40d01090 ,0 ,7 ,0 ,0 ), +CLK_DIV_DEFFREQ ("hsdiv4_16fft_mcu_2_hsdivout4_clk" ,"pllfracf_ssmod_16fft_mcu_2_foutvcop_clk" ,0x40d02090 ,0 ,7 ,0 ,0 ,166666666 ),CLK_MUX_PLLCTRL ("k3_pll_ctrl_wrap_wkup_0_sysclkout_clk" , k3_pll_ctrl_wrap_wkup_0_sysclkout_clk_parents,2 ,0x42010000 ,0 ), -CLK_DIV ("k3_pll_ctrl_wrap_wkup_0_chip_div1_clk_clk" ,"k3_pll_ctrl_wrap_wkup_0_sysclkout_clk" ,0x42010118 ,0 ,5 ,0 ), +CLK_DIV ("k3_pll_ctrl_wrap_wkup_0_chip_div1_clk_clk" ,"k3_pll_ctrl_wrap_wkup_0_sysclkout_clk" ,0x42010118 ,0 ,5 ,0 ,0 ),CLK_MUX ("mcu_ospi_ref_clk_sel_out0" , mcu_ospi_ref_clk_sel_out0_parents,2 ,0x40f08030 ,0 ,1 ,0 ),CLK_MUX ("mcuusart_clk_sel_out0" , mcuusart_clk_sel_out0_parents,2 ,0x40f081c0 ,0 ,1 ,0 ), CLK_MUX("wkup_gpio0_clksel_out0", wkup_gpio0_clksel_out0_parents, 4, 0x43008070, 0, 2, 0),
@@ -353,46 +354,46 @@ static const struct clk_data clk_list[] = {CLK_FIXED_RATE ("board_0_mcu_i2c0_scl_out" ,0 ,0 ),CLK_FIXED_RATE ("board_0_wkup_lf_clkin_out" ,0 ,0 ),CLK_FIXED_RATE ("emmcsd4ss_main_0_emmcsdss_io_clk_o" ,0 ,0 ), -CLK_DIV_DEFFREQ ("hsdiv4_16fft_main_1_hsdivout0_clk" ,"pllfracf_ssmod_16fft_main_1_foutvcop_clk" ,0x681080 ,0 ,7 ,0 ,192000000 ), -CLK_DIV ("hsdiv4_16fft_main_1_hsdivout2_clk" ,"pllfracf_ssmod_16fft_main_1_foutvcop_clk" ,0x681088 ,0 ,7 ,0 ), -CLK_DIV ("hsdiv4_16fft_mcu_1_hsdivout1_clk" ,"pllfracf_ssmod_16fft_mcu_1_foutvcop_clk" ,0x40d01084 ,0 ,7 ,0 ), -CLK_DIV ("hsdiv4_16fft_mcu_1_hsdivout2_clk" ,"pllfracf_ssmod_16fft_mcu_1_foutvcop_clk" ,0x40d01088 ,0 ,7 ,0 ), -CLK_DIV ("hsdiv4_16fft_mcu_2_hsdivout0_clk" ,"pllfracf_ssmod_16fft_mcu_2_foutvcop_clk" ,0x40d02080 ,0 ,7 ,0 ), -CLK_DIV ("hsdiv4_16fft_mcu_2_hsdivout1_clk" ,"pllfracf_ssmod_16fft_mcu_2_foutvcop_clk" ,0x40d02084 ,0 ,7 ,0 ), -CLK_DIV ("hsdiv4_16fft_mcu_2_hsdivout2_clk" ,"pllfracf_ssmod_16fft_mcu_2_foutvcop_clk" ,0x40d02088 ,0 ,7 ,0 ), -CLK_DIV ("hsdiv4_16fft_mcu_2_hsdivout3_clk" ,"pllfracf_ssmod_16fft_mcu_2_foutvcop_clk" ,0x40d0208c ,0 ,7 ,0 ), +CLK_DIV_DEFFREQ ("hsdiv4_16fft_main_1_hsdivout0_clk" ,"pllfracf_ssmod_16fft_main_1_foutvcop_clk" ,0x681080 ,0 ,7 ,0 ,0 ,192000000 ), +CLK_DIV ("hsdiv4_16fft_main_1_hsdivout2_clk" ,"pllfracf_ssmod_16fft_main_1_foutvcop_clk" ,0x681088 ,0 ,7 ,0 ,0 ), +CLK_DIV ("hsdiv4_16fft_mcu_1_hsdivout1_clk" ,"pllfracf_ssmod_16fft_mcu_1_foutvcop_clk" ,0x40d01084 ,0 ,7 ,0 ,0 ), +CLK_DIV ("hsdiv4_16fft_mcu_1_hsdivout2_clk" ,"pllfracf_ssmod_16fft_mcu_1_foutvcop_clk" ,0x40d01088 ,0 ,7 ,0 ,0 ), +CLK_DIV ("hsdiv4_16fft_mcu_2_hsdivout0_clk" ,"pllfracf_ssmod_16fft_mcu_2_foutvcop_clk" ,0x40d02080 ,0 ,7 ,0 ,0 ), +CLK_DIV ("hsdiv4_16fft_mcu_2_hsdivout1_clk" ,"pllfracf_ssmod_16fft_mcu_2_foutvcop_clk" ,0x40d02084 ,0 ,7 ,0 ,0 ), +CLK_DIV ("hsdiv4_16fft_mcu_2_hsdivout2_clk" ,"pllfracf_ssmod_16fft_mcu_2_foutvcop_clk" ,0x40d02088 ,0 ,7 ,0 ,0 ), +CLK_DIV ("hsdiv4_16fft_mcu_2_hsdivout3_clk" ,"pllfracf_ssmod_16fft_mcu_2_foutvcop_clk" ,0x40d0208c ,0 ,7 ,0 ,0 ),CLK_PLL ("pllfracf_ssmod_16fft_main_0_foutvcop_clk" ,"main_pll_hfosc_sel_out0" ,0x680000 ,0 ), -CLK_DIV ("pllfracf_ssmod_16fft_main_0_foutpostdiv_clk_subdiv" ,"pllfracf_ssmod_16fft_main_0_foutvcop_clk" ,0x680038 ,16 ,3 ,0 ), -CLK_DIV ("pllfracf_ssmod_16fft_main_0_foutpostdiv_clk" ,"pllfracf_ssmod_16fft_main_0_foutpostdiv_clk_subdiv" ,0x680038 ,24 ,3 ,0 ), +CLK_DIV ("pllfracf_ssmod_16fft_main_0_foutpostdiv_clk_subdiv" ,"pllfracf_ssmod_16fft_main_0_foutvcop_clk" ,0x680038 ,16 ,3 ,0 ,CLK_DIVIDER_ONE_BASED ), +CLK_DIV ("pllfracf_ssmod_16fft_main_0_foutpostdiv_clk" ,"pllfracf_ssmod_16fft_main_0_foutpostdiv_clk_subdiv" ,0x680038 ,24 ,3 ,0 ,CLK_DIVIDER_ONE_BASED ),CLK_PLL ("pllfracf_ssmod_16fft_main_12_foutvcop_clk" ,"main_pll_hfosc_sel_out12" ,0x68c000 ,0 ),CLK_PLL ("pllfracf_ssmod_16fft_main_14_foutvcop_clk" ,"main_pll_hfosc_sel_out14" ,0x68e000 ,0 ),CLK_PLL ("pllfracf_ssmod_16fft_main_2_foutvcop_clk" ,"main_pll_hfosc_sel_out2" ,0x682000 ,0 ),CLK_PLL ("pllfracf_ssmod_16fft_main_3_foutvcop_clk" ,"main_pll_hfosc_sel_out3" ,0x683000 ,0 ),CLK_PLL ("pllfracf_ssmod_16fft_main_7_foutvcop_clk" ,"main_pll_hfosc_sel_out7" ,0x687000 ,0 ),CLK_PLL ("pllfracf_ssmod_16fft_main_8_foutvcop_clk" ,"main_pll_hfosc_sel_out8" ,0x688000 ,0 ), -CLK_DIV ("postdiv2_16fft_main_0_hsdivout6_clk" ,"pllfracf_ssmod_16fft_main_0_foutpostdiv_clk" ,0x680098 ,0 ,7 ,0 ), -CLK_DIV ("postdiv2_16fft_main_1_hsdivout7_clk" ,"pllfracf_ssmod_16fft_main_1_foutpostdiv_clk" ,0x68109c ,0 ,7 ,0 ), +CLK_DIV ("postdiv2_16fft_main_0_hsdivout6_clk" ,"pllfracf_ssmod_16fft_main_0_foutpostdiv_clk" ,0x680098 ,0 ,7 ,0 ,0 ), +CLK_DIV ("postdiv2_16fft_main_1_hsdivout7_clk" ,"pllfracf_ssmod_16fft_main_1_foutpostdiv_clk" ,0x68109c ,0 ,7 ,0 ,0 ),CLK_MUX ("wkup_obsclk_mux_out0" , wkup_obsclk_mux_out0_parents,16 ,0x43008000 ,0 ,4 ,0 ),CLK_MUX ("main_pll4_xref_sel_out0" , main_pll4_xref_sel_out0_parents,2 ,0x43008090 ,4 ,1 ,0 ),CLK_MUX ("mcu_clkout_mux_out0" , mcu_clkout_mux_out0_parents,2 ,0x40f08010 ,0 ,1 ,0 ), -CLK_DIV_DEFFREQ ("usart_programmable_clock_divider_out0" ,"hsdiv4_16fft_main_1_hsdivout0_clk" ,0x1081c0 ,0 ,2 ,0 ,48000000 ), -CLK_DIV ("hsdiv0_16fft_main_12_hsdivout0_clk" ,"pllfracf_ssmod_16fft_main_12_foutvcop_clk" ,0x68c080 ,0 ,7 ,0 ), -CLK_DIV ("hsdiv0_16fft_main_7_hsdivout0_clk" ,"pllfracf_ssmod_16fft_main_7_foutvcop_clk" ,0x687080 ,0 ,7 ,0 ), -CLK_DIV ("hsdiv0_16fft_main_8_hsdivout0_clk" ,"pllfracf_ssmod_16fft_main_8_foutvcop_clk" ,0x688080 ,0 ,7 ,0 ), -CLK_DIV ("hsdiv1_16fft_main_14_hsdivout0_clk" ,"pllfracf_ssmod_16fft_main_14_foutvcop_clk" ,0x68e080 ,0 ,7 ,0 ), -CLK_DIV ("hsdiv4_16fft_main_0_hsdivout0_clk" ,"pllfracf_ssmod_16fft_main_0_foutvcop_clk" ,0x680080 ,0 ,7 ,0 ), -CLK_DIV ("hsdiv4_16fft_main_0_hsdivout1_clk" ,"pllfracf_ssmod_16fft_main_0_foutvcop_clk" ,0x680084 ,0 ,7 ,0 ), -CLK_DIV ("hsdiv4_16fft_main_0_hsdivout2_clk" ,"pllfracf_ssmod_16fft_main_0_foutvcop_clk" ,0x680088 ,0 ,7 ,0 ), -CLK_DIV ("hsdiv4_16fft_main_0_hsdivout3_clk" ,"pllfracf_ssmod_16fft_main_0_foutvcop_clk" ,0x68008c ,0 ,7 ,0 ), -CLK_DIV ("hsdiv4_16fft_main_0_hsdivout4_clk" ,"pllfracf_ssmod_16fft_main_0_foutvcop_clk" ,0x680090 ,0 ,7 ,0 ), -CLK_DIV ("hsdiv4_16fft_main_2_hsdivout0_clk" ,"pllfracf_ssmod_16fft_main_2_foutvcop_clk" ,0x682080 ,0 ,7 ,0 ), -CLK_DIV ("hsdiv4_16fft_main_2_hsdivout1_clk" ,"pllfracf_ssmod_16fft_main_2_foutvcop_clk" ,0x682084 ,0 ,7 ,0 ), -CLK_DIV ("hsdiv4_16fft_main_3_hsdivout0_clk" ,"pllfracf_ssmod_16fft_main_3_foutvcop_clk" ,0x683080 ,0 ,7 ,0 ), -CLK_DIV ("hsdiv4_16fft_main_3_hsdivout1_clk" ,"pllfracf_ssmod_16fft_main_3_foutvcop_clk" ,0x683084 ,0 ,7 ,0 ), -CLK_DIV ("hsdiv4_16fft_main_3_hsdivout2_clk" ,"pllfracf_ssmod_16fft_main_3_foutvcop_clk" ,0x683088 ,0 ,7 ,0 ), +CLK_DIV_DEFFREQ ("usart_programmable_clock_divider_out0" ,"hsdiv4_16fft_main_1_hsdivout0_clk" ,0x1081c0 ,0 ,2 ,0 ,0 ,48000000 ), +CLK_DIV ("hsdiv0_16fft_main_12_hsdivout0_clk" ,"pllfracf_ssmod_16fft_main_12_foutvcop_clk" ,0x68c080 ,0 ,7 ,0 ,0 ), +CLK_DIV ("hsdiv0_16fft_main_7_hsdivout0_clk" ,"pllfracf_ssmod_16fft_main_7_foutvcop_clk" ,0x687080 ,0 ,7 ,0 ,0 ), +CLK_DIV ("hsdiv0_16fft_main_8_hsdivout0_clk" ,"pllfracf_ssmod_16fft_main_8_foutvcop_clk" ,0x688080 ,0 ,7 ,0 ,0 ), +CLK_DIV ("hsdiv1_16fft_main_14_hsdivout0_clk" ,"pllfracf_ssmod_16fft_main_14_foutvcop_clk" ,0x68e080 ,0 ,7 ,0 ,0 ), +CLK_DIV ("hsdiv4_16fft_main_0_hsdivout0_clk" ,"pllfracf_ssmod_16fft_main_0_foutvcop_clk" ,0x680080 ,0 ,7 ,0 ,0 ), +CLK_DIV ("hsdiv4_16fft_main_0_hsdivout1_clk" ,"pllfracf_ssmod_16fft_main_0_foutvcop_clk" ,0x680084 ,0 ,7 ,0 ,0 ), +CLK_DIV ("hsdiv4_16fft_main_0_hsdivout2_clk" ,"pllfracf_ssmod_16fft_main_0_foutvcop_clk" ,0x680088 ,0 ,7 ,0 ,0 ), +CLK_DIV ("hsdiv4_16fft_main_0_hsdivout3_clk" ,"pllfracf_ssmod_16fft_main_0_foutvcop_clk" ,0x68008c ,0 ,7 ,0 ,0 ), +CLK_DIV ("hsdiv4_16fft_main_0_hsdivout4_clk" ,"pllfracf_ssmod_16fft_main_0_foutvcop_clk" ,0x680090 ,0 ,7 ,0 ,0 ), +CLK_DIV ("hsdiv4_16fft_main_2_hsdivout0_clk" ,"pllfracf_ssmod_16fft_main_2_foutvcop_clk" ,0x682080 ,0 ,7 ,0 ,0 ), +CLK_DIV ("hsdiv4_16fft_main_2_hsdivout1_clk" ,"pllfracf_ssmod_16fft_main_2_foutvcop_clk" ,0x682084 ,0 ,7 ,0 ,0 ), +CLK_DIV ("hsdiv4_16fft_main_3_hsdivout0_clk" ,"pllfracf_ssmod_16fft_main_3_foutvcop_clk" ,0x683080 ,0 ,7 ,0 ,0 ), +CLK_DIV ("hsdiv4_16fft_main_3_hsdivout1_clk" ,"pllfracf_ssmod_16fft_main_3_foutvcop_clk" ,0x683084 ,0 ,7 ,0 ,0 ), +CLK_DIV ("hsdiv4_16fft_main_3_hsdivout2_clk" ,"pllfracf_ssmod_16fft_main_3_foutvcop_clk" ,0x683088 ,0 ,7 ,0 ,0 ),CLK_MUX_PLLCTRL ("k3_pll_ctrl_wrap_main_0_sysclkout_clk" , k3_pll_ctrl_wrap_main_0_sysclkout_clk_parents,2 ,0x410000 ,0 ), -CLK_DIV ("k3_pll_ctrl_wrap_main_0_chip_div1_clk_clk" ,"k3_pll_ctrl_wrap_main_0_sysclkout_clk" ,0x410118 ,0 ,5 ,0 ), -CLK_DIV ("mcu_obsclk_div_out0" ,"wkup_obsclk_mux_out0" ,0x43008000 ,8 ,4 ,0 ), +CLK_DIV ("k3_pll_ctrl_wrap_main_0_chip_div1_clk_clk" ,"k3_pll_ctrl_wrap_main_0_sysclkout_clk" ,0x410118 ,0 ,5 ,0 ,0 ), +CLK_DIV ("mcu_obsclk_div_out0" ,"wkup_obsclk_mux_out0" ,0x43008000 ,8 ,4 ,0 ,0 ),CLK_MUX ("mcu_obsclk_outmux_out0" , mcu_obsclk_outmux_out0_parents,2 ,0x43008000 ,24 ,1 ,0 ),CLK_PLL ("pllfracf_ssmod_16fft_main_4_foutvcop_clk" ,"main_pll4_xref_sel_out0" ,0x684000 ,0 ), CLK_MUX("clkout_mux_out0", clkout_mux_out0_parents, 2, 0x108010, 0, 1, 0),
@@ -401,14 +402,14 @@ static const struct clk_data clk_list[] = {CLK_MUX ("gtc_clk_mux_out0" , gtc_clk_mux_out0_parents,16 ,0x108030 ,0 ,4 ,0 ),CLK_MUX ("obsclk1_mux_out0" , obsclk1_mux_out0_parents,4 ,0x108004 ,0 ,2 ,0 ),CLK_MUX ("gpmc_fclk_sel_out0" , gpmc_fclk_sel_out0_parents,4 ,0x1080d0 ,0 ,2 ,0 ), -CLK_DIV ("hsdiv2_16fft_main_4_hsdivout0_clk" ,"pllfracf_ssmod_16fft_main_4_foutvcop_clk" ,0x684080 ,0 ,7 ,0 ), -CLK_DIV ("hsdiv2_16fft_main_4_hsdivout2_clk" ,"pllfracf_ssmod_16fft_main_4_foutvcop_clk" ,0x684088 ,0 ,7 ,0 ), +CLK_DIV ("hsdiv2_16fft_main_4_hsdivout0_clk" ,"pllfracf_ssmod_16fft_main_4_foutvcop_clk" ,0x684080 ,0 ,7 ,0 ,0 ), +CLK_DIV ("hsdiv2_16fft_main_4_hsdivout2_clk" ,"pllfracf_ssmod_16fft_main_4_foutvcop_clk" ,0x684088 ,0 ,7 ,0 ,0 ),CLK_MUX ("audio_refclko_mux_out0" , audio_refclko_mux_out0_parents,32 ,0x1082e0 ,0 ,5 ,0 ),CLK_MUX ("audio_refclko_mux_out1" , audio_refclko_mux_out1_parents,32 ,0x1082e4 ,0 ,5 ,0 ),CLK_MUX ("obsclk0_mux_out0" , obsclk0_mux_out0_parents,32 ,0x108000 ,0 ,5 ,0 ), -CLK_DIV ("osbclk0_div_out0" ,"obsclk0_mux_out0" ,0x108000 ,8 ,8 ,0 ), -CLK_DIV ("k3_pll_ctrl_wrap_main_0_chip_div24_clk_clk" ,"k3_pll_ctrl_wrap_main_0_sysclkout_clk" ,0x41011c ,0 ,5 ,0 ), - CLK_DIV("k3_pll_ctrl_wrap_wkup_0_chip_div24_clk_clk", "k3_pll_ctrl_wrap_wkup_0_sysclkout_clk", 0x4201011c, 0, 5, 0), +CLK_DIV ("osbclk0_div_out0" ,"obsclk0_mux_out0" ,0x108000 ,8 ,8 ,0 ,0 ), +CLK_DIV ("k3_pll_ctrl_wrap_main_0_chip_div24_clk_clk" ,"k3_pll_ctrl_wrap_main_0_sysclkout_clk" ,0x41011c ,0 ,5 ,0 ,0 ), + CLK_DIV("k3_pll_ctrl_wrap_wkup_0_chip_div24_clk_clk", "k3_pll_ctrl_wrap_wkup_0_sysclkout_clk", 0x4201011c, 0, 5, 0, 0), }; static const struct dev_clk soc_dev_clk_data[] = {
arch/arm/mach-k3/j721e/clk-data.c +56 -55
158 lines not on this page · raw message
drivers/clk/ti/clk-k3.c +2 -2
@@ -2,7 +2,7 @@/* * Texas Instruments K3 clock driver * -* Copyright (C) 2020 Texas Instruments Incorporated - http://www.ti.com/ +* Copyright (C) 2020-2021 Texas Instruments Incorporated - http://www.ti.com/ * Tero Kristo <[email protected]> */
@@ -112,7 +112,7 @@ static int ti_clk_probe(struct udevice *dev)map_physmem (ti_clk_data->clk.div.reg,0 ,MAP_NOCACHE ), ti_clk_data->clk.div.shift, ti_clk_data->clk.div.width, - 0); + ti_clk_data->clk.div.div_flags);break ;case CLK_TYPE_MUX : name = ti_clk_data->clk.mux.name;
include/k3-clk.h +17 -13
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* -* (C) Copyright 2020 - Texas Instruments Incorporated - http://www.ti.com +* (C) Copyright 2020-2021 Texas Instruments Incorporated - http://www.ti.com * Tero Kristo <[email protected]> */
@@ -54,6 +54,7 @@ struct div_data {u32 flags;int shift;int width; +u32 div_flags; };struct hfosc_data {
@@ -105,20 +106,23 @@ struct clk_data { .width = _width, .flags = _flags } \ } -#define CLK_DIV (_name, _parent, _reg, _shift, _width, _flags) \ - { \ - .type = CLK_TYPE_DIV, \ - .clk.div = {.name = _name, .parent = _parent, .reg = _reg, .shift = _shift, .width = _width, .flags = _flags } \ +#define CLK_DIV (_name, _parent, _reg, _shift, _width, _flags, _div_flags) \ + { \ + .type = CLK_TYPE_DIV, \ + .clk.div = { \ + .name = _name, .parent = _parent, .reg = _reg, \ + .shift = _shift, .width = _width, \ + .flags = _flags, .div_flags = _div_flags } \ } -#define CLK_DIV_DEFFREQ (_name, _parent, _reg, _shift, _width, _flags, _freq) \ - { \ - .type = CLK_TYPE_DIV, \ - .default_freq = _freq, \ - .clk.div = { \ - .name = _name, .parent = _parent, \ - .reg = _reg, .shift = _shift, \ - .width = _width, .flags = _flags } \ +#define CLK_DIV_DEFFREQ (_name, _parent, _reg, _shift, _width, _flags, _div_flags, _freq) \ + { \ + .type = CLK_TYPE_DIV, \ + .default_freq = _freq, \ + .clk.div = { \ + .name = _name, .parent = _parent, .reg = _reg, \ + .shift = _shift, .width = _width, \ + .flags = _flags, .div_flags = _div_flags } \ }#define CLK_PLL (_name, _parent, _reg, _flags) \
Signature · 1 line
2.28.0