diff options
| author | Bo Yan <byan@nvidia.com> | 2012-07-02 14:18:30 -0700 |
|---|---|---|
| committer | Bo Yan <byan@nvidia.com> | 2012-07-02 14:18:30 -0700 |
| commit | fa2107eab722b4e5dd1254132eee3784abc702bc (patch) | |
| tree | 741ed0adbbfb9546d6a7849d1aa944df1efb91ac /arch/arm/mach-tegra/tegra30_clocks.c | |
| parent | a8ef1e90a0b7e3437c85d0c5fb69bb89798ef0a9 (diff) | |
| parent | 7daa0941c7a19ebda912acec70ec772acf325931 (diff) | |
Merge remote branch 'remotes/experimental/dev/android-t114-3.4-rebased' into k3.4
Conflicts:
arch/arm/mach-tegra/devices.c
arch/arm/mach-tegra/dvfs.h
arch/arm/mach-tegra/timer.c
Change-Id: Ie967f1d45f50601f3c1fad958405d5343e722687
Diffstat (limited to 'arch/arm/mach-tegra/tegra30_clocks.c')
| -rw-r--r-- | arch/arm/mach-tegra/tegra30_clocks.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-tegra/tegra30_clocks.c b/arch/arm/mach-tegra/tegra30_clocks.c index 053c38d407cd..91fed8da7c69 100644 --- a/arch/arm/mach-tegra/tegra30_clocks.c +++ b/arch/arm/mach-tegra/tegra30_clocks.c @@ -101,13 +101,6 @@ #define OSC_CTRL_PLL_REF_DIV_2 (1<<26) #define OSC_CTRL_PLL_REF_DIV_4 (2<<26) -#define OSC_FREQ_DET 0x58 -#define OSC_FREQ_DET_TRIG (1<<31) - -#define OSC_FREQ_DET_STATUS 0x5C -#define OSC_FREQ_DET_BUSY (1<<31) -#define OSC_FREQ_DET_CNT_MASK 0xFFFF - #define PERIPH_CLK_SOURCE_I2S1 0x100 #define PERIPH_CLK_SOURCE_EMC 0x19c #define PERIPH_CLK_SOURCE_OSC 0x1fc |