diff options
| author | Varun Wadekar <vwadekar@nvidia.com> | 2012-04-09 16:06:44 +0530 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2012-04-09 16:06:44 +0530 |
| commit | 8727f1781e68baf1a92b402a9b95a2626e6881c6 (patch) | |
| tree | 705fa24b9a4725892dce115808e05c008f7ed736 /arch/arm/mach-tegra/clock.h | |
| parent | 733dbf7b36a279812e3d4f29c3d19bb74db858c3 (diff) | |
ARM: tegra: clocks: remove clk_cfg_ex
Change-Id: I021f26678165fb3c8a8da847cb2b9b68e084c731
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/clock.h')
| -rw-r--r-- | arch/arm/mach-tegra/clock.h | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/arch/arm/mach-tegra/clock.h b/arch/arm/mach-tegra/clock.h index 0cf3d20f33c3..323f21de3f73 100644 --- a/arch/arm/mach-tegra/clock.h +++ b/arch/arm/mach-tegra/clock.h @@ -22,16 +22,27 @@ #ifndef __MACH_TEGRA_CLOCK_H #define __MACH_TEGRA_CLOCK_H +#ifndef __ASSEMBLY__ + +#include <linux/clkdev.h> +#include <linux/list.h> +#include <linux/mutex.h> +#include <linux/spinlock.h> +#include <asm/cputime.h> + +#include <mach/clk.h> +#define MAX_SAME_LIMIT_SKU_IDS 16 + +struct clk; + #ifdef CONFIG_ARCH_TEGRA_2x_SOC #define USE_PLL_LOCK_BITS 0 /* Never use lock bits on Tegra2 */ #else -#define USE_PLL_LOCK_BITS 1 /* Use lock bits for PLL stabiliation */ +#define USE_PLL_LOCK_BITS 0 /* Use lock bits for PLL stabiliation */ #define USE_PLLE_SS 1 /* Use spread spectrum coefficients for PLLE */ -#define PLL_POST_LOCK_DELAY 50 /* Safety delay after lock is detected */ +#define PLL_POST_LOCK_DELAY 100 /* Safety delay after lock is detected */ #endif -#include <mach/clk.h> - #define DIV_BUS (1 << 0) #define DIV_U71 (1 << 1) #define DIV_U71_FIXED (1 << 2) @@ -60,19 +71,6 @@ #define PERIPH_ON_APB (1 << 29) #define PERIPH_ON_CBUS (1 << 30) -#ifndef __ASSEMBLY__ - -#include <linux/clkdev.h> -#include <linux/list.h> -#include <linux/mutex.h> -#include <linux/spinlock.h> -#include <asm/cputime.h> - -#include <mach/clk.h> -#define MAX_SAME_LIMIT_SKU_IDS 16 - -struct clk; - struct clk_mux_sel { struct clk *input; u32 value; @@ -94,7 +92,6 @@ struct clk_ops { int (*set_parent)(struct clk *, struct clk *); int (*set_rate)(struct clk *, unsigned long); long (*round_rate)(struct clk *, unsigned long); - int (*clk_cfg_ex)(struct clk *, enum tegra_clk_ex_param, u32); void (*reset)(struct clk *, bool); int (*shared_bus_update)(struct clk *); int (*clk_cfg_ex)(struct clk *, |