diff options
author | Alex Frid <afrid@nvidia.com> | 2013-06-07 23:42:11 -0700 |
---|---|---|
committer | Harshada Kale <hkale@nvidia.com> | 2013-09-12 02:37:30 -0700 |
commit | abc819fb017d38adc3e101324522743ef18e72f9 (patch) | |
tree | 058f72376e94b05070fd4dc34c8ce4ad27dd35ac | |
parent | 9eef509f9065f496b8fedb7b3b0d76b43f85c430 (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
(cherry picked from commit a96193452c05aca8596659a3a2f4346ad1818306)
Reviewed-on: http://git-master/r/253679
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.c | 7 |
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), }; |