clk:spear: Rename clk ids within predefined limit
Subsystems (2)
cover clk:spear: Rename clk ids within predefined limit
The max limit of con_id is 16 and dev_id is 20. As of now for all SPEAr SOC's clk ids are exceeding this predefined limit.
This patch set is intended to rename clk ids through out spear clk framework.
Vipul Kumar Samar (4):
clk:spear1340:Fix: Rename clk ids within predefined limit clk:spear1310:Fix: Rename clk ids within predefined limit Clk:spear3xx:Fix: Rename clk ids within predefined limit Clk:spear6xx:Fix: Rename clk ids within predefined limit
drivers/clk/spear/spear1310_clock.c | 312 +++++++++++++++++------------------ drivers/clk/spear/spear1340_clock.c | 273 +++++++++++++++--------------- drivers/clk/spear/spear3xx_clock.c | 180 ++++++++++----------- drivers/clk/spear/spear6xx_clock.c | 122 +++++++------- 4 files changed, 436 insertions(+), 451 deletions(-)
Signature · 1 line
1.7.2.2
PATCH 1/4 clk:spear1340:Fix: Rename clk ids within predefined limit
The max limit of con_id is 16 and dev_id is 20. As of now for spear1340, many clk ids are exceeding this predefined limit.
This patch rename clk ids like:
mux_clk -> _mclk
gate_clk -> _gclk
synth_clk -> syn_clk
gmac_phy -> phy_
gmii_125m_pad_ -> gmii_pad--- drivers/clk/spear/spear1340_clock.c | 273 +++++++++++++++++------------------ 1 files changed, 135 insertions(+), 138 deletions(-)
drivers/clk/spear/spear1340_clock.c +135 -138
@@ -370,26 +370,24 @@ static struct frac_rate_tbl gen_rtbl[] = {/* clock parents */ static const char *vco_parents[] = {"osc_24m_clk" ,"osc_25m_clk" , };static const char *sys_parents[] = {"none" ,"pll1_clk" ,"none" ,"none" , -"sys_synth_clk" ,"none" ,"pll2_clk" ,"pll3_clk" , }; -static const char *ahb_parents[] = {"cpu_div3_clk" ,"amba_synth_clk" , }; +"sys_syn_clk" ,"none" ,"pll2_clk" ,"pll3_clk" , }; +static const char *ahb_parents[] = {"cpu_div3_clk" ,"amba_syn_clk" , };static const char *gpt_parents[] = {"osc_24m_clk" ,"apb_clk" , };static const char *uart0_parents[] = {"pll5_clk" ,"osc_24m_clk" , -"uart0_synth_gate_clk" , }; +"uart0_syn_gclk" , };static const char *uart1_parents[] = {"pll5_clk" ,"osc_24m_clk" , -"uart1_synth_gate_clk" , }; -static const char *c3_parents[] = {"pll5_clk" ,"c3_synth_gate_clk" , }; -static const char *gmac_phy_input_parents[] = {"gmii_125m_pad_clk" ,"pll2_clk" , +"uart1_syn_gclk" , }; +static const char *c3_parents[] = {"pll5_clk" ,"c3_syn_gclk" , }; +static const char *gmac_phy_input_parents[] = {"gmii_pad_clk" ,"pll2_clk" ,"osc_25m_clk" , }; -static const char *gmac_phy_parents[] = {"gmac_phy_input_mux_clk" , -"gmac_phy_synth_gate_clk" , }; +static const char *gmac_phy_parents[] = {"phy_input_mclk" ,"phy_syn_gclk" , };static const char *clcd_synth_parents[] = {"vco1div4_clk" ,"pll2_clk" , }; -static const char *clcd_pixel_parents[] = {"pll5_clk" ,"clcd_synth_clk" , }; +static const char *clcd_pixel_parents[] = {"pll5_clk" ,"clcd_syn_clk" , };static const char *i2s_src_parents[] = {"vco1div2_clk" ,"pll2_clk" ,"pll3_clk" ,"i2s_src_pad_clk" , }; -static const char *i2s_ref_parents[] = {"i2s_src_mux_clk" ,"i2s_prs1_clk" , }; -static const char *spdif_out_parents[] = {"i2s_src_pad_clk" ,"gen_synth2_clk" , -}; -static const char *spdif_in_parents[] = {"pll2_clk" ,"gen_synth3_clk" , }; +static const char *i2s_ref_parents[] = {"i2s_src_mclk" ,"i2s_prs1_clk" , }; +static const char *spdif_out_parents[] = {"i2s_src_pad_clk" ,"gen_syn2_clk" , }; +static const char *spdif_in_parents[] = {"pll2_clk" ,"gen_syn3_clk" , };static const char *gen_synth0_1_parents[] = {"vco1div4_clk" ,"vco3div2_clk" ,"pll3_clk" , };
@@ -415,9 +413,9 @@ void __init spear1340_clk_init(void) 25000000);clk_register_clkdev (clk,"osc_25m_clk" ,NULL ); - clk =clk_register_fixed_rate (NULL ,"gmii_125m_pad_clk" ,NULL , -CLK_IS_ROOT ,125000000 ); -clk_register_clkdev (clk,"gmii_125m_pad_clk" ,NULL ); + clk =clk_register_fixed_rate (NULL ,"gmii_pad_clk" ,NULL ,CLK_IS_ROOT , +125000000 ); +clk_register_clkdev (clk,"gmii_pad_clk" ,NULL ); clk =clk_register_fixed_rate (NULL ,"i2s_src_pad_clk" ,NULL ,CLK_IS_ROOT ,12288000 );
@@ -431,35 +429,35 @@ void __init spear1340_clk_init(void)/* clock derived from 24 or 25 MHz osc clk */ /* vco-pll */ - clk =clk_register_mux (NULL ,"vco1_mux_clk" , vco_parents, + clk =clk_register_mux (NULL ,"vco1_mclk" , vco_parents,ARRAY_SIZE (vco_parents),0 ,SPEAR1340_PLL_CFG ,SPEAR1340_PLL1_CLK_SHIFT ,SPEAR1340_PLL_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"vco1_mux_clk" ,NULL ); - clk =clk_register_vco_pll ("vco1_clk" ,"pll1_clk" ,NULL ,"vco1_mux_clk" , -0 ,SPEAR1340_PLL1_CTR ,SPEAR1340_PLL1_FRQ , pll_rtbl, +clk_register_clkdev (clk,"vco1_mclk" ,NULL ); + clk =clk_register_vco_pll ("vco1_clk" ,"pll1_clk" ,NULL ,"vco1_mclk" ,0 , +SPEAR1340_PLL1_CTR ,SPEAR1340_PLL1_FRQ , pll_rtbl,ARRAY_SIZE (pll_rtbl), &_lock, &clk1,NULL );clk_register_clkdev (clk,"vco1_clk" ,NULL );clk_register_clkdev (clk1,"pll1_clk" ,NULL ); - clk =clk_register_mux (NULL ,"vco2_mux_clk" , vco_parents, + clk =clk_register_mux (NULL ,"vco2_mclk" , vco_parents,ARRAY_SIZE (vco_parents),0 ,SPEAR1340_PLL_CFG ,SPEAR1340_PLL2_CLK_SHIFT ,SPEAR1340_PLL_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"vco2_mux_clk" ,NULL ); - clk =clk_register_vco_pll ("vco2_clk" ,"pll2_clk" ,NULL ,"vco2_mux_clk" , -0 ,SPEAR1340_PLL2_CTR ,SPEAR1340_PLL2_FRQ , pll_rtbl, +clk_register_clkdev (clk,"vco2_mclk" ,NULL ); + clk =clk_register_vco_pll ("vco2_clk" ,"pll2_clk" ,NULL ,"vco2_mclk" ,0 , +SPEAR1340_PLL2_CTR ,SPEAR1340_PLL2_FRQ , pll_rtbl,ARRAY_SIZE (pll_rtbl), &_lock, &clk1,NULL );clk_register_clkdev (clk,"vco2_clk" ,NULL );clk_register_clkdev (clk1,"pll2_clk" ,NULL ); - clk =clk_register_mux (NULL ,"vco3_mux_clk" , vco_parents, + clk =clk_register_mux (NULL ,"vco3_mclk" , vco_parents,ARRAY_SIZE (vco_parents),0 ,SPEAR1340_PLL_CFG ,SPEAR1340_PLL3_CLK_SHIFT ,SPEAR1340_PLL_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"vco3_mux_clk" ,NULL ); - clk =clk_register_vco_pll ("vco3_clk" ,"pll3_clk" ,NULL ,"vco3_mux_clk" , -0 ,SPEAR1340_PLL3_CTR ,SPEAR1340_PLL3_FRQ , pll_rtbl, +clk_register_clkdev (clk,"vco3_mclk" ,NULL ); + clk =clk_register_vco_pll ("vco3_clk" ,"pll3_clk" ,NULL ,"vco3_mclk" ,0 , +SPEAR1340_PLL3_CTR ,SPEAR1340_PLL3_FRQ , pll_rtbl,ARRAY_SIZE (pll_rtbl), &_lock, &clk1,NULL );clk_register_clkdev (clk,"vco3_clk" ,NULL );clk_register_clkdev (clk1,"pll3_clk" ,NULL );
@@ -498,7 +496,7 @@ void __init spear1340_clk_init(void)/* peripherals */ clk_register_fixed_factor (NULL ,"thermal_clk" ,"osc_24m_clk" ,0 ,1 ,128 ); - clk =clk_register_gate (NULL ,"thermal_gate_clk" ,"thermal_clk" ,0 , + clk =clk_register_gate (NULL ,"thermal_gclk" ,"thermal_clk" ,0 ,SPEAR1340_PERIP2_CLK_ENB ,SPEAR1340_THSENS_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"spear_thermal" );
@@ -509,23 +507,23 @@ void __init spear1340_clk_init(void)clk_register_clkdev (clk,"ddr_clk" ,NULL );/* clock derived from pll1 clk */ - clk =clk_register_frac ("sys_synth_clk" ,"vco1div2_clk" ,0 , + clk =clk_register_frac ("sys_syn_clk" ,"vco1div2_clk" ,0 ,SPEAR1340_SYS_CLK_SYNT , sys_synth_rtbl,ARRAY_SIZE (sys_synth_rtbl), &_lock); -clk_register_clkdev (clk,"sys_synth_clk" ,NULL ); +clk_register_clkdev (clk,"sys_syn_clk" ,NULL ); - clk =clk_register_frac ("amba_synth_clk" ,"vco1div2_clk" ,0 , + clk =clk_register_frac ("amba_syn_clk" ,"vco1div2_clk" ,0 ,SPEAR1340_AMBA_CLK_SYNT , amba_synth_rtbl,ARRAY_SIZE (amba_synth_rtbl), &_lock); -clk_register_clkdev (clk,"amba_synth_clk" ,NULL ); +clk_register_clkdev (clk,"amba_syn_clk" ,NULL ); - clk =clk_register_mux (NULL ,"sys_mux_clk" , sys_parents, + clk =clk_register_mux (NULL ,"sys_mclk" , sys_parents,ARRAY_SIZE (sys_parents),0 ,SPEAR1340_SYS_CLK_CTRL ,SPEAR1340_SCLK_SRC_SEL_SHIFT ,SPEAR1340_SCLK_SRC_SEL_MASK ,0 , &_lock);clk_register_clkdev (clk,"sys_clk" ,NULL ); - clk =clk_register_fixed_factor (NULL ,"cpu_clk" ,"sys_mux_clk" ,0 ,1 , + clk =clk_register_fixed_factor (NULL ,"cpu_clk" ,"sys_mclk" ,0 ,1 ,2 );clk_register_clkdev (clk,"cpu_clk" ,NULL );
@@ -548,194 +546,193 @@ void __init spear1340_clk_init(void)clk_register_clkdev (clk,"apb_clk" ,NULL );/* gpt clocks */ - clk =clk_register_mux (NULL ,"gpt0_mux_clk" , gpt_parents, + clk =clk_register_mux (NULL ,"gpt0_mclk" , gpt_parents,ARRAY_SIZE (gpt_parents),0 ,SPEAR1340_PERIP_CLK_CFG ,SPEAR1340_GPT0_CLK_SHIFT ,SPEAR1340_GPT_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"gpt0_mux_clk" ,NULL ); - clk =clk_register_gate (NULL ,"gpt0_clk" ,"gpt0_mux_clk" ,0 , +clk_register_clkdev (clk,"gpt0_mclk" ,NULL ); + clk =clk_register_gate (NULL ,"gpt0_clk" ,"gpt0_mclk" ,0 ,SPEAR1340_PERIP1_CLK_ENB ,SPEAR1340_GPT0_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"gpt0" ); - clk =clk_register_mux (NULL ,"gpt1_mux_clk" , gpt_parents, + clk =clk_register_mux (NULL ,"gpt1_mclk" , gpt_parents,ARRAY_SIZE (gpt_parents),0 ,SPEAR1340_PERIP_CLK_CFG ,SPEAR1340_GPT1_CLK_SHIFT ,SPEAR1340_GPT_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"gpt1_mux_clk" ,NULL ); - clk =clk_register_gate (NULL ,"gpt1_clk" ,"gpt1_mux_clk" ,0 , +clk_register_clkdev (clk,"gpt1_mclk" ,NULL ); + clk =clk_register_gate (NULL ,"gpt1_clk" ,"gpt1_mclk" ,0 ,SPEAR1340_PERIP1_CLK_ENB ,SPEAR1340_GPT1_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"gpt1" ); - clk =clk_register_mux (NULL ,"gpt2_mux_clk" , gpt_parents, + clk =clk_register_mux (NULL ,"gpt2_mclk" , gpt_parents,ARRAY_SIZE (gpt_parents),0 ,SPEAR1340_PERIP_CLK_CFG ,SPEAR1340_GPT2_CLK_SHIFT ,SPEAR1340_GPT_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"gpt2_mux_clk" ,NULL ); - clk =clk_register_gate (NULL ,"gpt2_clk" ,"gpt2_mux_clk" ,0 , +clk_register_clkdev (clk,"gpt2_mclk" ,NULL ); + clk =clk_register_gate (NULL ,"gpt2_clk" ,"gpt2_mclk" ,0 ,SPEAR1340_PERIP2_CLK_ENB ,SPEAR1340_GPT2_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"gpt2" ); - clk =clk_register_mux (NULL ,"gpt3_mux_clk" , gpt_parents, + clk =clk_register_mux (NULL ,"gpt3_mclk" , gpt_parents,ARRAY_SIZE (gpt_parents),0 ,SPEAR1340_PERIP_CLK_CFG ,SPEAR1340_GPT3_CLK_SHIFT ,SPEAR1340_GPT_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"gpt3_mux_clk" ,NULL ); - clk =clk_register_gate (NULL ,"gpt3_clk" ,"gpt3_mux_clk" ,0 , +clk_register_clkdev (clk,"gpt3_mclk" ,NULL ); + clk =clk_register_gate (NULL ,"gpt3_clk" ,"gpt3_mclk" ,0 ,SPEAR1340_PERIP2_CLK_ENB ,SPEAR1340_GPT3_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"gpt3" );/* others */ - clk =clk_register_aux ("uart0_synth_clk" ,"uart0_synth_gate_clk" , + clk =clk_register_aux ("uart0_syn_clk" ,"uart0_syn_gclk" ,"vco1div2_clk" ,0 ,SPEAR1340_UART0_CLK_SYNT ,NULL , aux_rtbl,ARRAY_SIZE (aux_rtbl), &_lock, &clk1); -clk_register_clkdev (clk,"uart0_synth_clk" ,NULL ); -clk_register_clkdev (clk1,"uart0_synth_gate_clk" ,NULL ); +clk_register_clkdev (clk,"uart0_syn_clk" ,NULL ); +clk_register_clkdev (clk1,"uart0_syn_gclk" ,NULL ); - clk =clk_register_mux (NULL ,"uart0_mux_clk" , uart0_parents, + clk =clk_register_mux (NULL ,"uart0_mclk" , uart0_parents,ARRAY_SIZE (uart0_parents),0 ,SPEAR1340_PERIP_CLK_CFG ,SPEAR1340_UART0_CLK_SHIFT ,SPEAR1340_UART_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"uart0_mux_clk" ,NULL ); +clk_register_clkdev (clk,"uart0_mclk" ,NULL ); - clk =clk_register_gate (NULL ,"uart0_clk" ,"uart0_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"uart0_clk" ,"uart0_mclk" ,0 ,SPEAR1340_PERIP1_CLK_ENB ,SPEAR1340_UART0_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"e0000000.serial" ); - clk =clk_register_aux ("uart1_synth_clk" ,"uart1_synth_gate_clk" , + clk =clk_register_aux ("uart1_syn_clk" ,"uart1_syn_gclk" ,"vco1div2_clk" ,0 ,SPEAR1340_UART1_CLK_SYNT ,NULL , aux_rtbl,ARRAY_SIZE (aux_rtbl), &_lock, &clk1); -clk_register_clkdev (clk,"uart1_synth_clk" ,NULL ); -clk_register_clkdev (clk1,"uart1_synth_gate_clk" ,NULL ); +clk_register_clkdev (clk,"uart1_syn_clk" ,NULL ); +clk_register_clkdev (clk1,"uart1_syn_gclk" ,NULL ); - clk =clk_register_mux (NULL ,"uart1_mux_clk" , uart1_parents, + clk =clk_register_mux (NULL ,"uart1_mclk" , uart1_parents,ARRAY_SIZE (uart1_parents),0 ,SPEAR1340_PERIP_CLK_CFG ,SPEAR1340_UART1_CLK_SHIFT ,SPEAR1340_UART_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"uart1_mux_clk" ,NULL ); +clk_register_clkdev (clk,"uart1_mclk" ,NULL ); - clk =clk_register_gate (NULL ,"uart1_clk" ,"uart1_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"uart1_clk" ,"uart1_mclk" ,0 ,SPEAR1340_PERIP1_CLK_ENB ,SPEAR1340_UART1_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"b4100000.serial" ); - clk =clk_register_aux ("sdhci_synth_clk" ,"sdhci_synth_gate_clk" , + clk =clk_register_aux ("sdhci_syn_clk" ,"sdhci_syn_gclk" ,"vco1div2_clk" ,0 ,SPEAR1340_SDHCI_CLK_SYNT ,NULL , aux_rtbl,ARRAY_SIZE (aux_rtbl), &_lock, &clk1); -clk_register_clkdev (clk,"sdhci_synth_clk" ,NULL ); -clk_register_clkdev (clk1,"sdhci_synth_gate_clk" ,NULL ); +clk_register_clkdev (clk,"sdhci_syn_clk" ,NULL ); +clk_register_clkdev (clk1,"sdhci_syn_gclk" ,NULL ); - clk =clk_register_gate (NULL ,"sdhci_clk" ,"sdhci_synth_gate_clk" ,0 , + clk =clk_register_gate (NULL ,"sdhci_clk" ,"sdhci_syn_gclk" ,0 ,SPEAR1340_PERIP1_CLK_ENB ,SPEAR1340_SDHCI_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"b3000000.sdhci" ); - clk =clk_register_aux ("cfxd_synth_clk" ,"cfxd_synth_gate_clk" , -"vco1div2_clk" ,0 ,SPEAR1340_CFXD_CLK_SYNT ,NULL , - aux_rtbl,ARRAY_SIZE (aux_rtbl), &_lock, &clk1); -clk_register_clkdev (clk,"cfxd_synth_clk" ,NULL ); -clk_register_clkdev (clk1,"cfxd_synth_gate_clk" ,NULL ); + clk =clk_register_aux ("cfxd_syn_clk" ,"cfxd_syn_gclk" ,"vco1div2_clk" , +0 ,SPEAR1340_CFXD_CLK_SYNT ,NULL , aux_rtbl, +ARRAY_SIZE (aux_rtbl), &_lock, &clk1); +clk_register_clkdev (clk,"cfxd_syn_clk" ,NULL ); +clk_register_clkdev (clk1,"cfxd_syn_gclk" ,NULL ); - clk =clk_register_gate (NULL ,"cfxd_clk" ,"cfxd_synth_gate_clk" ,0 , + clk =clk_register_gate (NULL ,"cfxd_clk" ,"cfxd_syn_gclk" ,0 ,SPEAR1340_PERIP1_CLK_ENB ,SPEAR1340_CFXD_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"b2800000.cf" );clk_register_clkdev (clk,NULL ,"arasan_xd" ); - clk =clk_register_aux ("c3_synth_clk" ,"c3_synth_gate_clk" , -"vco1div2_clk" ,0 ,SPEAR1340_C3_CLK_SYNT ,NULL , - aux_rtbl,ARRAY_SIZE (aux_rtbl), &_lock, &clk1); -clk_register_clkdev (clk,"c3_synth_clk" ,NULL ); -clk_register_clkdev (clk1,"c3_synth_gate_clk" ,NULL ); + clk =clk_register_aux ("c3_syn_clk" ,"c3_syn_gclk" ,"vco1div2_clk" ,0 , +SPEAR1340_C3_CLK_SYNT ,NULL , aux_rtbl, +ARRAY_SIZE (aux_rtbl), &_lock, &clk1); +clk_register_clkdev (clk,"c3_syn_clk" ,NULL ); +clk_register_clkdev (clk1,"c3_syn_gclk" ,NULL ); - clk =clk_register_mux (NULL ,"c3_mux_clk" , c3_parents, + clk =clk_register_mux (NULL ,"c3_mclk" , c3_parents,ARRAY_SIZE (c3_parents),0 ,SPEAR1340_PERIP_CLK_CFG ,SPEAR1340_C3_CLK_SHIFT ,SPEAR1340_C3_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"c3_mux_clk" ,NULL ); +clk_register_clkdev (clk,"c3_mclk" ,NULL ); - clk =clk_register_gate (NULL ,"c3_clk" ,"c3_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"c3_clk" ,"c3_mclk" ,0 ,SPEAR1340_PERIP1_CLK_ENB ,SPEAR1340_C3_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"c3" );/* gmac */ - clk =clk_register_mux (NULL ,"gmac_phy_input_mux_clk" , - gmac_phy_input_parents, + clk =clk_register_mux (NULL ,"phy_input_mclk" , gmac_phy_input_parents,ARRAY_SIZE (gmac_phy_input_parents),0 ,SPEAR1340_GMAC_CLK_CFG ,SPEAR1340_GMAC_PHY_INPUT_CLK_SHIFT ,SPEAR1340_GMAC_PHY_INPUT_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"gmac_phy_input_mux_clk" ,NULL ); +clk_register_clkdev (clk,"phy_input_mclk" ,NULL ); - clk =clk_register_aux ("gmac_phy_synth_clk" ,"gmac_phy_synth_gate_clk" , -"gmac_phy_input_mux_clk" ,0 ,SPEAR1340_GMAC_CLK_SYNT , -NULL , gmac_rtbl,ARRAY_SIZE (gmac_rtbl), &_lock, &clk1); -clk_register_clkdev (clk,"gmac_phy_synth_clk" ,NULL ); -clk_register_clkdev (clk1,"gmac_phy_synth_gate_clk" ,NULL ); + clk =clk_register_aux ("phy_syn_clk" ,"phy_syn_gclk" ,"phy_input_mclk" , +0 ,SPEAR1340_GMAC_CLK_SYNT ,NULL , gmac_rtbl, +ARRAY_SIZE (gmac_rtbl), &_lock, &clk1); +clk_register_clkdev (clk,"phy_syn_clk" ,NULL ); +clk_register_clkdev (clk1,"phy_syn_gclk" ,NULL ); - clk =clk_register_mux (NULL ,"gmac_phy_mux_clk" , gmac_phy_parents, + clk =clk_register_mux (NULL ,"phy_mclk" , gmac_phy_parents,ARRAY_SIZE (gmac_phy_parents),0 ,SPEAR1340_PERIP_CLK_CFG ,SPEAR1340_GMAC_PHY_CLK_SHIFT ,SPEAR1340_GMAC_PHY_CLK_MASK ,0 , &_lock);clk_register_clkdev (clk,NULL ,"stmmacphy.0" );/* clcd */ - clk =clk_register_mux (NULL ,"clcd_synth_mux_clk" , clcd_synth_parents, + clk =clk_register_mux (NULL ,"clcd_syn_mclk" , clcd_synth_parents,ARRAY_SIZE (clcd_synth_parents),0 ,SPEAR1340_CLCD_CLK_SYNT ,SPEAR1340_CLCD_SYNT_CLK_SHIFT ,SPEAR1340_CLCD_SYNT_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"clcd_synth_mux_clk" ,NULL ); +clk_register_clkdev (clk,"clcd_syn_mclk" ,NULL ); - clk =clk_register_frac ("clcd_synth_clk" ,"clcd_synth_mux_clk" ,0 , + clk =clk_register_frac ("clcd_syn_clk" ,"clcd_syn_mclk" ,0 ,SPEAR1340_CLCD_CLK_SYNT , clcd_rtbl,ARRAY_SIZE (clcd_rtbl), &_lock); -clk_register_clkdev (clk,"clcd_synth_clk" ,NULL ); +clk_register_clkdev (clk,"clcd_syn_clk" ,NULL ); - clk =clk_register_mux (NULL ,"clcd_pixel_mux_clk" , clcd_pixel_parents, + clk =clk_register_mux (NULL ,"clcd_pixel_mclk" , clcd_pixel_parents,ARRAY_SIZE (clcd_pixel_parents),0 ,SPEAR1340_PERIP_CLK_CFG ,SPEAR1340_CLCD_CLK_SHIFT ,SPEAR1340_CLCD_CLK_MASK ,0 , &_lock);clk_register_clkdev (clk,"clcd_pixel_clk" ,NULL ); - clk =clk_register_gate (NULL ,"clcd_clk" ,"clcd_pixel_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"clcd_clk" ,"clcd_pixel_mclk" ,0 ,SPEAR1340_PERIP1_CLK_ENB ,SPEAR1340_CLCD_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,"clcd_clk" ,NULL );/* i2s */ - clk =clk_register_mux (NULL ,"i2s_src_mux_clk" , i2s_src_parents, + clk =clk_register_mux (NULL ,"i2s_src_mclk" , i2s_src_parents,ARRAY_SIZE (i2s_src_parents),0 ,SPEAR1340_I2S_CLK_CFG ,SPEAR1340_I2S_SRC_CLK_SHIFT ,SPEAR1340_I2S_SRC_CLK_MASK ,0 , &_lock);clk_register_clkdev (clk,"i2s_src_clk" ,NULL ); - clk =clk_register_aux ("i2s_prs1_clk" ,NULL ,"i2s_src_mux_clk" ,0 , + clk =clk_register_aux ("i2s_prs1_clk" ,NULL ,"i2s_src_mclk" ,0 ,SPEAR1340_I2S_CLK_CFG , &i2s_prs1_masks, i2s_prs1_rtbl,ARRAY_SIZE (i2s_prs1_rtbl), &_lock,NULL );clk_register_clkdev (clk,"i2s_prs1_clk" ,NULL ); - clk =clk_register_mux (NULL ,"i2s_ref_mux_clk" , i2s_ref_parents, + clk =clk_register_mux (NULL ,"i2s_ref_mclk" , i2s_ref_parents,ARRAY_SIZE (i2s_ref_parents),0 ,SPEAR1340_I2S_CLK_CFG ,SPEAR1340_I2S_REF_SHIFT ,SPEAR1340_I2S_REF_SEL_MASK ,0 , &_lock);clk_register_clkdev (clk,"i2s_ref_clk" ,NULL ); - clk =clk_register_gate (NULL ,"i2s_ref_pad_clk" ,"i2s_ref_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"i2s_ref_pad_clk" ,"i2s_ref_mclk" ,0 ,SPEAR1340_PERIP2_CLK_ENB ,SPEAR1340_I2S_REF_PAD_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,"i2s_ref_pad_clk" ,NULL ); - clk =clk_register_aux ("i2s_sclk_clk" ,"i2s_sclk_gate_clk" , -"i2s_ref_mux_clk" ,0 ,SPEAR1340_I2S_CLK_CFG , - &i2s_sclk_masks, i2s_sclk_rtbl, -ARRAY_SIZE (i2s_sclk_rtbl), &_lock, &clk1); + clk =clk_register_aux ("i2s_sclk_clk" ,"i2s_sclk_gclk" ,"i2s_ref_mclk" , +0 ,SPEAR1340_I2S_CLK_CFG , &i2s_sclk_masks, + i2s_sclk_rtbl,ARRAY_SIZE (i2s_sclk_rtbl), &_lock, + &clk1);clk_register_clkdev (clk,"i2s_sclk_clk" ,NULL ); -clk_register_clkdev (clk1,"i2s_sclk_gate_clk" ,NULL ); +clk_register_clkdev (clk1,"i2s_sclk_gclk" ,NULL );/* clock derived from ahb clk */ clk = clk_register_gate(NULL, "i2c0_clk", "ahb_clk", 0,
@@ -800,13 +797,13 @@ void __init spear1340_clk_init(void) &_lock);clk_register_clkdev (clk,"sysram1_clk" ,NULL ); - clk =clk_register_aux ("adc_synth_clk" ,"adc_synth_gate_clk" ,"ahb_clk" , + clk =clk_register_aux ("adc_syn_clk" ,"adc_syn_gclk" ,"ahb_clk" ,0 ,SPEAR1340_ADC_CLK_SYNT ,NULL , adc_rtbl,ARRAY_SIZE (adc_rtbl), &_lock, &clk1); -clk_register_clkdev (clk,"adc_synth_clk" ,NULL ); -clk_register_clkdev (clk1,"adc_synth_gate_clk" ,NULL ); +clk_register_clkdev (clk,"adc_syn_clk" ,NULL ); +clk_register_clkdev (clk1,"adc_syn_gclk" ,NULL ); - clk =clk_register_gate (NULL ,"adc_clk" ,"adc_synth_gate_clk" ,0 , + clk =clk_register_gate (NULL ,"adc_clk" ,"adc_syn_gclk" ,0 ,SPEAR1340_PERIP1_CLK_ENB ,SPEAR1340_ADC_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"adc_clk" );
@@ -843,39 +840,39 @@ void __init spear1340_clk_init(void)clk_register_clkdev (clk,NULL ,"e0300000.kbd" );/* RAS clks */ - clk =clk_register_mux (NULL ,"gen_synth0_1_mux_clk" , - gen_synth0_1_parents,ARRAY_SIZE (gen_synth0_1_parents), -0 ,SPEAR1340_PLL_CFG ,SPEAR1340_GEN_SYNT0_1_CLK_SHIFT , + clk =clk_register_mux (NULL ,"gen_syn0_1_mclk" , gen_synth0_1_parents, +ARRAY_SIZE (gen_synth0_1_parents),0 ,SPEAR1340_PLL_CFG , +SPEAR1340_GEN_SYNT0_1_CLK_SHIFT ,SPEAR1340_GEN_SYNT_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"gen_synth0_1_clk" ,NULL ); +clk_register_clkdev (clk,"gen_syn0_1_clk" ,NULL ); - clk =clk_register_mux (NULL ,"gen_synth2_3_mux_clk" , - gen_synth2_3_parents,ARRAY_SIZE (gen_synth2_3_parents), -0 ,SPEAR1340_PLL_CFG ,SPEAR1340_GEN_SYNT2_3_CLK_SHIFT , + clk =clk_register_mux (NULL ,"gen_syn2_3_mclk" , gen_synth2_3_parents, +ARRAY_SIZE (gen_synth2_3_parents),0 ,SPEAR1340_PLL_CFG , +SPEAR1340_GEN_SYNT2_3_CLK_SHIFT ,SPEAR1340_GEN_SYNT_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"gen_synth2_3_clk" ,NULL ); +clk_register_clkdev (clk,"gen_syn2_3_clk" ,NULL ); - clk =clk_register_frac ("gen_synth0_clk" ,"gen_synth0_1_clk" ,0 , + clk =clk_register_frac ("gen_syn0_clk" ,"gen_syn0_1_clk" ,0 ,SPEAR1340_GEN_CLK_SYNT0 , gen_rtbl,ARRAY_SIZE (gen_rtbl), &_lock); -clk_register_clkdev (clk,"gen_synth0_clk" ,NULL ); +clk_register_clkdev (clk,"gen_syn0_clk" ,NULL ); - clk =clk_register_frac ("gen_synth1_clk" ,"gen_synth0_1_clk" ,0 , + clk =clk_register_frac ("gen_syn1_clk" ,"gen_syn0_1_clk" ,0 ,SPEAR1340_GEN_CLK_SYNT1 , gen_rtbl,ARRAY_SIZE (gen_rtbl), &_lock); -clk_register_clkdev (clk,"gen_synth1_clk" ,NULL ); +clk_register_clkdev (clk,"gen_syn1_clk" ,NULL ); - clk =clk_register_frac ("gen_synth2_clk" ,"gen_synth2_3_clk" ,0 , + clk =clk_register_frac ("gen_syn2_clk" ,"gen_syn2_3_clk" ,0 ,SPEAR1340_GEN_CLK_SYNT2 , gen_rtbl,ARRAY_SIZE (gen_rtbl), &_lock); -clk_register_clkdev (clk,"gen_synth2_clk" ,NULL ); +clk_register_clkdev (clk,"gen_syn2_clk" ,NULL ); - clk =clk_register_frac ("gen_synth3_clk" ,"gen_synth2_3_clk" ,0 , + clk =clk_register_frac ("gen_syn3_clk" ,"gen_syn2_3_clk" ,0 ,SPEAR1340_GEN_CLK_SYNT3 , gen_rtbl,ARRAY_SIZE (gen_rtbl), &_lock); -clk_register_clkdev (clk,"gen_synth3_clk" ,NULL ); +clk_register_clkdev (clk,"gen_syn3_clk" ,NULL ); - clk =clk_register_gate (NULL ,"mali_clk" ,"gen_synth3_clk" ,0 , + clk =clk_register_gate (NULL ,"mali_clk" ,"gen_syn3_clk" ,0 ,SPEAR1340_PERIP3_CLK_ENB ,SPEAR1340_MALI_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"mali" );
@@ -890,74 +887,74 @@ void __init spear1340_clk_init(void) &_lock);clk_register_clkdev (clk,NULL ,"spear_cec.1" ); - clk =clk_register_mux (NULL ,"spdif_out_mux_clk" , spdif_out_parents, + clk =clk_register_mux (NULL ,"spdif_out_mclk" , spdif_out_parents,ARRAY_SIZE (spdif_out_parents),0 ,SPEAR1340_PERIP_CLK_CFG ,SPEAR1340_SPDIF_OUT_CLK_SHIFT ,SPEAR1340_SPDIF_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"spdif_out_mux_clk" ,NULL ); +clk_register_clkdev (clk,"spdif_out_mclk" ,NULL ); - clk =clk_register_gate (NULL ,"spdif_out_clk" ,"spdif_out_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"spdif_out_clk" ,"spdif_out_mclk" ,0 ,SPEAR1340_PERIP3_CLK_ENB ,SPEAR1340_SPDIF_OUT_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"spdif-out" ); - clk =clk_register_mux (NULL ,"spdif_in_mux_clk" , spdif_in_parents, + clk =clk_register_mux (NULL ,"spdif_in_mclk" , spdif_in_parents,ARRAY_SIZE (spdif_in_parents),0 ,SPEAR1340_PERIP_CLK_CFG ,SPEAR1340_SPDIF_IN_CLK_SHIFT ,SPEAR1340_SPDIF_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"spdif_in_mux_clk" ,NULL ); +clk_register_clkdev (clk,"spdif_in_mclk" ,NULL ); - clk =clk_register_gate (NULL ,"spdif_in_clk" ,"spdif_in_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"spdif_in_clk" ,"spdif_in_mclk" ,0 ,SPEAR1340_PERIP3_CLK_ENB ,SPEAR1340_SPDIF_IN_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"spdif-in" ); - clk =clk_register_gate (NULL ,"acp_clk" ,"acp_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"acp_clk" ,"acp_mclk" ,0 ,SPEAR1340_PERIP2_CLK_ENB ,SPEAR1340_ACP_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"acp_clk" ); - clk =clk_register_gate (NULL ,"plgpio_clk" ,"plgpio_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"plgpio_clk" ,"plgpio_mclk" ,0 ,SPEAR1340_PERIP3_CLK_ENB ,SPEAR1340_PLGPIO_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"plgpio" ); - clk =clk_register_gate (NULL ,"video_dec_clk" ,"video_dec_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"video_dec_clk" ,"video_dec_mclk" ,0 ,SPEAR1340_PERIP3_CLK_ENB ,SPEAR1340_VIDEO_DEC_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"video_dec" ); - clk =clk_register_gate (NULL ,"video_enc_clk" ,"video_enc_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"video_enc_clk" ,"video_enc_mclk" ,0 ,SPEAR1340_PERIP3_CLK_ENB ,SPEAR1340_VIDEO_ENC_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"video_enc" ); - clk =clk_register_gate (NULL ,"video_in_clk" ,"video_in_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"video_in_clk" ,"video_in_mclk" ,0 ,SPEAR1340_PERIP3_CLK_ENB ,SPEAR1340_VIDEO_IN_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"spear_vip" ); - clk =clk_register_gate (NULL ,"cam0_clk" ,"cam0_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"cam0_clk" ,"cam0_mclk" ,0 ,SPEAR1340_PERIP3_CLK_ENB ,SPEAR1340_CAM0_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"spear_camif.0" ); - clk =clk_register_gate (NULL ,"cam1_clk" ,"cam1_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"cam1_clk" ,"cam1_mclk" ,0 ,SPEAR1340_PERIP3_CLK_ENB ,SPEAR1340_CAM1_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"spear_camif.1" ); - clk =clk_register_gate (NULL ,"cam2_clk" ,"cam2_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"cam2_clk" ,"cam2_mclk" ,0 ,SPEAR1340_PERIP3_CLK_ENB ,SPEAR1340_CAM2_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"spear_camif.2" ); - clk =clk_register_gate (NULL ,"cam3_clk" ,"cam3_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"cam3_clk" ,"cam3_mclk" ,0 ,SPEAR1340_PERIP3_CLK_ENB ,SPEAR1340_CAM3_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"spear_camif.3" ); - clk =clk_register_gate (NULL ,"pwm_clk" ,"pwm_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"pwm_clk" ,"pwm_mclk" ,0 ,SPEAR1340_PERIP3_CLK_ENB ,SPEAR1340_PWM_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"pwm" );
Signature · 1 line
1.7.2.2
PATCH 1/4 clk:spear1340:Fix: Rename clk ids within predefined limit
drivers/clk/spear/spear1340_clock.c void __init spear1340_clk_init(void) · line 515
Quoted 13 lines · Vipul Kumar Samar
The max limit of
con_idis 16 anddev_idis 20. As of now for spear1340, many clk ids are exceeding this predefined limit.drivers/clk/spear/spear1340_clock.c +0
-4@@ -509,23 +507,23 @@ void __init spear1340_clk_init(void) -clk_register_clkdev (clk1,"uart0_synth_gate_clk" ,NULL ); -clk_register_clkdev (clk1,"sdhci_synth_gate_clk" ,NULL ); -clk_register_clkdev (clk,"gmac_phy_input_mux_clk" ,NULL ); -clk_register_clkdev (clk1,"gmac_phy_synth_gate_clk" ,NULL );
These are the only places in this entire patch, where i found con_id crossing the limit.
Then why so many changes? Aligning all to similar naming?
drivers/clk/spear/spear1340_clock.c void __init spear1340_clk_init(void) · line 605
Quoted 1 line
drivers/clk/spear/spear1340_clock.c +0
-0clk_register_clkdev (clk,NULL ,"e0000000.serial" );
@Russell & Mike: Above line uses maximum length of dev_id, i.e. 16. And because with DT we have so long device names now, out of which 8 - address
1 - '.'
1 - '\0'
10 are already gone and so only 6 are left for device name. Should we consider updatingdev_id array size??
--
viresh
PATCH 1/4 clk:spear1340:Fix: Rename clk ids within predefined limit
Quoted 29 lines · viresh kumar
drivers/clk/spear/spear1340_clock.c void __init spear1340_clk_init(void) · line 515
Quoted 13 lines · Vipul Kumar Samar
The max limit of
con_idis 16 anddev_idis 20. As of now for spear1340, many clk ids are exceeding this predefined limit.drivers/clk/spear/spear1340_clock.c +0
-4@@ -509,23 +507,23 @@ void __init spear1340_clk_init(void) -clk_register_clkdev (clk1,"uart0_synth_gate_clk" ,NULL ); -clk_register_clkdev (clk1,"sdhci_synth_gate_clk" ,NULL ); -clk_register_clkdev (clk,"gmac_phy_input_mux_clk" ,NULL ); -clk_register_clkdev (clk1,"gmac_phy_synth_gate_clk" ,NULL );These are the only places in this entire patch, where i found
con_idcrossing the limit.
Then why so many changes? Aligning all to similar naming?drivers/clk/spear/spear1340_clock.c void __init spear1340_clk_init(void) · line 605
Quoted 1 line
drivers/clk/spear/spear1340_clock.c +0
-0clk_register_clkdev (clk,NULL ,"e0000000.serial" );@Russell & Mike: Above line uses maximum length of
dev_id, i.e. 16. And because with DT we have so long device names now, out of which 8 - address
1 - '.'
1 - '\0'
Quoted 3 lines
10 are already gone and so only 6 are left for device name. Should we consider updating
dev_idarray size??
Sorry, I thought dev_id is 16 and con_id is 20. And so above comments. Please ignore. :(
--
viresh
PATCH 1/4 clk:spear1340:Fix: Rename clk ids within predefined limit
In reply to viresh kumarQuoted 11 lines · viresh kumar
Quoted 8 lines · Vipul Kumar Samar
The max limit of
con_idis 16 anddev_idis 20. As of now for spear1340, many clk ids are exceeding this predefined limit.drivers/clk/spear/spear1340_clock.c +0
-1@@ -509,23 +507,23 @@ void __init spear1340_clk_init(void) -clk_register_clkdev (clk1,"uart0_synth_gate_clk" ,NULL );
Quoted 8 lines
drivers/clk/spear/spear1340_clock.c void __init spear1340_clk_init(void) · line 679
Quoted 4 lines
drivers/clk/spear/spear1340_clock.c +0
-3-clk_register_clkdev (clk1,"sdhci_synth_gate_clk" ,NULL ); -clk_register_clkdev (clk,"gmac_phy_input_mux_clk" ,NULL ); -clk_register_clkdev (clk1,"gmac_phy_synth_gate_clk" ,NULL );These are the only places in this entire patch, where i found
con_idcrossing the limit.
Then why so many changes? Aligning all to similar naming?
Not only for gmac some other ips also like sdhi_synth_gate_clk, uart1_synth_gate_clk, clcd_synth_mux_clk etc.
yes, to align all other gate, synth and mux clocks with similar naming.
Quoted 10 lines
drivers/clk/spear/spear1340_clock.c void __init spear1340_clk_init(void) · line 605
Quoted 3 lines
drivers/clk/spear/spear1340_clock.c +0
-0clk_register_clkdev (clk,NULL ,"e0000000.serial" );@Russell& Mike: Above line uses maximum length of
dev_id, i.e. 16. And because with DT we have so long device names now, out of which 8 - address
1 - '.'
1 - '\0'
Quoted 3 lines
10 are already gone and so only 6 are left for device name. Should we consider updating
dev_idarray size??
dev_id is 20 and con_id is 16
Regards
Vipul Samar
PATCH 2/4 clk:spear1310:Fix: Rename clk ids within predefined limit
In reply to Vipul Kumar SamarThe max limit of con_id is 16 and dev_id is 20. As of now for spear1310, many clk ids are exceeding this predefined limit.
This patch is intended to rename clk ids like:
mux_clk -> _mclk
gate_clk -> _gclk
synth_clk -> syn_clk
gmac_phy -> phy_
gmii_125m_pad -> gmii_pad--- drivers/clk/spear/spear1310_clock.c | 312 +++++++++++++++++------------------ 1 files changed, 155 insertions(+), 157 deletions(-)
drivers/clk/spear/spear1310_clock.c +155 -157
@@ -345,31 +345,30 @@ static struct frac_rate_tbl gen_rtbl[] = {/* clock parents */ static const char *vco_parents[] = {"osc_24m_clk" ,"osc_25m_clk" , };static const char *gpt_parents[] = {"osc_24m_clk" ,"apb_clk" , }; -static const char *uart0_parents[] = {"pll5_clk" ,"uart_synth_gate_clk" , }; -static const char *c3_parents[] = {"pll5_clk" ,"c3_synth_gate_clk" , }; -static const char *gmac_phy_input_parents[] = {"gmii_125m_pad_clk" ,"pll2_clk" , +static const char *uart0_parents[] = {"pll5_clk" ,"uart_syn_gclk" , }; +static const char *c3_parents[] = {"pll5_clk" ,"c3_syn_gclk" , }; +static const char *gmac_phy_input_parents[] = {"gmii_pad_clk" ,"pll2_clk" ,"osc_25m_clk" , }; -static const char *gmac_phy_parents[] = {"gmac_phy_input_mux_clk" , -"gmac_phy_synth_gate_clk" , }; +static const char *gmac_phy_parents[] = {"phy_input_mclk" ,"phy_syn_gclk" , };static const char *clcd_synth_parents[] = {"vco1div4_clk" ,"pll2_clk" , }; -static const char *clcd_pixel_parents[] = {"pll5_clk" ,"clcd_synth_clk" , }; +static const char *clcd_pixel_parents[] = {"pll5_clk" ,"clcd_syn_clk" , };static const char *i2s_src_parents[] = {"vco1div2_clk" ,"none" ,"pll3_clk" ,"i2s_src_pad_clk" , }; -static const char *i2s_ref_parents[] = {"i2s_src_mux_clk" ,"i2s_prs1_clk" , }; +static const char *i2s_ref_parents[] = {"i2s_src_mclk" ,"i2s_prs1_clk" , };static const char *gen_synth0_1_parents[] = {"vco1div4_clk" ,"vco3div2_clk" ,"pll3_clk" , };static const char *gen_synth2_3_parents[] = {"vco1div4_clk" ,"vco3div2_clk" ,"pll2_clk" , };static const char *rmii_phy_parents[] = {"ras_tx50_clk" ,"none" , -"ras_pll2_clk" ,"ras_synth0_clk" , }; +"ras_pll2_clk" ,"ras_syn0_clk" , };static const char *smii_rgmii_phy_parents[] = {"none" ,"ras_tx125_clk" , -"ras_pll2_clk" ,"ras_synth0_clk" , }; -static const char *uart_parents[] = {"ras_apb_clk" ,"gen_synth3_clk" , }; -static const char *i2c_parents[] = {"ras_apb_clk" ,"gen_synth1_clk" , }; -static const char *ssp1_parents[] = {"ras_apb_clk" ,"gen_synth1_clk" , +"ras_pll2_clk" ,"ras_syn0_clk" , }; +static const char *uart_parents[] = {"ras_apb_clk" ,"gen_syn3_clk" , }; +static const char *i2c_parents[] = {"ras_apb_clk" ,"gen_syn1_clk" , }; +static const char *ssp1_parents[] = {"ras_apb_clk" ,"gen_syn1_clk" ,"ras_plclk0_clk" , }; -static const char *pci_parents[] = {"ras_pll3_clk" ,"gen_synth2_clk" , }; -static const char *tdm_parents[] = {"ras_pll3_clk" ,"gen_synth1_clk" , }; +static const char *pci_parents[] = {"ras_pll3_clk" ,"gen_syn2_clk" , }; +static const char *tdm_parents[] = {"ras_pll3_clk" ,"gen_syn1_clk" , };void __init spear1310_clk_init (void ) {
@@ -390,9 +389,9 @@ void __init spear1310_clk_init(void) 25000000);clk_register_clkdev (clk,"osc_25m_clk" ,NULL ); - clk =clk_register_fixed_rate (NULL ,"gmii_125m_pad_clk" ,NULL , -CLK_IS_ROOT ,125000000 ); -clk_register_clkdev (clk,"gmii_125m_pad_clk" ,NULL ); + clk =clk_register_fixed_rate (NULL ,"gmii_pad_clk" ,NULL ,CLK_IS_ROOT , +125000000 ); +clk_register_clkdev (clk,"gmii_pad_clk" ,NULL ); clk =clk_register_fixed_rate (NULL ,"i2s_src_pad_clk" ,NULL ,CLK_IS_ROOT ,12288000 );
@@ -406,34 +405,34 @@ void __init spear1310_clk_init(void)/* clock derived from 24 or 25 MHz osc clk */ /* vco-pll */ - clk =clk_register_mux (NULL ,"vco1_mux_clk" , vco_parents, + clk =clk_register_mux (NULL ,"vco1_mclk" , vco_parents,ARRAY_SIZE (vco_parents),0 ,SPEAR1310_PLL_CFG ,SPEAR1310_PLL1_CLK_SHIFT ,SPEAR1310_PLL_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"vco1_mux_clk" ,NULL ); - clk =clk_register_vco_pll ("vco1_clk" ,"pll1_clk" ,NULL ,"vco1_mux_clk" , +clk_register_clkdev (clk,"vco1_mclk" ,NULL ); + clk =clk_register_vco_pll ("vco1_clk" ,"pll1_clk" ,NULL ,"vco1_mclk" ,0 ,SPEAR1310_PLL1_CTR ,SPEAR1310_PLL1_FRQ , pll_rtbl,ARRAY_SIZE (pll_rtbl), &_lock, &clk1,NULL );clk_register_clkdev (clk,"vco1_clk" ,NULL );clk_register_clkdev (clk1,"pll1_clk" ,NULL ); - clk =clk_register_mux (NULL ,"vco2_mux_clk" , vco_parents, + clk =clk_register_mux (NULL ,"vco2_mclk" , vco_parents,ARRAY_SIZE (vco_parents),0 ,SPEAR1310_PLL_CFG ,SPEAR1310_PLL2_CLK_SHIFT ,SPEAR1310_PLL_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"vco2_mux_clk" ,NULL ); - clk =clk_register_vco_pll ("vco2_clk" ,"pll2_clk" ,NULL ,"vco2_mux_clk" , +clk_register_clkdev (clk,"vco2_mclk" ,NULL ); + clk =clk_register_vco_pll ("vco2_clk" ,"pll2_clk" ,NULL ,"vco2_mclk" ,0 ,SPEAR1310_PLL2_CTR ,SPEAR1310_PLL2_FRQ , pll_rtbl,ARRAY_SIZE (pll_rtbl), &_lock, &clk1,NULL );clk_register_clkdev (clk,"vco2_clk" ,NULL );clk_register_clkdev (clk1,"pll2_clk" ,NULL ); - clk =clk_register_mux (NULL ,"vco3_mux_clk" , vco_parents, + clk =clk_register_mux (NULL ,"vco3_mclk" , vco_parents,ARRAY_SIZE (vco_parents),0 ,SPEAR1310_PLL_CFG ,SPEAR1310_PLL3_CLK_SHIFT ,SPEAR1310_PLL_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"vco3_mux_clk" ,NULL ); - clk =clk_register_vco_pll ("vco3_clk" ,"pll3_clk" ,NULL ,"vco3_mux_clk" , +clk_register_clkdev (clk,"vco3_mclk" ,NULL ); + clk =clk_register_vco_pll ("vco3_clk" ,"pll3_clk" ,NULL ,"vco3_mclk" ,0 ,SPEAR1310_PLL3_CTR ,SPEAR1310_PLL3_FRQ , pll_rtbl,ARRAY_SIZE (pll_rtbl), &_lock, &clk1,NULL );clk_register_clkdev (clk,"vco3_clk" ,NULL );
@@ -473,7 +472,7 @@ void __init spear1310_clk_init(void)/* peripherals */ clk_register_fixed_factor (NULL ,"thermal_clk" ,"osc_24m_clk" ,0 ,1 ,128 ); - clk =clk_register_gate (NULL ,"thermal_gate_clk" ,"thermal_clk" ,0 , + clk =clk_register_gate (NULL ,"thermal_gclk" ,"thermal_clk" ,0 ,SPEAR1310_PERIP2_CLK_ENB ,SPEAR1310_THSENS_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"spear_thermal" );
@@ -500,177 +499,176 @@ void __init spear1310_clk_init(void)clk_register_clkdev (clk,"apb_clk" ,NULL );/* gpt clocks */ - clk =clk_register_mux (NULL ,"gpt0_mux_clk" , gpt_parents, + clk =clk_register_mux (NULL ,"gpt0_mclk" , gpt_parents,ARRAY_SIZE (gpt_parents),0 ,SPEAR1310_PERIP_CLK_CFG ,SPEAR1310_GPT0_CLK_SHIFT ,SPEAR1310_GPT_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"gpt0_mux_clk" ,NULL ); - clk =clk_register_gate (NULL ,"gpt0_clk" ,"gpt0_mux_clk" ,0 , +clk_register_clkdev (clk,"gpt0_mclk" ,NULL ); + clk =clk_register_gate (NULL ,"gpt0_clk" ,"gpt0_mclk" ,0 ,SPEAR1310_PERIP1_CLK_ENB ,SPEAR1310_GPT0_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"gpt0" ); - clk =clk_register_mux (NULL ,"gpt1_mux_clk" , gpt_parents, + clk =clk_register_mux (NULL ,"gpt1_mclk" , gpt_parents,ARRAY_SIZE (gpt_parents),0 ,SPEAR1310_PERIP_CLK_CFG ,SPEAR1310_GPT1_CLK_SHIFT ,SPEAR1310_GPT_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"gpt1_mux_clk" ,NULL ); - clk =clk_register_gate (NULL ,"gpt1_clk" ,"gpt1_mux_clk" ,0 , +clk_register_clkdev (clk,"gpt1_mclk" ,NULL ); + clk =clk_register_gate (NULL ,"gpt1_clk" ,"gpt1_mclk" ,0 ,SPEAR1310_PERIP1_CLK_ENB ,SPEAR1310_GPT1_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"gpt1" ); - clk =clk_register_mux (NULL ,"gpt2_mux_clk" , gpt_parents, + clk =clk_register_mux (NULL ,"gpt2_mclk" , gpt_parents,ARRAY_SIZE (gpt_parents),0 ,SPEAR1310_PERIP_CLK_CFG ,SPEAR1310_GPT2_CLK_SHIFT ,SPEAR1310_GPT_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"gpt2_mux_clk" ,NULL ); - clk =clk_register_gate (NULL ,"gpt2_clk" ,"gpt2_mux_clk" ,0 , +clk_register_clkdev (clk,"gpt2_mclk" ,NULL ); + clk =clk_register_gate (NULL ,"gpt2_clk" ,"gpt2_mclk" ,0 ,SPEAR1310_PERIP2_CLK_ENB ,SPEAR1310_GPT2_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"gpt2" ); - clk =clk_register_mux (NULL ,"gpt3_mux_clk" , gpt_parents, + clk =clk_register_mux (NULL ,"gpt3_mclk" , gpt_parents,ARRAY_SIZE (gpt_parents),0 ,SPEAR1310_PERIP_CLK_CFG ,SPEAR1310_GPT3_CLK_SHIFT ,SPEAR1310_GPT_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"gpt3_mux_clk" ,NULL ); - clk =clk_register_gate (NULL ,"gpt3_clk" ,"gpt3_mux_clk" ,0 , +clk_register_clkdev (clk,"gpt3_mclk" ,NULL ); + clk =clk_register_gate (NULL ,"gpt3_clk" ,"gpt3_mclk" ,0 ,SPEAR1310_PERIP2_CLK_ENB ,SPEAR1310_GPT3_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"gpt3" );/* others */ - clk =clk_register_aux ("uart_synth_clk" ,"uart_synth_gate_clk" , -"vco1div2_clk" ,0 ,SPEAR1310_UART_CLK_SYNT ,NULL , - aux_rtbl,ARRAY_SIZE (aux_rtbl), &_lock, &clk1); -clk_register_clkdev (clk,"uart_synth_clk" ,NULL ); -clk_register_clkdev (clk1,"uart_synth_gate_clk" ,NULL ); + clk =clk_register_aux ("uart_syn_clk" ,"uart_syn_gclk" ,"vco1div2_clk" , +0 ,SPEAR1310_UART_CLK_SYNT ,NULL , aux_rtbl, +ARRAY_SIZE (aux_rtbl), &_lock, &clk1); +clk_register_clkdev (clk,"uart_syn_clk" ,NULL ); +clk_register_clkdev (clk1,"uart_syn_gclk" ,NULL ); - clk =clk_register_mux (NULL ,"uart0_mux_clk" , uart0_parents, + clk =clk_register_mux (NULL ,"uart0_mclk" , uart0_parents,ARRAY_SIZE (uart0_parents),0 ,SPEAR1310_PERIP_CLK_CFG ,SPEAR1310_UART_CLK_SHIFT ,SPEAR1310_UART_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"uart0_mux_clk" ,NULL ); +clk_register_clkdev (clk,"uart0_mclk" ,NULL ); - clk =clk_register_gate (NULL ,"uart0_clk" ,"uart0_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"uart0_clk" ,"uart0_mclk" ,0 ,SPEAR1310_PERIP1_CLK_ENB ,SPEAR1310_UART_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"e0000000.serial" ); - clk =clk_register_aux ("sdhci_synth_clk" ,"sdhci_synth_gate_clk" , + clk =clk_register_aux ("sdhci_syn_clk" ,"sdhci_syn_gclk" ,"vco1div2_clk" ,0 ,SPEAR1310_SDHCI_CLK_SYNT ,NULL , aux_rtbl,ARRAY_SIZE (aux_rtbl), &_lock, &clk1); -clk_register_clkdev (clk,"sdhci_synth_clk" ,NULL ); -clk_register_clkdev (clk1,"sdhci_synth_gate_clk" ,NULL ); +clk_register_clkdev (clk,"sdhci_syn_clk" ,NULL ); +clk_register_clkdev (clk1,"sdhci_syn_gclk" ,NULL ); - clk =clk_register_gate (NULL ,"sdhci_clk" ,"sdhci_synth_gate_clk" ,0 , + clk =clk_register_gate (NULL ,"sdhci_clk" ,"sdhci_syn_gclk" ,0 ,SPEAR1310_PERIP1_CLK_ENB ,SPEAR1310_SDHCI_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"b3000000.sdhci" ); - clk =clk_register_aux ("cfxd_synth_clk" ,"cfxd_synth_gate_clk" , -"vco1div2_clk" ,0 ,SPEAR1310_CFXD_CLK_SYNT ,NULL , - aux_rtbl,ARRAY_SIZE (aux_rtbl), &_lock, &clk1); -clk_register_clkdev (clk,"cfxd_synth_clk" ,NULL ); -clk_register_clkdev (clk1,"cfxd_synth_gate_clk" ,NULL ); + clk =clk_register_aux ("cfxd_syn_clk" ,"cfxd_syn_gclk" ,"vco1div2_clk" , +0 ,SPEAR1310_CFXD_CLK_SYNT ,NULL , aux_rtbl, +ARRAY_SIZE (aux_rtbl), &_lock, &clk1); +clk_register_clkdev (clk,"cfxd_syn_clk" ,NULL ); +clk_register_clkdev (clk1,"cfxd_syn_gclk" ,NULL ); - clk =clk_register_gate (NULL ,"cfxd_clk" ,"cfxd_synth_gate_clk" ,0 , + clk =clk_register_gate (NULL ,"cfxd_clk" ,"cfxd_syn_gclk" ,0 ,SPEAR1310_PERIP1_CLK_ENB ,SPEAR1310_CFXD_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"b2800000.cf" );clk_register_clkdev (clk,NULL ,"arasan_xd" ); - clk =clk_register_aux ("c3_synth_clk" ,"c3_synth_gate_clk" , -"vco1div2_clk" ,0 ,SPEAR1310_C3_CLK_SYNT ,NULL , - aux_rtbl,ARRAY_SIZE (aux_rtbl), &_lock, &clk1); -clk_register_clkdev (clk,"c3_synth_clk" ,NULL ); -clk_register_clkdev (clk1,"c3_synth_gate_clk" ,NULL ); + clk =clk_register_aux ("c3_syn_clk" ,"c3_syn_gclk" ,"vco1div2_clk" , +0 ,SPEAR1310_C3_CLK_SYNT ,NULL , aux_rtbl, +ARRAY_SIZE (aux_rtbl), &_lock, &clk1); +clk_register_clkdev (clk,"c3_syn_clk" ,NULL ); +clk_register_clkdev (clk1,"c3_syn_gclk" ,NULL ); - clk =clk_register_mux (NULL ,"c3_mux_clk" , c3_parents, + clk =clk_register_mux (NULL ,"c3_mclk" , c3_parents,ARRAY_SIZE (c3_parents),0 ,SPEAR1310_PERIP_CLK_CFG ,SPEAR1310_C3_CLK_SHIFT ,SPEAR1310_C3_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"c3_mux_clk" ,NULL ); +clk_register_clkdev (clk,"c3_mclk" ,NULL ); - clk =clk_register_gate (NULL ,"c3_clk" ,"c3_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"c3_clk" ,"c3_mclk" ,0 ,SPEAR1310_PERIP1_CLK_ENB ,SPEAR1310_C3_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"c3" );/* gmac */ - clk =clk_register_mux (NULL ,"gmac_phy_input_mux_clk" , - gmac_phy_input_parents, + clk =clk_register_mux (NULL ,"phy_input_mclk" , gmac_phy_input_parents,ARRAY_SIZE (gmac_phy_input_parents),0 ,SPEAR1310_GMAC_CLK_CFG ,SPEAR1310_GMAC_PHY_INPUT_CLK_SHIFT ,SPEAR1310_GMAC_PHY_INPUT_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"gmac_phy_input_mux_clk" ,NULL ); +clk_register_clkdev (clk,"phy_input_mclk" ,NULL ); - clk =clk_register_aux ("gmac_phy_synth_clk" ,"gmac_phy_synth_gate_clk" , -"gmac_phy_input_mux_clk" ,0 ,SPEAR1310_GMAC_CLK_SYNT , -NULL , gmac_rtbl,ARRAY_SIZE (gmac_rtbl), &_lock, &clk1); -clk_register_clkdev (clk,"gmac_phy_synth_clk" ,NULL ); -clk_register_clkdev (clk1,"gmac_phy_synth_gate_clk" ,NULL ); + clk =clk_register_aux ("phy_syn_clk" ,"phy_syn_gclk" ,"phy_input_mclk" , +0 ,SPEAR1310_GMAC_CLK_SYNT ,NULL , gmac_rtbl, +ARRAY_SIZE (gmac_rtbl), &_lock, &clk1); +clk_register_clkdev (clk,"phy_syn_clk" ,NULL ); +clk_register_clkdev (clk1,"phy_syn_gclk" ,NULL ); - clk =clk_register_mux (NULL ,"gmac_phy_mux_clk" , gmac_phy_parents, + clk =clk_register_mux (NULL ,"phy_mclk" , gmac_phy_parents,ARRAY_SIZE (gmac_phy_parents),0 ,SPEAR1310_PERIP_CLK_CFG ,SPEAR1310_GMAC_PHY_CLK_SHIFT ,SPEAR1310_GMAC_PHY_CLK_MASK ,0 , &_lock);clk_register_clkdev (clk,NULL ,"stmmacphy.0" );/* clcd */ - clk =clk_register_mux (NULL ,"clcd_synth_mux_clk" , clcd_synth_parents, + clk =clk_register_mux (NULL ,"clcd_syn_mclk" , clcd_synth_parents,ARRAY_SIZE (clcd_synth_parents),0 ,SPEAR1310_CLCD_CLK_SYNT ,SPEAR1310_CLCD_SYNT_CLK_SHIFT ,SPEAR1310_CLCD_SYNT_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"clcd_synth_mux_clk" ,NULL ); +clk_register_clkdev (clk,"clcd_syn_mclk" ,NULL ); - clk =clk_register_frac ("clcd_synth_clk" ,"clcd_synth_mux_clk" ,0 , + clk =clk_register_frac ("clcd_syn_clk" ,"clcd_syn_mclk" ,0 ,SPEAR1310_CLCD_CLK_SYNT , clcd_rtbl,ARRAY_SIZE (clcd_rtbl), &_lock); -clk_register_clkdev (clk,"clcd_synth_clk" ,NULL ); +clk_register_clkdev (clk,"clcd_syn_clk" ,NULL ); - clk =clk_register_mux (NULL ,"clcd_pixel_mux_clk" , clcd_pixel_parents, + clk =clk_register_mux (NULL ,"clcd_pixel_mclk" , clcd_pixel_parents,ARRAY_SIZE (clcd_pixel_parents),0 ,SPEAR1310_PERIP_CLK_CFG ,SPEAR1310_CLCD_CLK_SHIFT ,SPEAR1310_CLCD_CLK_MASK ,0 , &_lock);clk_register_clkdev (clk,"clcd_pixel_clk" ,NULL ); - clk =clk_register_gate (NULL ,"clcd_clk" ,"clcd_pixel_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"clcd_clk" ,"clcd_pixel_mclk" ,0 ,SPEAR1310_PERIP1_CLK_ENB ,SPEAR1310_CLCD_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,"clcd_clk" ,NULL );/* i2s */ - clk =clk_register_mux (NULL ,"i2s_src_mux_clk" , i2s_src_parents, + clk =clk_register_mux (NULL ,"i2s_src_mclk" , i2s_src_parents,ARRAY_SIZE (i2s_src_parents),0 ,SPEAR1310_I2S_CLK_CFG ,SPEAR1310_I2S_SRC_CLK_SHIFT ,SPEAR1310_I2S_SRC_CLK_MASK ,0 , &_lock);clk_register_clkdev (clk,"i2s_src_clk" ,NULL ); - clk =clk_register_aux ("i2s_prs1_clk" ,NULL ,"i2s_src_mux_clk" ,0 , + clk =clk_register_aux ("i2s_prs1_clk" ,NULL ,"i2s_src_mclk" ,0 ,SPEAR1310_I2S_CLK_CFG , &i2s_prs1_masks, i2s_prs1_rtbl,ARRAY_SIZE (i2s_prs1_rtbl), &_lock,NULL );clk_register_clkdev (clk,"i2s_prs1_clk" ,NULL ); - clk =clk_register_mux (NULL ,"i2s_ref_mux_clk" , i2s_ref_parents, + clk =clk_register_mux (NULL ,"i2s_ref_mclk" , i2s_ref_parents,ARRAY_SIZE (i2s_ref_parents),0 ,SPEAR1310_I2S_CLK_CFG ,SPEAR1310_I2S_REF_SHIFT ,SPEAR1310_I2S_REF_SEL_MASK ,0 , &_lock);clk_register_clkdev (clk,"i2s_ref_clk" ,NULL ); - clk =clk_register_gate (NULL ,"i2s_ref_pad_clk" ,"i2s_ref_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"i2s_ref_pad_clk" ,"i2s_ref_mclk" ,0 ,SPEAR1310_PERIP2_CLK_ENB ,SPEAR1310_I2S_REF_PAD_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,"i2s_ref_pad_clk" ,NULL ); - clk =clk_register_aux ("i2s_sclk_clk" ,"i2s_sclk_gate_clk" , + clk =clk_register_aux ("i2s_sclk_clk" ,"i2s_sclk_gclk" ,"i2s_ref_pad_clk" ,0 ,SPEAR1310_I2S_CLK_CFG , &i2s_sclk_masks, i2s_sclk_rtbl,ARRAY_SIZE (i2s_sclk_rtbl), &_lock, &clk1);clk_register_clkdev (clk,"i2s_sclk_clk" ,NULL ); -clk_register_clkdev (clk1,"i2s_sclk_gate_clk" ,NULL ); +clk_register_clkdev (clk1,"i2s_sclk_gclk" ,NULL );/* clock derived from ahb clk */ clk = clk_register_gate(NULL, "i2c0_clk", "ahb_clk", 0,
@@ -747,13 +745,13 @@ void __init spear1310_clk_init(void) &_lock);clk_register_clkdev (clk,"sysram1_clk" ,NULL ); - clk =clk_register_aux ("adc_synth_clk" ,"adc_synth_gate_clk" ,"ahb_clk" , + clk =clk_register_aux ("adc_syn_clk" ,"adc_syn_gclk" ,"ahb_clk" ,0 ,SPEAR1310_ADC_CLK_SYNT ,NULL , adc_rtbl,ARRAY_SIZE (adc_rtbl), &_lock, &clk1); -clk_register_clkdev (clk,"adc_synth_clk" ,NULL ); -clk_register_clkdev (clk1,"adc_synth_gate_clk" ,NULL ); +clk_register_clkdev (clk,"adc_syn_clk" ,NULL ); +clk_register_clkdev (clk1,"adc_syn_gclk" ,NULL ); - clk =clk_register_gate (NULL ,"adc_clk" ,"adc_synth_gate_clk" ,0 , + clk =clk_register_gate (NULL ,"adc_clk" ,"adc_syn_gclk" ,0 ,SPEAR1310_PERIP1_CLK_ENB ,SPEAR1310_ADC_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"adc_clk" );
@@ -790,37 +788,37 @@ void __init spear1310_clk_init(void)clk_register_clkdev (clk,NULL ,"e0300000.kbd" );/* RAS clks */ - clk =clk_register_mux (NULL ,"gen_synth0_1_mux_clk" , - gen_synth0_1_parents,ARRAY_SIZE (gen_synth0_1_parents), -0 ,SPEAR1310_PLL_CFG ,SPEAR1310_RAS_SYNT0_1_CLK_SHIFT , + clk =clk_register_mux (NULL ,"gen_syn0_1_mclk" , gen_synth0_1_parents, +ARRAY_SIZE (gen_synth0_1_parents),0 ,SPEAR1310_PLL_CFG , +SPEAR1310_RAS_SYNT0_1_CLK_SHIFT ,SPEAR1310_RAS_SYNT_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"gen_synth0_1_clk" ,NULL ); +clk_register_clkdev (clk,"gen_syn0_1_clk" ,NULL ); - clk =clk_register_mux (NULL ,"gen_synth2_3_mux_clk" , - gen_synth2_3_parents,ARRAY_SIZE (gen_synth2_3_parents), -0 ,SPEAR1310_PLL_CFG ,SPEAR1310_RAS_SYNT2_3_CLK_SHIFT , + clk =clk_register_mux (NULL ,"gen_syn2_3_mclk" , gen_synth2_3_parents, +ARRAY_SIZE (gen_synth2_3_parents),0 ,SPEAR1310_PLL_CFG , +SPEAR1310_RAS_SYNT2_3_CLK_SHIFT ,SPEAR1310_RAS_SYNT_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"gen_synth2_3_clk" ,NULL ); +clk_register_clkdev (clk,"gen_syn2_3_clk" ,NULL ); - clk =clk_register_frac ("gen_synth0_clk" ,"gen_synth0_1_clk" ,0 , + clk =clk_register_frac ("gen_syn0_clk" ,"gen_syn0_1_clk" ,0 ,SPEAR1310_RAS_CLK_SYNT0 , gen_rtbl,ARRAY_SIZE (gen_rtbl), &_lock); -clk_register_clkdev (clk,"gen_synth0_clk" ,NULL ); +clk_register_clkdev (clk,"gen_syn0_clk" ,NULL ); - clk =clk_register_frac ("gen_synth1_clk" ,"gen_synth0_1_clk" ,0 , + clk =clk_register_frac ("gen_syn1_clk" ,"gen_syn0_1_clk" ,0 ,SPEAR1310_RAS_CLK_SYNT1 , gen_rtbl,ARRAY_SIZE (gen_rtbl), &_lock); -clk_register_clkdev (clk,"gen_synth1_clk" ,NULL ); +clk_register_clkdev (clk,"gen_syn1_clk" ,NULL ); - clk =clk_register_frac ("gen_synth2_clk" ,"gen_synth2_3_clk" ,0 , + clk =clk_register_frac ("gen_syn2_clk" ,"gen_syn2_3_clk" ,0 ,SPEAR1310_RAS_CLK_SYNT2 , gen_rtbl,ARRAY_SIZE (gen_rtbl), &_lock); -clk_register_clkdev (clk,"gen_synth2_clk" ,NULL ); +clk_register_clkdev (clk,"gen_syn2_clk" ,NULL ); - clk =clk_register_frac ("gen_synth3_clk" ,"gen_synth2_3_clk" ,0 , + clk =clk_register_frac ("gen_syn3_clk" ,"gen_syn2_3_clk" ,0 ,SPEAR1310_RAS_CLK_SYNT3 , gen_rtbl,ARRAY_SIZE (gen_rtbl), &_lock); -clk_register_clkdev (clk,"gen_synth3_clk" ,NULL ); +clk_register_clkdev (clk,"gen_syn3_clk" ,NULL ); clk = clk_register_gate(NULL, "ras_osc_24m_clk", "osc_24m_clk", 0, SPEAR1310_RAS_CLK_ENB, SPEAR1310_OSC_24M_CLK_ENB, 0,
@@ -847,7 +845,7 @@ void __init spear1310_clk_init(void) &_lock);clk_register_clkdev (clk,"ras_pll3_clk" ,NULL ); - clk =clk_register_gate (NULL ,"ras_tx125_clk" ,"gmii_125m_pad_clk" ,0 , + clk =clk_register_gate (NULL ,"ras_tx125_clk" ,"gmii_pad_clk" ,0 ,SPEAR1310_RAS_CLK_ENB ,SPEAR1310_C125M_PAD_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,"ras_tx125_clk" ,NULL );
@@ -912,7 +910,7 @@ void __init spear1310_clk_init(void) &_lock);clk_register_clkdev (clk,NULL ,"5c700000.eth" ); - clk = clk_register_mux(NULL, "smii_rgmii_phy_mux_clk", + clk = clk_register_mux(NULL, "smii_rgmii_phy_mclk", smii_rgmii_phy_parents, ARRAY_SIZE(smii_rgmii_phy_parents), 0, SPEAR1310_RAS_CTRL_REG1,
@@ -922,184 +920,184 @@ void __init spear1310_clk_init(void)clk_register_clkdev (clk,NULL ,"stmmacphy.2" );clk_register_clkdev (clk,NULL ,"stmmacphy.4" ); - clk =clk_register_mux (NULL ,"rmii_phy_mux_clk" , rmii_phy_parents, + clk =clk_register_mux (NULL ,"rmii_phy_mclk" , rmii_phy_parents,ARRAY_SIZE (rmii_phy_parents),0 ,SPEAR1310_RAS_CTRL_REG1 ,SPEAR1310_RMII_PHY_CLK_SHIFT ,SPEAR1310_PHY_CLK_MASK ,0 , &_lock);clk_register_clkdev (clk,NULL ,"stmmacphy.3" ); - clk =clk_register_mux (NULL ,"uart1_mux_clk" , uart_parents, + clk =clk_register_mux (NULL ,"uart1_mclk" , uart_parents,ARRAY_SIZE (uart_parents),0 ,SPEAR1310_RAS_CTRL_REG0 ,SPEAR1310_UART1_CLK_SHIFT ,SPEAR1310_RAS_UART_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"uart1_mux_clk" ,NULL ); +clk_register_clkdev (clk,"uart1_mclk" ,NULL ); - clk =clk_register_gate (NULL ,"uart1_clk" ,"uart1_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"uart1_clk" ,"uart1_mclk" ,0 ,SPEAR1310_RAS_SW_CLK_CTRL ,SPEAR1310_UART1_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"5c800000.serial" ); - clk =clk_register_mux (NULL ,"uart2_mux_clk" , uart_parents, + clk =clk_register_mux (NULL ,"uart2_mclk" , uart_parents,ARRAY_SIZE (uart_parents),0 ,SPEAR1310_RAS_CTRL_REG0 ,SPEAR1310_UART2_CLK_SHIFT ,SPEAR1310_RAS_UART_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"uart2_mux_clk" ,NULL ); +clk_register_clkdev (clk,"uart2_mclk" ,NULL ); - clk =clk_register_gate (NULL ,"uart2_clk" ,"uart2_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"uart2_clk" ,"uart2_mclk" ,0 ,SPEAR1310_RAS_SW_CLK_CTRL ,SPEAR1310_UART2_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"5c900000.serial" ); - clk =clk_register_mux (NULL ,"uart3_mux_clk" , uart_parents, + clk =clk_register_mux (NULL ,"uart3_mclk" , uart_parents,ARRAY_SIZE (uart_parents),0 ,SPEAR1310_RAS_CTRL_REG0 ,SPEAR1310_UART3_CLK_SHIFT ,SPEAR1310_RAS_UART_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"uart3_mux_clk" ,NULL ); +clk_register_clkdev (clk,"uart3_mclk" ,NULL ); - clk =clk_register_gate (NULL ,"uart3_clk" ,"uart3_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"uart3_clk" ,"uart3_mclk" ,0 ,SPEAR1310_RAS_SW_CLK_CTRL ,SPEAR1310_UART3_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"5ca00000.serial" ); - clk =clk_register_mux (NULL ,"uart4_mux_clk" , uart_parents, + clk =clk_register_mux (NULL ,"uart4_mclk" , uart_parents,ARRAY_SIZE (uart_parents),0 ,SPEAR1310_RAS_CTRL_REG0 ,SPEAR1310_UART4_CLK_SHIFT ,SPEAR1310_RAS_UART_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"uart4_mux_clk" ,NULL ); +clk_register_clkdev (clk,"uart4_mclk" ,NULL ); - clk =clk_register_gate (NULL ,"uart4_clk" ,"uart4_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"uart4_clk" ,"uart4_mclk" ,0 ,SPEAR1310_RAS_SW_CLK_CTRL ,SPEAR1310_UART4_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"5cb00000.serial" ); - clk =clk_register_mux (NULL ,"uart5_mux_clk" , uart_parents, + clk =clk_register_mux (NULL ,"uart5_mclk" , uart_parents,ARRAY_SIZE (uart_parents),0 ,SPEAR1310_RAS_CTRL_REG0 ,SPEAR1310_UART5_CLK_SHIFT ,SPEAR1310_RAS_UART_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"uart5_mux_clk" ,NULL ); +clk_register_clkdev (clk,"uart5_mclk" ,NULL ); - clk =clk_register_gate (NULL ,"uart5_clk" ,"uart5_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"uart5_clk" ,"uart5_mclk" ,0 ,SPEAR1310_RAS_SW_CLK_CTRL ,SPEAR1310_UART5_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"5cc00000.serial" ); - clk =clk_register_mux (NULL ,"i2c1_mux_clk" , i2c_parents, + clk =clk_register_mux (NULL ,"i2c1_mclk" , i2c_parents,ARRAY_SIZE (i2c_parents),0 ,SPEAR1310_RAS_CTRL_REG0 ,SPEAR1310_I2C1_CLK_SHIFT ,SPEAR1310_I2C_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"i2c1_mux_clk" ,NULL ); +clk_register_clkdev (clk,"i2c1_mclk" ,NULL ); - clk =clk_register_gate (NULL ,"i2c1_clk" ,"i2c1_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"i2c1_clk" ,"i2c1_mclk" ,0 ,SPEAR1310_RAS_SW_CLK_CTRL ,SPEAR1310_I2C1_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"5cd00000.i2c" ); - clk =clk_register_mux (NULL ,"i2c2_mux_clk" , i2c_parents, + clk =clk_register_mux (NULL ,"i2c2_mclk" , i2c_parents,ARRAY_SIZE (i2c_parents),0 ,SPEAR1310_RAS_CTRL_REG0 ,SPEAR1310_I2C2_CLK_SHIFT ,SPEAR1310_I2C_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"i2c2_mux_clk" ,NULL ); +clk_register_clkdev (clk,"i2c2_mclk" ,NULL ); - clk =clk_register_gate (NULL ,"i2c2_clk" ,"i2c2_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"i2c2_clk" ,"i2c2_mclk" ,0 ,SPEAR1310_RAS_SW_CLK_CTRL ,SPEAR1310_I2C2_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"5ce00000.i2c" ); - clk =clk_register_mux (NULL ,"i2c3_mux_clk" , i2c_parents, + clk =clk_register_mux (NULL ,"i2c3_mclk" , i2c_parents,ARRAY_SIZE (i2c_parents),0 ,SPEAR1310_RAS_CTRL_REG0 ,SPEAR1310_I2C3_CLK_SHIFT ,SPEAR1310_I2C_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"i2c3_mux_clk" ,NULL ); +clk_register_clkdev (clk,"i2c3_mclk" ,NULL ); - clk =clk_register_gate (NULL ,"i2c3_clk" ,"i2c3_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"i2c3_clk" ,"i2c3_mclk" ,0 ,SPEAR1310_RAS_SW_CLK_CTRL ,SPEAR1310_I2C3_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"5cf00000.i2c" ); - clk =clk_register_mux (NULL ,"i2c4_mux_clk" , i2c_parents, + clk =clk_register_mux (NULL ,"i2c4_mclk" , i2c_parents,ARRAY_SIZE (i2c_parents),0 ,SPEAR1310_RAS_CTRL_REG0 ,SPEAR1310_I2C4_CLK_SHIFT ,SPEAR1310_I2C_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"i2c4_mux_clk" ,NULL ); +clk_register_clkdev (clk,"i2c4_mclk" ,NULL ); - clk =clk_register_gate (NULL ,"i2c4_clk" ,"i2c4_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"i2c4_clk" ,"i2c4_mclk" ,0 ,SPEAR1310_RAS_SW_CLK_CTRL ,SPEAR1310_I2C4_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"5d000000.i2c" ); - clk =clk_register_mux (NULL ,"i2c5_mux_clk" , i2c_parents, + clk =clk_register_mux (NULL ,"i2c5_mclk" , i2c_parents,ARRAY_SIZE (i2c_parents),0 ,SPEAR1310_RAS_CTRL_REG0 ,SPEAR1310_I2C5_CLK_SHIFT ,SPEAR1310_I2C_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"i2c5_mux_clk" ,NULL ); +clk_register_clkdev (clk,"i2c5_mclk" ,NULL ); - clk =clk_register_gate (NULL ,"i2c5_clk" ,"i2c5_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"i2c5_clk" ,"i2c5_mclk" ,0 ,SPEAR1310_RAS_SW_CLK_CTRL ,SPEAR1310_I2C5_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"5d100000.i2c" ); - clk =clk_register_mux (NULL ,"i2c6_mux_clk" , i2c_parents, + clk =clk_register_mux (NULL ,"i2c6_mclk" , i2c_parents,ARRAY_SIZE (i2c_parents),0 ,SPEAR1310_RAS_CTRL_REG0 ,SPEAR1310_I2C6_CLK_SHIFT ,SPEAR1310_I2C_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"i2c6_mux_clk" ,NULL ); +clk_register_clkdev (clk,"i2c6_mclk" ,NULL ); - clk =clk_register_gate (NULL ,"i2c6_clk" ,"i2c6_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"i2c6_clk" ,"i2c6_mclk" ,0 ,SPEAR1310_RAS_SW_CLK_CTRL ,SPEAR1310_I2C6_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"5d200000.i2c" ); - clk =clk_register_mux (NULL ,"i2c7_mux_clk" , i2c_parents, + clk =clk_register_mux (NULL ,"i2c7_mclk" , i2c_parents,ARRAY_SIZE (i2c_parents),0 ,SPEAR1310_RAS_CTRL_REG0 ,SPEAR1310_I2C7_CLK_SHIFT ,SPEAR1310_I2C_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"i2c7_mux_clk" ,NULL ); +clk_register_clkdev (clk,"i2c7_mclk" ,NULL ); - clk =clk_register_gate (NULL ,"i2c7_clk" ,"i2c7_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"i2c7_clk" ,"i2c7_mclk" ,0 ,SPEAR1310_RAS_SW_CLK_CTRL ,SPEAR1310_I2C7_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"5d300000.i2c" ); - clk =clk_register_mux (NULL ,"ssp1_mux_clk" , ssp1_parents, + clk =clk_register_mux (NULL ,"ssp1_mclk" , ssp1_parents,ARRAY_SIZE (ssp1_parents),0 ,SPEAR1310_RAS_CTRL_REG0 ,SPEAR1310_SSP1_CLK_SHIFT ,SPEAR1310_SSP1_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"ssp1_mux_clk" ,NULL ); +clk_register_clkdev (clk,"ssp1_mclk" ,NULL ); - clk =clk_register_gate (NULL ,"ssp1_clk" ,"ssp1_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"ssp1_clk" ,"ssp1_mclk" ,0 ,SPEAR1310_RAS_SW_CLK_CTRL ,SPEAR1310_SSP1_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"5d400000.spi" ); - clk =clk_register_mux (NULL ,"pci_mux_clk" , pci_parents, + clk =clk_register_mux (NULL ,"pci_mclk" , pci_parents,ARRAY_SIZE (pci_parents),0 ,SPEAR1310_RAS_CTRL_REG0 ,SPEAR1310_PCI_CLK_SHIFT ,SPEAR1310_PCI_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"pci_mux_clk" ,NULL ); +clk_register_clkdev (clk,"pci_mclk" ,NULL ); - clk =clk_register_gate (NULL ,"pci_clk" ,"pci_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"pci_clk" ,"pci_mclk" ,0 ,SPEAR1310_RAS_SW_CLK_CTRL ,SPEAR1310_PCI_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"pci" ); - clk =clk_register_mux (NULL ,"tdm1_mux_clk" , tdm_parents, + clk =clk_register_mux (NULL ,"tdm1_mclk" , tdm_parents,ARRAY_SIZE (tdm_parents),0 ,SPEAR1310_RAS_CTRL_REG0 ,SPEAR1310_TDM1_CLK_SHIFT ,SPEAR1310_TDM_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"tdm1_mux_clk" ,NULL ); +clk_register_clkdev (clk,"tdm1_mclk" ,NULL ); - clk =clk_register_gate (NULL ,"tdm1_clk" ,"tdm1_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"tdm1_clk" ,"tdm1_mclk" ,0 ,SPEAR1310_RAS_SW_CLK_CTRL ,SPEAR1310_TDM1_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"tdm_hdlc.0" ); - clk =clk_register_mux (NULL ,"tdm2_mux_clk" , tdm_parents, + clk =clk_register_mux (NULL ,"tdm2_mclk" , tdm_parents,ARRAY_SIZE (tdm_parents),0 ,SPEAR1310_RAS_CTRL_REG0 ,SPEAR1310_TDM2_CLK_SHIFT ,SPEAR1310_TDM_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"tdm2_mux_clk" ,NULL ); +clk_register_clkdev (clk,"tdm2_mclk" ,NULL ); - clk =clk_register_gate (NULL ,"tdm2_clk" ,"tdm2_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"tdm2_clk" ,"tdm2_mclk" ,0 ,SPEAR1310_RAS_SW_CLK_CTRL ,SPEAR1310_TDM2_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"tdm_hdlc.1" );
Signature · 1 line
1.7.2.2
PATCH 3/4 Clk:spear3xx:Fix: Rename clk ids within predefined limit
In reply to Vipul Kumar SamarThe max limit of con_id is 16 and dev_id is 20. As of now for spear3xx, many clk ids are exceeding this predefined limit.
This patch is intended to rename clk ids like:
mux_clk -> _mclk
gate_clk -> _gclk
synth_clk -> syn_clk
ras_gen1_synth_gate_clk -> ras_syn1_gclk
ras_pll3_48m -> ras_pll3_--- drivers/clk/spear/spear3xx_clock.c | 180 +++++++++++++++++------------------- 1 files changed, 86 insertions(+), 94 deletions(-)
drivers/clk/spear/spear3xx_clock.c +86 -94
@@ -122,12 +122,12 @@ static struct gpt_rate_tbl gpt_rtbl[] = { };/* clock parents */ -static const char *uart0_parents[] = {"pll3_48m_clk" ,"uart_synth_gate_clk" , }; -static const char *firda_parents[] = {"pll3_48m_clk" ,"firda_synth_gate_clk" , +static const char *uart0_parents[] = {"pll3_clk" ,"uart_syn_gclk" , }; +static const char *firda_parents[] = {"pll3_clk" ,"firda_syn_gclk" , }; -static const char *gpt0_parents[] = {"pll3_48m_clk" ,"gpt0_synth_clk" , }; -static const char *gpt1_parents[] = {"pll3_48m_clk" ,"gpt1_synth_clk" , }; -static const char *gpt2_parents[] = {"pll3_48m_clk" ,"gpt2_synth_clk" , }; +static const char *gpt0_parents[] = {"pll3_clk" ,"gpt0_syn_clk" , }; +static const char *gpt1_parents[] = {"pll3_clk" ,"gpt1_syn_clk" , }; +static const char *gpt2_parents[] = {"pll3_clk" ,"gpt2_syn_clk" , };static const char *gen2_3_parents[] = {"pll1_clk" ,"pll2_clk" , };static const char *ddr_parents[] = {"ahb_clk" ,"ahbmult2_clk" ,"none" ,"pll2_clk" , };
@@ -137,7 +137,7 @@ static void __init spear300_clk_init(void) {struct clk *clk; - clk =clk_register_fixed_factor (NULL ,"clcd_clk" ,"ras_pll3_48m_clk" ,0 , + clk =clk_register_fixed_factor (NULL ,"clcd_clk" ,"ras_pll3_clk" ,0 ,1 ,1 );clk_register_clkdev (clk,NULL ,"60000000.clcd" );
@@ -219,15 +219,11 @@ static void __init spear310_clk_init(void)#define SPEAR320_UARTX_PCLK_VAL_SYNTH1 0x0#define SPEAR320_UARTX_PCLK_VAL_APB 0x1 -static const char *i2s_ref_parents[] = {"ras_pll2_clk" , -"ras_gen2_synth_gate_clk" , }; -static const char *sdhci_parents[] = {"ras_pll3_48m_clk" , -"ras_gen3_synth_gate_clk" , -}; +static const char *i2s_ref_parents[] = {"ras_pll2_clk" ,"ras_syn2_gclk" , }; +static const char *sdhci_parents[] = {"ras_pll3_clk" ,"ras_syn3_gclk" , };static const char *smii0_parents[] = {"smii_125m_pad" ,"ras_pll2_clk" , -"ras_gen0_synth_gate_clk" , }; -static const char *uartx_parents[] = {"ras_gen1_synth_gate_clk" ,"ras_apb_clk" , -}; +"ras_syn0_gclk" , }; +static const char *uartx_parents[] = {"ras_syn1_gclk" ,"ras_apb_clk" , };static void __init spear320_clk_init (void ) {
@@ -237,7 +233,7 @@ static void __init spear320_clk_init(void) CLK_IS_ROOT, 125000000);clk_register_clkdev (clk,"smii_125m_pad" ,NULL ); - clk =clk_register_fixed_factor (NULL ,"clcd_clk" ,"ras_pll3_48m_clk" ,0 , + clk =clk_register_fixed_factor (NULL ,"clcd_clk" ,"ras_pll3_clk" ,0 ,1 ,1 );clk_register_clkdev (clk,NULL ,"90000000.clcd" );
@@ -363,9 +359,9 @@ void __init spear3xx_clk_init(void)clk_register_clkdev (clk,NULL ,"fc900000.rtc" );/* clock derived from 24 MHz osc clk */ - clk =clk_register_fixed_rate (NULL ,"pll3_48m_clk" ,"osc_24m_clk" ,0 , + clk =clk_register_fixed_rate (NULL ,"pll3_clk" ,"osc_24m_clk" ,0 ,48000000 ); -clk_register_clkdev (clk,"pll3_48m_clk" ,NULL ); +clk_register_clkdev (clk,"pll3_clk" ,NULL ); clk =clk_register_fixed_factor (NULL ,"wdt_clk" ,"osc_24m_clk" ,0 ,1 ,1 );
@@ -392,98 +388,98 @@ void __init spear3xx_clk_init(void) HCLK_RATIO_MASK, 0, &_lock);clk_register_clkdev (clk,"ahb_clk" ,NULL ); - clk =clk_register_aux ("uart_synth_clk" ,"uart_synth_gate_clk" , -"pll1_clk" ,0 ,UART_CLK_SYNT ,NULL , aux_rtbl, -ARRAY_SIZE (aux_rtbl), &_lock, &clk1); -clk_register_clkdev (clk,"uart_synth_clk" ,NULL ); -clk_register_clkdev (clk1,"uart_synth_gate_clk" ,NULL ); + clk =clk_register_aux ("uart_syn_clk" ,"uart_syn_gclk" ,"pll1_clk" ,0 , +UART_CLK_SYNT ,NULL , aux_rtbl,ARRAY_SIZE (aux_rtbl), + &_lock, &clk1); +clk_register_clkdev (clk,"uart_syn_clk" ,NULL ); +clk_register_clkdev (clk1,"uart_syn_gclk" ,NULL ); - clk =clk_register_mux (NULL ,"uart0_mux_clk" , uart0_parents, + clk =clk_register_mux (NULL ,"uart0_mclk" , uart0_parents,ARRAY_SIZE (uart0_parents),0 ,PERIP_CLK_CFG ,UART_CLK_SHIFT ,UART_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"uart0_mux_clk" ,NULL ); +clk_register_clkdev (clk,"uart0_mclk" ,NULL ); - clk =clk_register_gate (NULL ,"uart0" ,"uart0_mux_clk" ,0 , -PERIP1_CLK_ENB ,UART_CLK_ENB ,0 , &_lock); + clk =clk_register_gate (NULL ,"uart0" ,"uart0_mclk" ,0 ,PERIP1_CLK_ENB , +UART_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"d0000000.serial" ); - clk =clk_register_aux ("firda_synth_clk" ,"firda_synth_gate_clk" , -"pll1_clk" ,0 ,FIRDA_CLK_SYNT ,NULL , aux_rtbl, -ARRAY_SIZE (aux_rtbl), &_lock, &clk1); -clk_register_clkdev (clk,"firda_synth_clk" ,NULL ); -clk_register_clkdev (clk1,"firda_synth_gate_clk" ,NULL ); + clk =clk_register_aux ("firda_syn_clk" ,"firda_syn_gclk" ,"pll1_clk" ,0 , +FIRDA_CLK_SYNT ,NULL , aux_rtbl,ARRAY_SIZE (aux_rtbl), + &_lock, &clk1); +clk_register_clkdev (clk,"firda_syn_clk" ,NULL ); +clk_register_clkdev (clk1,"firda_syn_gclk" ,NULL ); - clk =clk_register_mux (NULL ,"firda_mux_clk" , firda_parents, + clk =clk_register_mux (NULL ,"firda_mclk" , firda_parents,ARRAY_SIZE (firda_parents),0 ,PERIP_CLK_CFG ,FIRDA_CLK_SHIFT ,FIRDA_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"firda_mux_clk" ,NULL ); +clk_register_clkdev (clk,"firda_mclk" ,NULL ); - clk =clk_register_gate (NULL ,"firda_clk" ,"firda_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"firda_clk" ,"firda_mclk" ,0 ,PERIP1_CLK_ENB ,FIRDA_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"firda" );/* gpt clocks */ -clk_register_gpt ("gpt0_synth_clk" ,"pll1_clk" ,0 ,PRSC0_CLK_CFG , - gpt_rtbl,ARRAY_SIZE (gpt_rtbl), &_lock); +clk_register_gpt ("gpt0_syn_clk" ,"pll1_clk" ,0 ,PRSC0_CLK_CFG , gpt_rtbl, +ARRAY_SIZE (gpt_rtbl), &_lock); clk =clk_register_mux (NULL ,"gpt0_clk" , gpt0_parents,ARRAY_SIZE (gpt0_parents),0 ,PERIP_CLK_CFG ,GPT0_CLK_SHIFT ,GPT_CLK_MASK ,0 , &_lock);clk_register_clkdev (clk,NULL ,"gpt0" ); -clk_register_gpt ("gpt1_synth_clk" ,"pll1_clk" ,0 ,PRSC1_CLK_CFG , - gpt_rtbl,ARRAY_SIZE (gpt_rtbl), &_lock); - clk =clk_register_mux (NULL ,"gpt1_mux_clk" , gpt1_parents, +clk_register_gpt ("gpt1_syn_clk" ,"pll1_clk" ,0 ,PRSC1_CLK_CFG , gpt_rtbl, +ARRAY_SIZE (gpt_rtbl), &_lock); + clk =clk_register_mux (NULL ,"gpt1_mclk" , gpt1_parents,ARRAY_SIZE (gpt1_parents),0 ,PERIP_CLK_CFG ,GPT1_CLK_SHIFT ,GPT_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"gpt1_mux_clk" ,NULL ); - clk =clk_register_gate (NULL ,"gpt1_clk" ,"gpt1_mux_clk" ,0 , +clk_register_clkdev (clk,"gpt1_mclk" ,NULL ); + clk =clk_register_gate (NULL ,"gpt1_clk" ,"gpt1_mclk" ,0 ,PERIP1_CLK_ENB ,GPT1_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"gpt1" ); -clk_register_gpt ("gpt2_synth_clk" ,"pll1_clk" ,0 ,PRSC2_CLK_CFG , - gpt_rtbl,ARRAY_SIZE (gpt_rtbl), &_lock); - clk =clk_register_mux (NULL ,"gpt2_mux_clk" , gpt2_parents, +clk_register_gpt ("gpt2_syn_clk" ,"pll1_clk" ,0 ,PRSC2_CLK_CFG , gpt_rtbl, +ARRAY_SIZE (gpt_rtbl), &_lock); + clk =clk_register_mux (NULL ,"gpt2_mclk" , gpt2_parents,ARRAY_SIZE (gpt2_parents),0 ,PERIP_CLK_CFG ,GPT2_CLK_SHIFT ,GPT_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"gpt2_mux_clk" ,NULL ); - clk =clk_register_gate (NULL ,"gpt2_clk" ,"gpt2_mux_clk" ,0 , +clk_register_clkdev (clk,"gpt2_mclk" ,NULL ); + clk =clk_register_gate (NULL ,"gpt2_clk" ,"gpt2_mclk" ,0 ,PERIP1_CLK_ENB ,GPT2_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"gpt2" );/* general synths clocks */ - clk =clk_register_aux ("gen0_synth_clk" ,"gen0_synth_gate_clk" , -"pll1_clk" ,0 ,GEN0_CLK_SYNT ,NULL , aux_rtbl, -ARRAY_SIZE (aux_rtbl), &_lock, &clk1); -clk_register_clkdev (clk,"gen0_synth_clk" ,NULL ); -clk_register_clkdev (clk1,"gen0_synth_gate_clk" ,NULL ); - - clk =clk_register_aux ("gen1_synth_clk" ,"gen1_synth_gate_clk" , -"pll1_clk" ,0 ,GEN1_CLK_SYNT ,NULL , aux_rtbl, -ARRAY_SIZE (aux_rtbl), &_lock, &clk1); -clk_register_clkdev (clk,"gen1_synth_clk" ,NULL ); -clk_register_clkdev (clk1,"gen1_synth_gate_clk" ,NULL ); - - clk =clk_register_mux (NULL ,"gen2_3_parent_clk" , gen2_3_parents, + clk =clk_register_aux ("gen0_syn_clk" ,"gen0_syn_gclk" ,"pll1_clk" , +0 ,GEN0_CLK_SYNT ,NULL , aux_rtbl,ARRAY_SIZE (aux_rtbl), + &_lock, &clk1); +clk_register_clkdev (clk,"gen0_syn_clk" ,NULL ); +clk_register_clkdev (clk1,"gen0_syn_gclk" ,NULL ); + + clk =clk_register_aux ("gen1_syn_clk" ,"gen1_syn_gclk" ,"pll1_clk" , +0 ,GEN1_CLK_SYNT ,NULL , aux_rtbl,ARRAY_SIZE (aux_rtbl), + &_lock, &clk1); +clk_register_clkdev (clk,"gen1_syn_clk" ,NULL ); +clk_register_clkdev (clk1,"gen1_syn_gclk" ,NULL ); + + clk =clk_register_mux (NULL ,"gen2_3_par_clk" , gen2_3_parents,ARRAY_SIZE (gen2_3_parents),0 ,CORE_CLK_CFG ,GEN_SYNTH2_3_CLK_SHIFT ,GEN_SYNTH2_3_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"gen2_3_parent_clk" ,NULL ); +clk_register_clkdev (clk,"gen2_3_par_clk" ,NULL ); - clk =clk_register_aux ("gen2_synth_clk" ,"gen2_synth_gate_clk" , -"gen2_3_parent_clk" ,0 ,GEN2_CLK_SYNT ,NULL , aux_rtbl, + clk =clk_register_aux ("gen2_syn_clk" ,"gen2_syn_gclk" , +"gen2_3_par_clk" ,0 ,GEN2_CLK_SYNT ,NULL , aux_rtbl,ARRAY_SIZE (aux_rtbl), &_lock, &clk1); -clk_register_clkdev (clk,"gen2_synth_clk" ,NULL ); -clk_register_clkdev (clk1,"gen2_synth_gate_clk" ,NULL ); +clk_register_clkdev (clk,"gen2_syn_clk" ,NULL ); +clk_register_clkdev (clk1,"gen2_syn_gclk" ,NULL ); - clk =clk_register_aux ("gen3_synth_clk" ,"gen3_synth_gate_clk" , -"gen2_3_parent_clk" ,0 ,GEN3_CLK_SYNT ,NULL , aux_rtbl, + clk =clk_register_aux ("gen3_syn_clk" ,"gen3_syn_gclk" , +"gen2_3_par_clk" ,0 ,GEN3_CLK_SYNT ,NULL , aux_rtbl,ARRAY_SIZE (aux_rtbl), &_lock, &clk1); -clk_register_clkdev (clk,"gen3_synth_clk" ,NULL ); -clk_register_clkdev (clk1,"gen3_synth_gate_clk" ,NULL ); +clk_register_clkdev (clk,"gen3_syn_clk" ,NULL ); +clk_register_clkdev (clk1,"gen3_syn_gclk" ,NULL );/* clock derived from pll3 clk */ - clk =clk_register_gate (NULL ,"usbh_clk" ,"pll3_48m_clk" ,0 , -PERIP1_CLK_ENB ,USBH_CLK_ENB ,0 , &_lock); + clk =clk_register_gate (NULL ,"usbh_clk" ,"pll3_clk" ,0 ,PERIP1_CLK_ENB , +USBH_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,"usbh_clk" ,NULL ); clk = clk_register_fixed_factor(NULL, "usbh.0_clk", "usbh_clk", 0, 1,
@@ -494,8 +490,8 @@ void __init spear3xx_clk_init(void) 1);clk_register_clkdev (clk,"usbh.1_clk" ,NULL ); - clk =clk_register_gate (NULL ,"usbd_clk" ,"pll3_48m_clk" ,0 , -PERIP1_CLK_ENB ,USBD_CLK_ENB ,0 , &_lock); + clk =clk_register_gate (NULL ,"usbd_clk" ,"pll3_clk" ,0 ,PERIP1_CLK_ENB , +USBD_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"designware_udc" );/* clock derived from ahb clk */
@@ -579,29 +575,25 @@ void __init spear3xx_clk_init(void) RAS_CLK_ENB, RAS_PLL2_CLK_ENB, 0, &_lock);clk_register_clkdev (clk,"ras_pll2_clk" ,NULL ); - clk =clk_register_gate (NULL ,"ras_pll3_48m_clk" ,"pll3_48m_clk" ,0 , + clk =clk_register_gate (NULL ,"ras_pll3_clk" ,"pll3_clk" ,0 ,RAS_CLK_ENB ,RAS_48M_CLK_ENB ,0 , &_lock); -clk_register_clkdev (clk,"ras_pll3_48m_clk" ,NULL ); - - clk =clk_register_gate (NULL ,"ras_gen0_synth_gate_clk" , -"gen0_synth_gate_clk" ,0 ,RAS_CLK_ENB , -RAS_SYNT0_CLK_ENB ,0 , &_lock); -clk_register_clkdev (clk,"ras_gen0_synth_gate_clk" ,NULL ); - - clk =clk_register_gate (NULL ,"ras_gen1_synth_gate_clk" , -"gen1_synth_gate_clk" ,0 ,RAS_CLK_ENB , -RAS_SYNT1_CLK_ENB ,0 , &_lock); -clk_register_clkdev (clk,"ras_gen1_synth_gate_clk" ,NULL ); - - clk =clk_register_gate (NULL ,"ras_gen2_synth_gate_clk" , -"gen2_synth_gate_clk" ,0 ,RAS_CLK_ENB , -RAS_SYNT2_CLK_ENB ,0 , &_lock); -clk_register_clkdev (clk,"ras_gen2_synth_gate_clk" ,NULL ); - - clk =clk_register_gate (NULL ,"ras_gen3_synth_gate_clk" , -"gen3_synth_gate_clk" ,0 ,RAS_CLK_ENB , -RAS_SYNT3_CLK_ENB ,0 , &_lock); -clk_register_clkdev (clk,"ras_gen3_synth_gate_clk" ,NULL ); +clk_register_clkdev (clk,"ras_pll3_clk" ,NULL ); + + clk =clk_register_gate (NULL ,"ras_syn0_gclk" ,"gen0_syn_gclk" ,0 , +RAS_CLK_ENB ,RAS_SYNT0_CLK_ENB ,0 , &_lock); +clk_register_clkdev (clk,"ras_syn0_gclk" ,NULL ); + + clk =clk_register_gate (NULL ,"ras_syn1_gclk" ,"gen1_syn_gclk" ,0 , +RAS_CLK_ENB ,RAS_SYNT1_CLK_ENB ,0 , &_lock); +clk_register_clkdev (clk,"ras_syn1_gclk" ,NULL ); + + clk =clk_register_gate (NULL ,"ras_syn2_gclk" ,"gen2_syn_gclk" ,0 , +RAS_CLK_ENB ,RAS_SYNT2_CLK_ENB ,0 , &_lock); +clk_register_clkdev (clk,"ras_syn2_gclk" ,NULL ); + + clk =clk_register_gate (NULL ,"ras_syn3_gclk" ,"gen3_syn_gclk" ,0 , +RAS_CLK_ENB ,RAS_SYNT3_CLK_ENB ,0 , &_lock); +clk_register_clkdev (clk,"ras_syn3_gclk" ,NULL );if (of_machine_is_compatible ("st,spear300" ))spear300_clk_init ();
Signature · 1 line
1.7.2.2
PATCH 4/4 Clk:spear6xx:Fix: Rename clk ids within predefined limit
In reply to Vipul Kumar SamarThe max limit of con_id is 16 and dev_id is 20. As of now for spear6xx, many clk ids are exceeding this predefined limit.
This patch is intended to rename clk ids like:
mux_clk -> _mclk
gate_clk -> _gclk
synth_clk -> syn_clk
ras_gen1_synth_gate_clk -> ras_syn1_gclk--- drivers/clk/spear/spear6xx_clock.c | 122 ++++++++++++++++++------------------ 1 files changed, 60 insertions(+), 62 deletions(-)
drivers/clk/spear/spear6xx_clock.c +60 -62
@@ -97,13 +97,12 @@ static struct aux_rate_tbl aux_rtbl[] = { {.xscale = 1, .yscale = 2, .eq = 1}, /* 166 MHz */ }; -static const char *clcd_parents[] = {"pll3_48m_clk" ,"clcd_synth_gate_clk" , }; -static const char *firda_parents[] = {"pll3_48m_clk" ,"firda_synth_gate_clk" , -}; -static const char *uart_parents[] = {"pll3_48m_clk" ,"uart_synth_gate_clk" , }; -static const char *gpt0_1_parents[] = {"pll3_48m_clk" ,"gpt0_1_synth_clk" , }; -static const char *gpt2_parents[] = {"pll3_48m_clk" ,"gpt2_synth_clk" , }; -static const char *gpt3_parents[] = {"pll3_48m_clk" ,"gpt3_synth_clk" , }; +static const char *clcd_parents[] = {"pll3_clk" ,"clcd_syn_gclk" , }; +static const char *firda_parents[] = {"pll3_clk" ,"firda_syn_gclk" , }; +static const char *uart_parents[] = {"pll3_clk" ,"uart_syn_gclk" , }; +static const char *gpt0_1_parents[] = {"pll3_clk" ,"gpt0_1_syn_clk" , }; +static const char *gpt2_parents[] = {"pll3_clk" ,"gpt2_syn_clk" , }; +static const char *gpt3_parents[] = {"pll3_clk" ,"gpt3_syn_clk" , };static const char *ddr_parents[] = {"ahb_clk" ,"ahbmult2_clk" ,"none" ,"pll2_clk" , };
@@ -136,9 +135,9 @@ void __init spear6xx_clk_init(void)clk_register_clkdev (clk,NULL ,"rtc-spear" );/* clock derived from 30 MHz osc clk */ - clk =clk_register_fixed_rate (NULL ,"pll3_48m_clk" ,"osc_24m_clk" ,0 , + clk =clk_register_fixed_rate (NULL ,"pll3_clk" ,"osc_24m_clk" ,0 ,48000000 ); -clk_register_clkdev (clk,"pll3_48m_clk" ,NULL ); +clk_register_clkdev (clk,"pll3_clk" ,NULL ); clk = clk_register_vco_pll("vco1_clk", "pll1_clk", NULL, "osc_30m_clk", 0, PLL1_CTR, PLL1_FRQ, pll_rtbl, ARRAY_SIZE(pll_rtbl),
@@ -146,9 +145,9 @@ void __init spear6xx_clk_init(void)clk_register_clkdev (clk,"vco1_clk" ,NULL );clk_register_clkdev (clk1,"pll1_clk" ,NULL ); - clk =clk_register_vco_pll ("vco2_clk" ,"pll2_clk" ,NULL , -"osc_30m_clk" ,0 ,PLL2_CTR ,PLL2_FRQ , pll_rtbl, -ARRAY_SIZE (pll_rtbl), &_lock, &clk1,NULL ); + clk =clk_register_vco_pll ("vco2_clk" ,"pll2_clk" ,NULL ,"osc_30m_clk" , +0 ,PLL2_CTR ,PLL2_FRQ , pll_rtbl,ARRAY_SIZE (pll_rtbl), + &_lock, &clk1,NULL );clk_register_clkdev (clk,"vco2_clk" ,NULL );clk_register_clkdev (clk1,"pll2_clk" ,NULL );
@@ -165,111 +164,111 @@ void __init spear6xx_clk_init(void) HCLK_RATIO_MASK, 0, &_lock);clk_register_clkdev (clk,"ahb_clk" ,NULL ); - clk =clk_register_aux ("uart_synth_clk" ,"uart_synth_gate_clk" , -"pll1_clk" ,0 ,UART_CLK_SYNT ,NULL , aux_rtbl, -ARRAY_SIZE (aux_rtbl), &_lock, &clk1); -clk_register_clkdev (clk,"uart_synth_clk" ,NULL ); -clk_register_clkdev (clk1,"uart_synth_gate_clk" ,NULL ); + clk =clk_register_aux ("uart_syn_clk" ,"uart_syn_gclk" ,"pll1_clk" ,0 , +UART_CLK_SYNT ,NULL , aux_rtbl,ARRAY_SIZE (aux_rtbl), + &_lock, &clk1); +clk_register_clkdev (clk,"uart_syn_clk" ,NULL ); +clk_register_clkdev (clk1,"uart_syn_gclk" ,NULL ); - clk =clk_register_mux (NULL ,"uart_mux_clk" , uart_parents, + clk =clk_register_mux (NULL ,"uart_mclk" , uart_parents,ARRAY_SIZE (uart_parents),0 ,PERIP_CLK_CFG ,UART_CLK_SHIFT ,UART_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"uart_mux_clk" ,NULL ); +clk_register_clkdev (clk,"uart_mclk" ,NULL ); - clk =clk_register_gate (NULL ,"uart0" ,"uart_mux_clk" ,0 , -PERIP1_CLK_ENB ,UART0_CLK_ENB ,0 , &_lock); + clk =clk_register_gate (NULL ,"uart0" ,"uart_mclk" ,0 ,PERIP1_CLK_ENB , +UART0_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"d0000000.serial" ); - clk =clk_register_gate (NULL ,"uart1" ,"uart_mux_clk" ,0 , -PERIP1_CLK_ENB ,UART1_CLK_ENB ,0 , &_lock); + clk =clk_register_gate (NULL ,"uart1" ,"uart_mclk" ,0 ,PERIP1_CLK_ENB , +UART1_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"d0080000.serial" ); - clk =clk_register_aux ("firda_synth_clk" ,"firda_synth_gate_clk" , -"pll1_clk" ,0 ,FIRDA_CLK_SYNT ,NULL , aux_rtbl, -ARRAY_SIZE (aux_rtbl), &_lock, &clk1); -clk_register_clkdev (clk,"firda_synth_clk" ,NULL ); -clk_register_clkdev (clk1,"firda_synth_gate_clk" ,NULL ); + clk =clk_register_aux ("firda_syn_clk" ,"firda_syn_gclk" ,"pll1_clk" , +0 ,FIRDA_CLK_SYNT ,NULL , aux_rtbl,ARRAY_SIZE (aux_rtbl), + &_lock, &clk1); +clk_register_clkdev (clk,"firda_syn_clk" ,NULL ); +clk_register_clkdev (clk1,"firda_syn_gclk" ,NULL ); - clk =clk_register_mux (NULL ,"firda_mux_clk" , firda_parents, + clk =clk_register_mux (NULL ,"firda_mclk" , firda_parents,ARRAY_SIZE (firda_parents),0 ,PERIP_CLK_CFG ,FIRDA_CLK_SHIFT ,FIRDA_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"firda_mux_clk" ,NULL ); +clk_register_clkdev (clk,"firda_mclk" ,NULL ); - clk =clk_register_gate (NULL ,"firda_clk" ,"firda_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"firda_clk" ,"firda_mclk" ,0 ,PERIP1_CLK_ENB ,FIRDA_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"firda" ); - clk =clk_register_aux ("clcd_synth_clk" ,"clcd_synth_gate_clk" , -"pll1_clk" ,0 ,CLCD_CLK_SYNT ,NULL , aux_rtbl, -ARRAY_SIZE (aux_rtbl), &_lock, &clk1); -clk_register_clkdev (clk,"clcd_synth_clk" ,NULL ); -clk_register_clkdev (clk1,"clcd_synth_gate_clk" ,NULL ); + clk =clk_register_aux ("clcd_syn_clk" ,"clcd_syn_gclk" ,"pll1_clk" , +0 ,CLCD_CLK_SYNT ,NULL , aux_rtbl,ARRAY_SIZE (aux_rtbl), + &_lock, &clk1); +clk_register_clkdev (clk,"clcd_syn_clk" ,NULL ); +clk_register_clkdev (clk1,"clcd_syn_gclk" ,NULL ); - clk =clk_register_mux (NULL ,"clcd_mux_clk" , clcd_parents, + clk =clk_register_mux (NULL ,"clcd_mclk" , clcd_parents,ARRAY_SIZE (clcd_parents),0 ,PERIP_CLK_CFG ,CLCD_CLK_SHIFT ,CLCD_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"clcd_mux_clk" ,NULL ); +clk_register_clkdev (clk,"clcd_mclk" ,NULL ); - clk =clk_register_gate (NULL ,"clcd_clk" ,"clcd_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"clcd_clk" ,"clcd_mclk" ,0 ,PERIP1_CLK_ENB ,CLCD_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"clcd" );/* gpt clocks */ - clk =clk_register_gpt ("gpt0_1_synth_clk" ,"pll1_clk" ,0 ,PRSC0_CLK_CFG , + clk =clk_register_gpt ("gpt0_1_syn_clk" ,"pll1_clk" ,0 ,PRSC0_CLK_CFG , gpt_rtbl,ARRAY_SIZE (gpt_rtbl), &_lock); -clk_register_clkdev (clk,"gpt0_1_synth_clk" ,NULL ); +clk_register_clkdev (clk,"gpt0_1_syn_clk" ,NULL ); - clk =clk_register_mux (NULL ,"gpt0_mux_clk" , gpt0_1_parents, + clk =clk_register_mux (NULL ,"gpt0_mclk" , gpt0_1_parents,ARRAY_SIZE (gpt0_1_parents),0 ,PERIP_CLK_CFG ,GPT0_CLK_SHIFT ,GPT_CLK_MASK ,0 , &_lock);clk_register_clkdev (clk,NULL ,"gpt0" ); - clk =clk_register_mux (NULL ,"gpt1_mux_clk" , gpt0_1_parents, + clk =clk_register_mux (NULL ,"gpt1_mclk" , gpt0_1_parents,ARRAY_SIZE (gpt0_1_parents),0 ,PERIP_CLK_CFG ,GPT1_CLK_SHIFT ,GPT_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"gpt1_mux_clk" ,NULL ); +clk_register_clkdev (clk,"gpt1_mclk" ,NULL ); - clk =clk_register_gate (NULL ,"gpt1_clk" ,"gpt1_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"gpt1_clk" ,"gpt1_mclk" ,0 ,PERIP1_CLK_ENB ,GPT1_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"gpt1" ); - clk =clk_register_gpt ("gpt2_synth_clk" ,"pll1_clk" ,0 ,PRSC1_CLK_CFG , + clk =clk_register_gpt ("gpt2_syn_clk" ,"pll1_clk" ,0 ,PRSC1_CLK_CFG , gpt_rtbl,ARRAY_SIZE (gpt_rtbl), &_lock); -clk_register_clkdev (clk,"gpt2_synth_clk" ,NULL ); +clk_register_clkdev (clk,"gpt2_syn_clk" ,NULL ); - clk =clk_register_mux (NULL ,"gpt2_mux_clk" , gpt2_parents, + clk =clk_register_mux (NULL ,"gpt2_mclk" , gpt2_parents,ARRAY_SIZE (gpt2_parents),0 ,PERIP_CLK_CFG ,GPT2_CLK_SHIFT ,GPT_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"gpt2_mux_clk" ,NULL ); +clk_register_clkdev (clk,"gpt2_mclk" ,NULL ); - clk =clk_register_gate (NULL ,"gpt2_clk" ,"gpt2_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"gpt2_clk" ,"gpt2_mclk" ,0 ,PERIP1_CLK_ENB ,GPT2_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"gpt2" ); - clk =clk_register_gpt ("gpt3_synth_clk" ,"pll1_clk" ,0 ,PRSC2_CLK_CFG , + clk =clk_register_gpt ("gpt3_syn_clk" ,"pll1_clk" ,0 ,PRSC2_CLK_CFG , gpt_rtbl,ARRAY_SIZE (gpt_rtbl), &_lock); -clk_register_clkdev (clk,"gpt3_synth_clk" ,NULL ); +clk_register_clkdev (clk,"gpt3_syn_clk" ,NULL ); - clk =clk_register_mux (NULL ,"gpt3_mux_clk" , gpt3_parents, + clk =clk_register_mux (NULL ,"gpt3_mclk" , gpt3_parents,ARRAY_SIZE (gpt3_parents),0 ,PERIP_CLK_CFG ,GPT3_CLK_SHIFT ,GPT_CLK_MASK ,0 , &_lock); -clk_register_clkdev (clk,"gpt3_mux_clk" ,NULL ); +clk_register_clkdev (clk,"gpt3_mclk" ,NULL ); - clk =clk_register_gate (NULL ,"gpt3_clk" ,"gpt3_mux_clk" ,0 , + clk =clk_register_gate (NULL ,"gpt3_clk" ,"gpt3_mclk" ,0 ,PERIP1_CLK_ENB ,GPT3_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"gpt3" );/* clock derived from pll3 clk */ - clk =clk_register_gate (NULL ,"usbh0_clk" ,"pll3_48m_clk" ,0 , + clk =clk_register_gate (NULL ,"usbh0_clk" ,"pll3_clk" ,0 ,PERIP1_CLK_ENB ,USBH0_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"usbh.0_clk" ); - clk =clk_register_gate (NULL ,"usbh1_clk" ,"pll3_48m_clk" ,0 , + clk =clk_register_gate (NULL ,"usbh1_clk" ,"pll3_clk" ,0 ,PERIP1_CLK_ENB ,USBH1_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"usbh.1_clk" ); - clk =clk_register_gate (NULL ,"usbd_clk" ,"pll3_48m_clk" ,0 , -PERIP1_CLK_ENB ,USBD_CLK_ENB ,0 , &_lock); + clk =clk_register_gate (NULL ,"usbd_clk" ,"pll3_clk" ,0 ,PERIP1_CLK_ENB , +USBD_CLK_ENB ,0 , &_lock);clk_register_clkdev (clk,NULL ,"designware_udc" );/* clock derived from ahb clk */
@@ -278,9 +277,8 @@ void __init spear6xx_clk_init(void)clk_register_clkdev (clk,"ahbmult2_clk" ,NULL ); clk =clk_register_mux (NULL ,"ddr_clk" , ddr_parents, -ARRAY_SIZE (ddr_parents), -0 ,PLL_CLK_CFG ,MCTR_CLK_SHIFT ,MCTR_CLK_MASK ,0 , - &_lock); +ARRAY_SIZE (ddr_parents),0 ,PLL_CLK_CFG ,MCTR_CLK_SHIFT , +MCTR_CLK_MASK ,0 , &_lock);clk_register_clkdev (clk,"ddr_clk" ,NULL ); clk = clk_register_divider(NULL, "apb_clk", "ahb_clk",
Signature · 1 line
1.7.2.2
cover clk:spear: Rename clk ids within predefined limit
In reply to Vipul Kumar SamarQuoted 11 lines · Vipul Kumar Samar
The max limit of
con_idis 16 anddev_idis 20. As of now for all SPEAr SOC's clk ids are exceeding this predefined limit.This patch set is intended to rename clk ids through out spear clk framework.
Vipul Kumar Samar (4):
clk:spear1340:Fix: Rename clk ids within predefined limit clk:spear1310:Fix: Rename clk ids within predefined limit Clk:spear3xx:Fix: Rename clk ids within predefined limit Clk:spear6xx:Fix: Rename clk ids within predefined limit
Quoted 5 lines
drivers/clk/spear/spear1310_clock.c | 312 +++++++++++++++++------------------ drivers/clk/spear/spear1340_clock.c | 273 +++++++++++++++--------------- drivers/clk/spear/spear3xx_clock.c | 180 ++++++++++----------- drivers/clk/spear/spear6xx_clock.c | 122 +++++++------- 4 files changed, 436 insertions(+), 451 deletions(-)