]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
ARM: tegra: isomgr: update for Vi one device
authorShridhar Rasal <srasal@nvidia.com>
Mon, 26 May 2014 09:10:39 +0000 (14:40 +0530)
committerTerje Bergstrom <tbergstrom@nvidia.com>
Tue, 27 May 2014 05:04:42 +0000 (22:04 -0700)
Update isomgr table for Vi sigle device.

Bug 1436477

Change-Id: Ib2a17d4f5904b05299250a3c9dd0c4a78654e5da
Signed-off-by: Shridhar Rasal <srasal@nvidia.com>
Reviewed-on: http://git-master/r/414919
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Arto Merilainen <amerilainen@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
arch/arm/mach-tegra/isomgr.c

index b83cc12c6459c6edd3eaf9201e14260a2a34ee24..06a0533432668f04e7faf53e322ca4524d41d4dc 100644 (file)
@@ -189,6 +189,14 @@ static struct isoclient_info tegra12x_isoclients[] = {
                .dev_name = "tegradc.1",
                .emc_clk_name = "emc",
        },
+#ifdef CONFIG_VI_ONE_DEVICE
+       {
+               .client = TEGRA_ISO_CLIENT_VI_0,
+               .name = "vi_0",
+               .dev_name = "tegra_vi",
+               .emc_clk_name = "emc",
+       },
+#else
        {
                .client = TEGRA_ISO_CLIENT_VI_0,
                .name = "vi_0",
@@ -201,6 +209,7 @@ static struct isoclient_info tegra12x_isoclients[] = {
                .dev_name = "tegra_vi.1",
                .emc_clk_name = "emc",
        },
+#endif
        {
                .client = TEGRA_ISO_CLIENT_ISP_A,
                .name = "isp_a",