aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoseph Lo <josephl@nvidia.com>2012-08-17 02:54:10 -0400
committerStephen Warren <swarren@nvidia.com>2012-09-06 13:47:21 -0400
commit9c54db6d3973ad1e8063932a4b0c6f32488f3ba8 (patch)
tree5f7689f2563ffffe4b977b5703981c89090164e8
parentb78c030cebdaf8da14b44a4454146a7919e763a8 (diff)
ARM: tegra30: clocks: fix the wrong tegra_audio_sync_clk_ops name
It should use tegra30_audio_sync_clk_ops for tegra30. It will cause the tegra30 use the wrong audio_sync_clk_ops when build a kernel with a tegra20 and tegra30 both supported kernel. And building error when a tegra30-only kernel. Signed-off-by: Joseph Lo <josephl@nvidia.com> Signed-off-by: Stephen Warren <swarren@nvidia.com>
-rw-r--r--arch/arm/mach-tegra/tegra30_clocks.h2
-rw-r--r--arch/arm/mach-tegra/tegra30_clocks_data.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/tegra30_clocks.h b/arch/arm/mach-tegra/tegra30_clocks.h
index b08b8d9024a6..f2f88fef6b8b 100644
--- a/arch/arm/mach-tegra/tegra30_clocks.h
+++ b/arch/arm/mach-tegra/tegra30_clocks.h
@@ -28,7 +28,7 @@ extern struct clk_ops tegra30_plle_ops;
28extern struct clk_ops tegra_cml_clk_ops; 28extern struct clk_ops tegra_cml_clk_ops;
29extern struct clk_ops tegra_pciex_clk_ops; 29extern struct clk_ops tegra_pciex_clk_ops;
30extern struct clk_ops tegra_sync_source_ops; 30extern struct clk_ops tegra_sync_source_ops;
31extern struct clk_ops tegra_audio_sync_clk_ops; 31extern struct clk_ops tegra30_audio_sync_clk_ops;
32extern struct clk_ops tegra30_clk_double_ops; 32extern struct clk_ops tegra30_clk_double_ops;
33extern struct clk_ops tegra_clk_out_ops; 33extern struct clk_ops tegra_clk_out_ops;
34extern struct clk_ops tegra30_super_ops; 34extern struct clk_ops tegra30_super_ops;
diff --git a/arch/arm/mach-tegra/tegra30_clocks_data.c b/arch/arm/mach-tegra/tegra30_clocks_data.c
index 267350675a88..448a6df57ac9 100644
--- a/arch/arm/mach-tegra/tegra30_clocks_data.c
+++ b/arch/arm/mach-tegra/tegra30_clocks_data.c
@@ -520,7 +520,7 @@ static const char *mux_audio_sync_clk[] = {
520 }; \ 520 }; \
521 static struct clk tegra_##_name = { \ 521 static struct clk tegra_##_name = { \
522 .name = #_name, \ 522 .name = #_name, \
523 .ops = &tegra_audio_sync_clk_ops, \ 523 .ops = &tegra30_audio_sync_clk_ops, \
524 .hw = &tegra_##_name##_hw.hw, \ 524 .hw = &tegra_##_name##_hw.hw, \
525 .parent_names = mux_audio_sync_clk, \ 525 .parent_names = mux_audio_sync_clk, \
526 .parents = tegra_sync_source_list, \ 526 .parents = tegra_sync_source_list, \