From 9c54db6d3973ad1e8063932a4b0c6f32488f3ba8 Mon Sep 17 00:00:00 2001
From: Joseph Lo <josephl@nvidia.com>
Date: Fri, 17 Aug 2012 14:54:10 +0800
Subject: [PATCH] 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>
---
 arch/arm/mach-tegra/tegra30_clocks.h      | 2 +-
 arch/arm/mach-tegra/tegra30_clocks_data.c | 2 +-
 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;
 extern struct clk_ops tegra_cml_clk_ops;
 extern struct clk_ops tegra_pciex_clk_ops;
 extern struct clk_ops tegra_sync_source_ops;
-extern struct clk_ops tegra_audio_sync_clk_ops;
+extern struct clk_ops tegra30_audio_sync_clk_ops;
 extern struct clk_ops tegra30_clk_double_ops;
 extern struct clk_ops tegra_clk_out_ops;
 extern 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[] = {
 	};							\
 	static struct clk tegra_##_name = {			\
 		.name = #_name,					\
-		.ops = &tegra_audio_sync_clk_ops,		\
+		.ops = &tegra30_audio_sync_clk_ops,		\
 		.hw = &tegra_##_name##_hw.hw,			\
 		.parent_names = mux_audio_sync_clk,		\
 		.parents = tegra_sync_source_list,		\
-- 
GitLab