summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorBryan Wu <pengw@nvidia.com>2014-09-17 18:04:17 -0700
committerWinnie Hsu <whsu@nvidia.com>2015-01-07 18:05:29 -0800
commit373c23c7936c05f615d3db569198c10be3d9d4b2 (patch)
tree99fd916382f2bcf633b5209f331182ebf5bd26ef /arch
parent2e8fe26468a7c4e9b41e5bbd28681664e1153238 (diff)
media: tegra_v4l2_camera: use port num to init clk
Change clks_init() internal API to use CSI port number to enable clks instead of using dev_id which is incorrect sometime, since vi.0 might also assigned to CSI_B/CSI_C port. Bug 1560636 Change-Id: I0e26308ec885e2e34fe8faa63fca404c911912c4 Signed-off-by: Bryan Wu <pengw@nvidia.com> Reviewed-on: http://git-master/r/539002 Reviewed-by: Venkat Moganty <vmoganty@nvidia.com> (cherry picked from commit c66d8e5880589b0d95dba63d10daff53e47e8628) Reviewed-on: http://git-master/r/665995 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Winnie Hsu <whsu@nvidia.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-tegra/tegra12_clocks.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/tegra12_clocks.c b/arch/arm/mach-tegra/tegra12_clocks.c
index d89cda845a78..bb738a86b51a 100644
--- a/arch/arm/mach-tegra/tegra12_clocks.c
+++ b/arch/arm/mach-tegra/tegra12_clocks.c
@@ -8620,9 +8620,14 @@ struct clk_duplicate tegra_clk_duplicates[] = {
CLK_DUPLICATE("csi", "tegra_vi.0", "csi"),
CLK_DUPLICATE("csi", "tegra_vi.1", "csi"),
CLK_DUPLICATE("csus", "tegra_vi.0", "csus"),
+ CLK_DUPLICATE("csus", "tegra_vi.1", "csus"),
+ CLK_DUPLICATE("vim2_clk", "tegra_vi.0", "vim2_clk"),
CLK_DUPLICATE("vim2_clk", "tegra_vi.1", "vim2_clk"),
CLK_DUPLICATE("cilab", "tegra_vi.0", "cilab"),
+ CLK_DUPLICATE("cilab", "tegra_vi.1", "cilab"),
+ CLK_DUPLICATE("cilcd", "tegra_vi.0", "cilcd"),
CLK_DUPLICATE("cilcd", "tegra_vi.1", "cilcd"),
+ CLK_DUPLICATE("cile", "tegra_vi.0", "cile"),
CLK_DUPLICATE("cile", "tegra_vi.1", "cile"),
CLK_DUPLICATE("i2s0", NULL, "i2s0"),
CLK_DUPLICATE("i2s1", NULL, "i2s1"),