OMAP4: PM: Basic OMAP4 clock nodes
RFC PATCH 1/10 OMAP4: PM: Basic OMAP4 clock nodes
This patch defines all the clock nodes in the PRM
module for OMAP4.
--- arch/arm/mach-omap2/clock.h | 2 + arch/arm/mach-omap2/clock44xx.h | 294 +++++++++++++++++++++++++++++++ arch/arm/plat-omap/include/mach/clock.h | 1 + 3 files changed, 297 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-omap2/clock44xx.h
arch/arm/mach-omap2/clock.h +2 -0
@@ -74,11 +74,13 @@ extern u8 cpu_mask;/* clksel_rate data common to 24xx/343x */ static const struct clksel_rate gpt_32k_rates[] = { { .div =1 , .val =0 , .flags =RATE_IN_24XX |RATE_IN_343X |DEFAULT_RATE }, + { .div =1 , .val =1 , .flags =RATE_IN_443X |DEFAULT_RATE }, { .div =0 } };static const struct clksel_rate gpt_sys_rates[] = { { .div =1 , .val =1 , .flags =RATE_IN_24XX |RATE_IN_343X |DEFAULT_RATE }, + { .div =1 , .val =0 , .flags =RATE_IN_443X |DEFAULT_RATE }, { .div =0 } };
arch/arm/mach-omap2/clock44xx.h new file +294 -0
294 lines not on this page · raw message
arch/arm/plat-omap/include/mach/clock.h +1 -0
@@ -154,6 +154,7 @@ extern const struct clkops clkops_null;#define RATE_IN_243X (1 << 2)#define RATE_IN_343X (1 << 3)/* rates common to all 343X */ #define RATE_IN_3430ES2 (1 << 4)/* 3430ES2 rates only */ +#define RATE_IN_443X (1 << 5)#define RATE_IN_24XX (RATE_IN_242X | RATE_IN_243X)
Signature · 1 line
1.5.4.7
RFC PATCH 2/10 OMAP4: PM: Basic OMAP4 clock framework
This patch registers the OMAP4430 clock
nodes with the CLKDEV frmaework.
Enables CLKDEV for OMAP4.
--- arch/arm/mach-omap2/Makefile | 7 +- arch/arm/mach-omap2/clock.c | 8 ++ arch/arm/mach-omap2/clock44xx.c | 137 +++++++++++++++++++++++++++++++++++++++ arch/arm/mach-omap2/io.c | 6 +- arch/arm/plat-omap/Kconfig | 1 + arch/arm/plat-omap/clock.c | 26 ------- 6 files changed, 152 insertions(+), 33 deletions(-) create mode 100644 arch/arm/mach-omap2/clock44xx.c
arch/arm/mach-omap2/Makefile +4 -3
@@ -3,11 +3,11 @@ # # Common support -obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.o +obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.o clock.o prcm.o omap-2-3-common = irq.o sdrc.o -prcm-common = prcm.o powerdomain.o -clock-common = clock.o clockdomain.o +prcm-common = powerdomain.o +clock-common = clockdomain.o obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(prcm-common) $(clock-common) obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(prcm-common) $(clock-common)
@@ -35,6 +35,7 @@ endif # Clock framework obj-$(CONFIG_ARCH_OMAP2) += clock24xx.o obj-$(CONFIG_ARCH_OMAP3) += clock34xx.o +obj-$(CONFIG_ARCH_OMAP4) += clock44xx.o # Specific board support obj-$(CONFIG_MACH_OMAP_GENERIC) += board-generic.o
arch/arm/mach-omap2/clock.c +8 -0
@@ -150,6 +150,7 @@ static int _dpll_test_fint(struct clk *clk, u8 n)* clockdomain pointer, and save it into the struct clk. Intended to be * called during clk_register(). No return value. */ +#ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once clkdm f/w is in place */ void omap2_init_clk_clkdm (struct clk *clk) {struct clockdomain *clkdm;
@@ -167,6 +168,7 @@ void omap2_init_clk_clkdm(struct clk *clk) "clkdm %s\n", clk->name, clk->clkdm_name); } } +#endif /** * omap2_init_clksel_parent - set a clksel clk's parent field from the hardware
@@ -435,8 +437,10 @@ void omap2_clk_disable(struct clk *clk)_omap2_clk_disable (clk);if (clk->parent)omap2_clk_disable (clk->parent); +#ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once clkdm f/w is in place */ if (clk->clkdm)omap2_clkdm_clk_disable (clk->clkdm, clk); +#endif } }
@@ -446,8 +450,10 @@ int omap2_clk_enable(struct clk *clk)int ret =0 ;if (clk->usecount++ ==0 ) { +#ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once clkdm f/w is in place */ if (clk->clkdm)omap2_clkdm_clk_enable (clk->clkdm, clk); +#endif if (clk->parent) { ret =omap2_clk_enable (clk->parent);
@@ -466,8 +472,10 @@ int omap2_clk_enable(struct clk *clk)return ret; err: +#ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once clkdm f/w is in place */ if (clk->clkdm)omap2_clkdm_clk_disable (clk->clkdm, clk); +#endif clk->usecount--;return ret; }
arch/arm/mach-omap2/clock44xx.c new file +137 -0
137 lines not on this page · raw message
arch/arm/mach-omap2/io.c +2 -4
@@ -32,7 +32,6 @@#include <mach/sdrc.h> #include <mach/gpmc.h> -#ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once clkdev is ready */ #include "clock.h" #include <mach/powerdomain.h>
@@ -41,7 +40,6 @@#include <mach/clockdomain.h> #include "clockdomains.h" -#endif /* * The machine specific code may provide the extra mapping besides the * default mapping provided here.
@@ -244,11 +242,11 @@ void __init omap2_map_common_io(void)void __init omap2_init_common_hw (struct omap_sdrc_params *sp) {omap2_mux_init (); -#ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once the clkdev is ready */ +#ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once the clkdm/pwrdm f/w is ready */ pwrdm_init (powerdomains_omap);clkdm_init (clockdomains_omap, clkdm_pwrdm_autodeps); -omap2_clk_init ();omap2_sdrc_init (sp);#endif +omap2_clk_init ();gpmc_init (); }
arch/arm/plat-omap/Kconfig +1 -0
@@ -27,6 +27,7 @@ config ARCH_OMAP4 bool "TI OMAP4" select CPU_V7 select ARM_GIC + select COMMON_CLKDEV endchoice
arch/arm/plat-omap/clock.c +0 -26
@@ -40,36 +40,10 @@ static struct clk_functions *arch_clock;* clock framework is not up , it is defined here to avoid rework in * every driver. Also dummy prcm reset function is added */ -/* Dummy hooks only for OMAP4.For rest OMAPs, common clkdev is used */ -#if defined(CONFIG_ARCH_OMAP4 ) -struct clk *clk_get (struct device *dev,const char *id) -{ -return NULL ; -} -EXPORT_SYMBOL (clk_get); - -void clk_put (struct clk *clk) -{ -} -EXPORT_SYMBOL (clk_put); - -void omap2_clk_prepare_for_reboot (void ) -{ -} -EXPORT_SYMBOL (omap2_clk_prepare_for_reboot); - -void omap_prcm_arch_reset (char mode) -{ -} -EXPORT_SYMBOL (omap_prcm_arch_reset); -#endif int clk_enable (struct clk *clk) {unsigned long flags;int ret =0 ; -if (cpu_is_omap44xx ()) -/* OMAP4 clk framework not supported yet */ -return 0 ;if (clk ==NULL ||IS_ERR (clk))return -EINVAL ;
Signature · 1 line
1.5.4.7
RFC PATCH 3/10 OMAP4: PM: Add a dummy node to prevent crash at bootup
This patch adds a dummy gpmc clock node to prevent a crash at bootup on OMAP4.
--- arch/arm/mach-omap2/clock44xx.c | 1 + arch/arm/mach-omap2/clock44xx.h | 7 +++++++ 2 files changed, 8 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/clock44xx.c +1 -0
@@ -73,6 +73,7 @@ static struct omap_clk omap44xx_clks[] = {CLK (NULL ,"gpt9_fck" , &gpt9_fck,CK_443X ),CLK (NULL ,"gpt10_fck" , &gpt10_fck,CK_443X ),CLK (NULL ,"gpt11_fck" , &gpt11_fck,CK_443X ), + CLK(NULL, "gpmc_fck", &gpmc_fck, CK_443X), }; static struct clk_functions omap2_clk_functions = {
arch/arm/mach-omap2/clock44xx.h +7 -0
@@ -291,4 +291,11 @@ static struct clk gpt11_fck = { .clksel = omap443x_gpt_clksel, .recalc = &omap2_clksel_recalc, }; + +/* TODO:Dummy clock node still needed to boot on Omap4, remove later */ +static struct clk gpmc_fck = { + .name ="gpmc_fck" , + .ops = &clkops_null, +}; +#endif
Signature · 1 line
1.5.4.7
RFC PATCH 4/10 OMAP4: PM: ABE DPLL clock nodes
This patch adds all clock nodes for ABE dpll
--- arch/arm/mach-omap2/clock44xx.c | 26 +++++- arch/arm/mach-omap2/clock44xx.h | 147 +++++++++++++++++++++++++++++++ arch/arm/plat-omap/include/mach/clock.h | 4 + 3 files changed, 176 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/clock44xx.c +25 -1
@@ -73,7 +73,16 @@ static struct omap_clk omap44xx_clks[] = {CLK (NULL ,"gpt9_fck" , &gpt9_fck,CK_443X ),CLK (NULL ,"gpt10_fck" , &gpt10_fck,CK_443X ),CLK (NULL ,"gpt11_fck" , &gpt11_fck,CK_443X ), - CLK(NULL, "gpmc_fck", &gpmc_fck, CK_443X), +CLK (NULL ,"gpmc_fck" , &gpmc_fck,CK_443X ), +CLK (NULL ,"dpll_abe_ck" , &dpll_abe_ck,CK_443X ), +CLK (NULL ,"dpll_abe_x2_ck" , &dpll_abe_x2_ck,CK_443X ), +CLK (NULL ,"dpll_abe_m2_ck" , &dpll_abe_m2_ck,CK_443X ), +CLK (NULL ,"dpll_abe_x2m2_ck" , &dpll_abe_x2m2_ck,CK_443X ), +CLK (NULL ,"dpll_abe_x2m3_ck" , &dpll_abe_x2m3_ck,CK_443X ), +CLK (NULL ,"per_abe_x1_fck" , &per_abe_x1_fck,CK_443X ), +CLK (NULL ,"dpll_abe_x2_fck" , &dpll_abe_x2_fck,CK_443X ), +CLK (NULL ,"core_dpll_hs_ck" , &core_dpll_hs_ck,CK_443X ), + CLK(NULL, "per_dpll_hs_ck", &per_dpll_hs_ck, CK_443X), }; static struct clk_functions omap2_clk_functions = {
@@ -90,6 +99,21 @@ void omap2_clk_prepare_for_reboot(void)return ; } +static int omap4_noncore_dpll_set_rate (struct clk *clk,unsigned long rate) +{ +return 0 ; +} + +static unsigned long omap4_clkoutx2_recalc (struct clk *clk) +{ +return 0 ; +} + +static unsigned long omap4_dpll_recalc (struct clk *clk) +{ +return 0 ; +} +static int __init omap2_clk_arch_init (void ) {if (!mpurate)
arch/arm/mach-omap2/clock44xx.h +147 -0
157 lines not on this page · raw message
arch/arm/plat-omap/include/mach/clock.h +4 -0
@@ -63,6 +63,10 @@ struct dpll_data {u8 recal_en_bit;u8 recal_st_bit;# endif + +#if defined(CONFIG_ARCH_OMAP4 ) +struct clk *clk_hsd_bypass; +#endif };#endif
Signature · 1 line
1.5.4.7
RFC PATCH 5/10 OMAP4: PM: PER DPLL clock nodes
This patch adds all clock nodes for PER dpll
--- arch/arm/mach-omap2/clock44xx.c | 17 ++++ arch/arm/mach-omap2/clock44xx.h | 186 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 203 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/clock44xx.c +17 -0
@@ -83,6 +83,23 @@ static struct omap_clk omap44xx_clks[] = {CLK (NULL ,"dpll_abe_x2_fck" , &dpll_abe_x2_fck,CK_443X ),CLK (NULL ,"core_dpll_hs_ck" , &core_dpll_hs_ck,CK_443X ),CLK (NULL ,"per_dpll_hs_ck" , &per_dpll_hs_ck,CK_443X ), +CLK (NULL ,"per_hsd_byp_ck" , &per_hsd_byp_ck,CK_443X ), +CLK (NULL ,"dpll_per_ck" , &dpll_per_ck,CK_443X ), +CLK (NULL ,"dpll_per_x2_ck" , &dpll_per_x2_ck,CK_443X ), +CLK (NULL ,"dpll_per_m2_ck" , &dpll_per_m2_ck,CK_443X ), +CLK (NULL ,"dpll_per_x2m2_ck" , &dpll_per_x2m2_ck,CK_443X ), +CLK (NULL ,"dpll_per_x2m3_ck" , &dpll_per_x2m3_ck,CK_443X ), +CLK (NULL ,"dpll_per_x2m4_ck" , &dpll_per_x2m4_ck,CK_443X ), +CLK (NULL ,"dpll_per_x2m5_ck" , &dpll_per_x2m5_ck,CK_443X ), +CLK (NULL ,"dpll_per_x2m6_ck" , &dpll_per_x2m6_ck,CK_443X ), +CLK (NULL ,"dpll_per_x2m7_ck" , &dpll_per_x2m7_ck,CK_443X ), +CLK (NULL ,"omap_96m_alwon_ck" , &omap_96m_alwon_ck,CK_443X ), +CLK (NULL ,"omap_192m_fck" , &omap_192m_fck,CK_443X ), +CLK (NULL ,"per_dpll_scrm_ck" , &per_dpll_scrm_ck,CK_443X ), +CLK (NULL ,"omap_128m_fck" , &omap_128m_fck,CK_443X ), +CLK (NULL ,"dss_fck" , &dss_fck,CK_443X ), +CLK (NULL ,"per_mpu_m3" , &per_mpu_m3,CK_443X ), + CLK(NULL, "per_dpll_emu_ck", &per_dpll_emu_ck, CK_443X), }; static struct clk_functions omap2_clk_functions = {
arch/arm/mach-omap2/clock44xx.h +186 -0
190 lines not on this page · raw message
Signature · 1 line
1.5.4.7
RFC PATCH 6/10 OMAP4: PM: CORE DPLL clock nodes
This patch adds all clock nodes for CORE dpll
--- arch/arm/mach-omap2/clock44xx.c | 15 ++++ arch/arm/mach-omap2/clock44xx.h | 168 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 183 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/clock44xx.c +15 -0
@@ -100,6 +100,21 @@ static struct omap_clk omap44xx_clks[] = {CLK (NULL ,"dss_fck" , &dss_fck,CK_443X ),CLK (NULL ,"per_mpu_m3" , &per_mpu_m3,CK_443X ),CLK (NULL ,"per_dpll_emu_ck" , &per_dpll_emu_ck,CK_443X ), +CLK (NULL ,"core_phy_hsd_byp_ck" , &core_phy_hsd_byp_ck,CK_443X ), +CLK (NULL ,"dpll_core_ck" , &dpll_core_ck,CK_443X ), +CLK (NULL ,"dpll_core_x2_ck" , &dpll_core_x2_ck,CK_443X ), +CLK (NULL ,"dpll_core_m2_ck" , &dpll_core_m2_ck,CK_443X ), +CLK (NULL ,"dpll_core_x2m3_ck" , &dpll_core_x2m3_ck,CK_443X ), +CLK (NULL ,"dpll_core_x2m4_ck" , &dpll_core_x2m4_ck,CK_443X ), +CLK (NULL ,"dpll_core_x2m5_ck" , &dpll_core_x2m5_ck,CK_443X ), +CLK (NULL ,"dpll_core_x2m6_ck" , &dpll_core_x2m6_ck,CK_443X ), +CLK (NULL ,"dpll_core_x2m7_ck" , &dpll_core_x2m7_ck,CK_443X ), +CLK (NULL ,"phy_root_ck" , &phy_root_ck,CK_443X ), +CLK (NULL ,"core_dpll_scrm_ck" , &core_dpll_scrm_ck,CK_443X ), +CLK (NULL ,"dpll_x2_ck" , &dpll_x2_ck,CK_443X ), +CLK (NULL ,"core_x2_ck" , &core_x2_ck,CK_443X ), +CLK (NULL ,"core_dpll_emu_ck" , &core_dpll_emu_ck,CK_443X ), + CLK(NULL, "core_sgx_fck", &core_sgx_fck, CK_443X), }; static struct clk_functions omap2_clk_functions = {
arch/arm/mach-omap2/clock44xx.h +168 -0
172 lines not on this page · raw message
Signature · 1 line
1.5.4.7
RFC PATCH 7/10 OMAP4: PM: MPU DPLL clock nodes
This patch adds all clock nodes for MPU dpll
--- arch/arm/mach-omap2/clock44xx.c | 5 +++ arch/arm/mach-omap2/clock44xx.h | 74 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/clock44xx.c +5 -0
@@ -115,6 +115,11 @@ static struct omap_clk omap44xx_clks[] = {CLK (NULL ,"core_x2_ck" , &core_x2_ck,CK_443X ),CLK (NULL ,"core_dpll_emu_ck" , &core_dpll_emu_ck,CK_443X ),CLK (NULL ,"core_sgx_fck" , &core_sgx_fck,CK_443X ), +CLK (NULL ,"mpu_dpll_hs_ck" , &mpu_dpll_hs_ck,CK_443X ), +CLK (NULL ,"dpll_mpu_ck" , &dpll_mpu_ck,CK_443X ), +CLK (NULL ,"dpll_mpu_m2_ck" , &dpll_mpu_m2_ck,CK_443X ), + CLK(NULL, "mpu_dpll_ck", &mpu_dpll_ck, CK_443X), + }; static struct clk_functions omap2_clk_functions = {
arch/arm/mach-omap2/clock44xx.h +74 -0
78 lines not on this page · raw message
Signature · 1 line
1.5.4.7
RFC PATCH 8/10 OMAP4: PM: IVA DPLL clock nodes
This patch adds all clock nodes for IVA dpll
--- arch/arm/mach-omap2/clock44xx.c | 8 +++- arch/arm/mach-omap2/clock44xx.h | 89 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/clock44xx.c +7 -1
@@ -119,7 +119,13 @@ static struct omap_clk omap44xx_clks[] = {CLK (NULL ,"dpll_mpu_ck" , &dpll_mpu_ck,CK_443X ),CLK (NULL ,"dpll_mpu_m2_ck" , &dpll_mpu_m2_ck,CK_443X ),CLK (NULL ,"mpu_dpll_ck" , &mpu_dpll_ck,CK_443X ), - +CLK (NULL ,"iva_dpll_hs_ck" , &iva_dpll_hs_ck,CK_443X ), +CLK (NULL ,"dpll_iva_ck" , &dpll_iva_ck,CK_443X ), +CLK (NULL ,"dpll_iva_x2_ck" , &dpll_iva_x2_ck,CK_443X ), +CLK (NULL ,"dpll_iva_x2m4_ck" , &dpll_iva_x2m4_ck,CK_443X ), +CLK (NULL ,"dpll_iva_x2m5_ck" , &dpll_iva_x2m5_ck,CK_443X ), +CLK (NULL ,"dsp_root_ck" , &dsp_root_ck,CK_443X ), + CLK(NULL, "ivahd_ck", &ivahd_ck, CK_443X), }; static struct clk_functions omap2_clk_functions = {
arch/arm/mach-omap2/clock44xx.h +89 -0
93 lines not on this page · raw message
Signature · 1 line
1.5.4.7
RFC PATCH 9/10 OMAP4: PM: UNIPRO DPLL clock nodes
This patch adds all clock nodes for UNIPRO dpll
--- arch/arm/mach-omap2/clock44xx.c | 4 +++ arch/arm/mach-omap2/clock44xx.h | 54 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/clock44xx.c +4 -0
@@ -126,6 +126,10 @@ static struct omap_clk omap44xx_clks[] = {CLK (NULL ,"dpll_iva_x2m5_ck" , &dpll_iva_x2m5_ck,CK_443X ),CLK (NULL ,"dsp_root_ck" , &dsp_root_ck,CK_443X ),CLK (NULL ,"ivahd_ck" , &ivahd_ck,CK_443X ), +CLK (NULL ,"dpll_unipro_ck" , &dpll_unipro_ck,CK_443X ), +CLK (NULL ,"dpll_unipro_x2_ck" , &dpll_unipro_x2_ck,CK_443X ), +CLK (NULL ,"dpll_unipro_x2m2_ck" , &dpll_unipro_x2m2_ck,CK_443X ), + CLK(NULL, "unipro1_phy_fck", &unipro1_phy_fck, CK_443X), }; static struct clk_functions omap2_clk_functions = {
arch/arm/mach-omap2/clock44xx.h +54 -0
58 lines not on this page · raw message
Signature · 1 line
1.5.4.7
RFC PATCH 10/10 OMAP4: PM: Adds a few CM1/2 clock nodes
This patch adds some clock nodes in CM1 and CM2 modules
--- arch/arm/mach-omap2/clock44xx.c | 6 ++ arch/arm/mach-omap2/clock44xx.h | 114 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/clock44xx.c +6 -0
@@ -130,6 +130,12 @@ static struct omap_clk omap44xx_clks[] = {CLK (NULL ,"dpll_unipro_x2_ck" , &dpll_unipro_x2_ck,CK_443X ),CLK (NULL ,"dpll_unipro_x2m2_ck" , &dpll_unipro_x2m2_ck,CK_443X ),CLK (NULL ,"unipro1_phy_fck" , &unipro1_phy_fck,CK_443X ), +CLK (NULL ,"core_ck" , &core_ck,CK_443X ), +CLK (NULL ,"l3_ick" , &l3_ick,CK_443X ), +CLK (NULL ,"l4_root_ck" , &l4_root_ck,CK_443X ), +CLK (NULL ,"fdif_fck" , &fdif_fck,CK_443X ), +CLK (NULL ,"hsi_fck" , &hsi_fck,CK_443X ), + CLK(NULL, "mpu_m3_iss_ck", &mpu_m3_iss_ck, CK_443X), }; static struct clk_functions omap2_clk_functions = {
arch/arm/mach-omap2/clock44xx.h +114 -0
118 lines not on this page · raw message
Signature · 1 line
1.5.4.7