Commit 92fe58f0 authored by Prashant Gaikwad's avatar Prashant Gaikwad Committed by Stephen Warren

ARM: tegra: Port tegra to generic clock framework

This patch converts tegra clock code to generic clock framework in following way:
 - Implement clk_ops as required by generic clk framework. (tegraXX_clocks.c)
 - Use platform specific struct clk_tegra in clk_ops implementation instead of struct clk.
 - Initialize all clock data statically. (tegraXX_clocks_data.c)

Legacy framework did not have recalc_rate and is_enabled functions. Implemented these functions.
Removed init function. It's functionality is splitted into recalc_rate and is_enabled.

Static initialization is used since slab is not up in .init_early and clock
is needed to be initialized before clockevent/clocksource initialization.
Macros redefined for clk_tegra.

Also, single struct clk_tegra is used for all type of clocks (PLL, peripheral etc.). This
is to move quickly to generic common clock framework so that other dependent features will
not be blocked (such as DT binding).

Enabling COMMON_CLOCK config moved to ARCH_TEGRA since it is enabled for both Tegra20
and Tegra30.
Signed-off-by: default avatarPrashant Gaikwad <pgaikwad@nvidia.com>
Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
parent 96a1bd1e
...@@ -686,6 +686,7 @@ config ARCH_TEGRA ...@@ -686,6 +686,7 @@ config ARCH_TEGRA
select NEED_MACH_IO_H if PCI select NEED_MACH_IO_H if PCI
select ARCH_HAS_CPUFREQ select ARCH_HAS_CPUFREQ
select USE_OF select USE_OF
select COMMON_CLK
help help
This enables support for NVIDIA Tegra based systems (Tegra APX, This enables support for NVIDIA Tegra based systems (Tegra APX,
Tegra 6xx and Tegra 2 series). Tegra 6xx and Tegra 2 series).
......
...@@ -233,6 +233,7 @@ int clk_set_rate_locked(struct clk *c, unsigned long rate); ...@@ -233,6 +233,7 @@ int clk_set_rate_locked(struct clk *c, unsigned long rate);
int clk_reparent(struct clk *c, struct clk *parent); int clk_reparent(struct clk *c, struct clk *parent);
#endif /* !CONFIG_COMMON_CLK */ #endif /* !CONFIG_COMMON_CLK */
void tegra_clk_add(struct clk *c);
void tegra2_init_clocks(void); void tegra2_init_clocks(void);
void tegra30_init_clocks(void); void tegra30_init_clocks(void);
struct clk *tegra_get_clock_by_name(const char *name); struct clk *tegra_get_clock_by_name(const char *name);
......
This diff is collapsed.
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#ifndef __MACH_TEGRA20_CLOCK_H #ifndef __MACH_TEGRA20_CLOCK_H
#define __MACH_TEGRA20_CLOCK_H #define __MACH_TEGRA20_CLOCK_H
extern struct clk_ops tegra_clk_32k_ops;
extern struct clk_ops tegra_pll_ops; extern struct clk_ops tegra_pll_ops;
extern struct clk_ops tegra_clk_m_ops; extern struct clk_ops tegra_clk_m_ops;
extern struct clk_ops tegra_pll_div_ops; extern struct clk_ops tegra_pll_div_ops;
...@@ -34,4 +35,7 @@ extern struct clk_ops tegra_emc_clk_ops; ...@@ -34,4 +35,7 @@ extern struct clk_ops tegra_emc_clk_ops;
extern struct clk_ops tegra_periph_clk_ops; extern struct clk_ops tegra_periph_clk_ops;
extern struct clk_ops tegra_clk_shared_bus_ops; extern struct clk_ops tegra_clk_shared_bus_ops;
void tegra2_periph_clk_reset(struct clk_hw *hw, bool assert);
void tegra2_cop_clk_reset(struct clk_hw *hw, bool assert);
#endif #endif
This diff is collapsed.
This diff is collapsed.
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#ifndef __MACH_TEGRA30_CLOCK_H #ifndef __MACH_TEGRA30_CLOCK_H
#define __MACH_TEGRA30_CLOCK_H #define __MACH_TEGRA30_CLOCK_H
extern struct clk_ops tegra_clk_32k_ops;
extern struct clk_ops tegra30_clk_m_ops; extern struct clk_ops tegra30_clk_m_ops;
extern struct clk_ops tegra_clk_m_div_ops; extern struct clk_ops tegra_clk_m_div_ops;
extern struct clk_ops tegra_pll_ref_ops; extern struct clk_ops tegra_pll_ref_ops;
...@@ -27,17 +28,26 @@ extern struct clk_ops tegra30_plle_ops; ...@@ -27,17 +28,26 @@ extern struct clk_ops tegra30_plle_ops;
extern struct clk_ops tegra_cml_clk_ops; extern struct clk_ops tegra_cml_clk_ops;
extern struct clk_ops tegra_pciex_clk_ops; extern struct clk_ops tegra_pciex_clk_ops;
extern struct clk_ops tegra_sync_source_ops; extern struct clk_ops tegra_sync_source_ops;
extern struct clk_ops tegra30_audio_sync_clk_ops; extern struct clk_ops tegra_audio_sync_clk_ops;
extern struct clk_ops tegra30_clk_double_ops; extern struct clk_ops tegra30_clk_double_ops;
extern struct clk_ops tegra_clk_out_ops; extern struct clk_ops tegra_clk_out_ops;
extern struct clk_ops tegra30_super_ops; extern struct clk_ops tegra30_super_ops;
extern struct clk_ops tegra30_blink_clk_ops; extern struct clk_ops tegra30_blink_clk_ops;
extern struct clk_ops tegra30_twd_ops; extern struct clk_ops tegra30_twd_ops;
extern struct clk_ops tegra30_periph_clk_ops; extern struct clk_ops tegra30_periph_clk_ops;
extern struct clk_ops tegra_dsib_clk_ops; extern struct clk_ops tegra30_dsib_clk_ops;
extern struct clk_ops tegra_nand_clk_ops; extern struct clk_ops tegra_nand_clk_ops;
extern struct clk_ops tegra_vi_clk_ops; extern struct clk_ops tegra_vi_clk_ops;
extern struct clk_ops tegra_dtv_clk_ops; extern struct clk_ops tegra_dtv_clk_ops;
extern struct clk_ops tegra_clk_shared_bus_ops; extern struct clk_ops tegra_clk_shared_bus_ops;
int tegra30_plld_clk_cfg_ex(struct clk_hw *hw,
enum tegra_clk_ex_param p, u32 setting);
void tegra30_periph_clk_reset(struct clk_hw *hw, bool assert);
int tegra30_vi_clk_cfg_ex(struct clk_hw *hw,
enum tegra_clk_ex_param p, u32 setting);
int tegra30_nand_clk_cfg_ex(struct clk_hw *hw,
enum tegra_clk_ex_param p, u32 setting);
int tegra30_dtv_clk_cfg_ex(struct clk_hw *hw,
enum tegra_clk_ex_param p, u32 setting);
#endif #endif
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment