summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Frid <afrid@nvidia.com>2013-06-07 23:42:11 -0700
committerVarun Colbert <vcolbert@nvidia.com>2013-07-20 22:05:20 -0700
commita96193452c05aca8596659a3a2f4346ad1818306 (patch)
treea7283b0a12e08f07ab11825f333e4ee7b12aa609
parent2899d88dd8afa1971f2c1b09b7039852a65a5f4f (diff)
ARM: tegra11: clock: Re-factor host1x bus
- Set host1x dev_id = "host1x" and con_id = NULL (these definitions were used before conversion of host1x to shared bus; during conversion ids were inadvertently swapped - restored now) - Renamed host1x bus shared users to be consistent with other shared buses Change-Id: Iecf1f27681658c69fc63ed71c99d62ae86d9f30b Signed-off-by: Alex Frid <afrid@nvidia.com> Reviewed-on: http://git-master/r/250562 GVS: Gerrit_Virtual_Submit Reviewed-by: Matt Wagner <mwagner@nvidia.com> Tested-by: Anshul Jain (SW) <anshulj@nvidia.com> Tested-by: Xiao Bo Zhao <xiaoboz@nvidia.com>
-rw-r--r--arch/arm/mach-tegra/tegra11_clocks.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/tegra11_clocks.c b/arch/arm/mach-tegra/tegra11_clocks.c
index 9fbffb9dc6a9..b224b555b65d 100644
--- a/arch/arm/mach-tegra/tegra11_clocks.c
+++ b/arch/arm/mach-tegra/tegra11_clocks.c
@@ -6458,6 +6458,9 @@ static struct raw_notifier_head host1x_rate_change_nh;
static struct clk tegra_clk_host1x = {
.name = "host1x",
+ .lookup = {
+ .dev_id = "host1x",
+ },
.ops = &tegra_1xbus_clk_ops,
.reg = 0x180,
.inputs = mux_pllm_pllc_pllp_plla,
@@ -6822,8 +6825,8 @@ struct clk tegra_list_clks[] = {
SHARED_CLK("cap.profile.cbus", "profile.cbus", NULL, &tegra_clk_cbus, NULL, 0, SHARED_CEILING),
SHARED_CLK("battery.cbus", "battery_edp", "gpu", &tegra_clk_cbus, NULL, 0, SHARED_CEILING),
#endif
- SHARED_CLK("nv_host1x", "tegra_host1x", "host1x", &tegra_clk_host1x, 0, 0, 0),
- SHARED_CLK("vi_host1x", "tegra_vi", "host1x", &tegra_clk_host1x, 0, 0, 0),
+ 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),
};