drivers:tegra:tegra21_clocks: Add vi_v4l2.cbus

Add vi_v4l2.cbus under vi.cbus for VI mode.
When both scf and vi mode are running, vi mode should have its own clock to
prevent scf overwriting its vi clock request.

Bug 1736471

Signed-off-by: Wenjia Zhou <wenjiaz@nvidia.com>
Change-Id: I42c0bcb0f1bd4869467f4bb7165f9c4ff65ec752
(cherry picked from commit cca841662e7f3f1b994463670a6951d02e5d704b)
Reviewed-on: http://git-master/r/1116498
Signed-off-by: Bryan Wu <pengw@nvidia.com>
Reviewed-on: http://git-master/r/1141873
GVS: Gerrit_Virtual_Submit
Reviewed-by: Jihoon Bang <jbang@nvidia.com>

diff --git a/drivers/platform/tegra/tegra21_clocks.c b/drivers/platform/tegra/tegra21_clocks.c
index 9ae33d25a379a4f7cfca7f1eb4da9eb4a58f05e3..f41de232feacd69152dcdce7310a88d6de367097 100644 (file)
--- a/drivers/platform/tegra/tegra21_clocks.c
+++ b/drivers/platform/tegra/tegra21_clocks.c
@@ -1,7 +1,7 @@
 /*
  * arch/arm/mach-tegra/tegra21_clocks.c
  *
- * Copyright (C) 2013-2015 NVIDIA Corporation. All rights reserved.
+ * Copyright (C) 2013-2016 NVIDIA Corporation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -9713,6 +9713,7 @@ static struct clk tegra_visp_clks[] = {
 
        SHARED_CLK("ispa.isp.cbus",     "ispa.isp",     NULL,   &tegra_visp_clks[1], "ispa", 0, 0, TEGRA210_CLK_ID_CXBUS_ISP_ISPA_USER),
        SHARED_CLK("ispb.isp.cbus",     "ispb.isp",     NULL,   &tegra_visp_clks[1], "ispb", 0, 0, TEGRA210_CLK_ID_CXBUS_ISP_ISPB_USER),
+       SHARED_CLK("vi_v4l2.cbus",      "vi",           "vi_v4l2",      &tegra_visp_clks[0],    "vi",    0, 0, TEGRA210_CLK_ID_CXBUS_VI_V4L2_USER),
 };
 
 /* XUSB clocks */

diff --git a/include/dt-bindings/clk/tegra210-clk.h b/include/dt-bindings/clk/tegra210-clk.h
index aa1de2c67a3faf62e0e9c17696fe78fccda246d7..7534f71cb13eff5abf91db56ab2e8ebd57d78b53 100644 (file)
--- a/include/dt-bindings/clk/tegra210-clk.h
+++ b/include/dt-bindings/clk/tegra210-clk.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2015-2016, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -336,6 +336,7 @@
 #define TEGRA210_CLK_ID_CXBUS_VI_VIB_USER              373
 #define TEGRA210_CLK_ID_CXBUS_ISP_ISPA_USER            374
 #define TEGRA210_CLK_ID_CXBUS_ISP_ISPB_USER            375
+#define TEGRA210_CLK_ID_CXBUS_VI_V4L2_USER             376
 /* IDs 376 ... 389 are reserved */
 #define TEGRA210_CLK_ID_GBUS                           390
 #define TEGRA210_CLK_ID_GBUS_GM20B_USER                        391