summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Frid <afrid@nvidia.com>2013-06-08 00:09:21 -0700
committerHarshada Kale <hkale@nvidia.com>2013-09-12 02:37:42 -0700
commit5585b06670bcdebf11388e1098bd4e96552ea15b (patch)
tree4e14f0422b1742321c811afd11bd64f9d050e58d
parentabc819fb017d38adc3e101324522743ef18e72f9 (diff)
ARM: tegra11: clock: Expand host1x shared bus
Add cap, floor, and override shared users to host1x bus. Attached cap user to core cap interface. Change-Id: I20bf5f346f422d7f2cbd97a445f00847e8761ac8 Signed-off-by: Alex Frid <afrid@nvidia.com> Reviewed-on: http://git-master/r/250563 (cherry picked from commit 01be9d99e4593df6fc149497d14bc4903e2bdd7e) Reviewed-on: http://git-master/r/253680 Tested-by: Shaoming Feng <shaomingf@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
-rw-r--r--arch/arm/mach-tegra/tegra11_clocks.c3
-rw-r--r--arch/arm/mach-tegra/tegra11_dvfs.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/tegra11_clocks.c b/arch/arm/mach-tegra/tegra11_clocks.c
index b224b555b65d..cf787580c2f9 100644
--- a/arch/arm/mach-tegra/tegra11_clocks.c
+++ b/arch/arm/mach-tegra/tegra11_clocks.c
@@ -6827,6 +6827,9 @@ struct clk tegra_list_clks[] = {
#endif
SHARED_CLK("nv.host1x", "tegra_host1x", "host1x", &tegra_clk_host1x, NULL, 0, 0),
SHARED_CLK("vi.host1x", "tegra_vi", "host1x", &tegra_clk_host1x, NULL, 0, 0),
+ SHARED_CLK("cap.host1x", "cap.host1x", NULL, &tegra_clk_host1x, NULL, 0, SHARED_CEILING),
+ SHARED_CLK("floor.host1x", "floor.host1x", NULL, &tegra_clk_host1x, NULL, 0, 0),
+ SHARED_CLK("override.host1x", "override.host1x", NULL, &tegra_clk_host1x, NULL, 0, SHARED_OVERRIDE),
};
diff --git a/arch/arm/mach-tegra/tegra11_dvfs.c b/arch/arm/mach-tegra/tegra11_dvfs.c
index 8b7ac870817b..45a9390b6ee6 100644
--- a/arch/arm/mach-tegra/tegra11_dvfs.c
+++ b/arch/arm/mach-tegra/tegra11_dvfs.c
@@ -787,6 +787,7 @@ static struct core_dvfs_cap_table tegra11_core_cap_table[] = {
#endif
{ .cap_name = "cap.sclk" },
{ .cap_name = "cap.emc" },
+ { .cap_name = "cap.host1x" },
};
/*