ARM: tegra11: clock: Re-factor and expand host1x bus
Alex Frid [Sat, 8 Jun 2013 06:42:11 +0000 (23:42 -0700)]
- 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)

- Add cap, and floor, shared users to host1x bus. Attached cap user to
core cap interface.

Change-Id: I75d73964fc8f74558ba4ac555a2b018bc554e88a
Signed-off-by: Alex Frid <afrid@nvidia.com>
Reviewed-on: http://git-master/r/238746
(cherry picked from commit 0da8b11f8d90bc1a00ab1e62f36f184bf64db66f)
Reviewed-on: http://git-master/r/258305
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>

arch/arm/mach-tegra/tegra11_clocks.c
arch/arm/mach-tegra/tegra11_dvfs.c

index 7b12b23..85ed74a 100644 (file)
@@ -6628,6 +6628,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,
@@ -7034,6 +7037,8 @@ 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),
 };
 
index 65d3fb6..b3df6bf 100644 (file)
@@ -881,6 +881,7 @@ static struct core_dvfs_cap_table tegra11_core_cap_table[] = {
 #endif
        { .cap_name = "cap.sclk" },
        { .cap_name = "cap.emc" },
+       { .cap_name = "cap.host1x" },
 };
 
 /*