]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
video: tegra: host: Remove Tegra14 support
authorTerje Bergstrom <tbergstrom@nvidia.com>
Fri, 28 Feb 2014 11:03:01 +0000 (13:03 +0200)
committerJuha Tukkinen <jtukkinen@nvidia.com>
Tue, 1 Apr 2014 07:25:03 +0000 (00:25 -0700)
Tegra14 is not supported by our kernel anymore.

Change-Id: I7fe299f44e2a3446dee78a5df99138670ca8f1f2
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/375976
Reviewed-by: Juha Tukkinen <jtukkinen@nvidia.com>
Tested-by: Juha Tukkinen <jtukkinen@nvidia.com>
12 files changed:
drivers/video/tegra/host/Makefile
drivers/video/tegra/host/chip_support.c
drivers/video/tegra/host/gr2d/gr2d.c
drivers/video/tegra/host/gr3d/gr3d.c
drivers/video/tegra/host/host1x/host1x.c
drivers/video/tegra/host/isp/isp.c
drivers/video/tegra/host/msenc/msenc.c
drivers/video/tegra/host/t148/Makefile [deleted file]
drivers/video/tegra/host/t148/t148.c [deleted file]
drivers/video/tegra/host/t148/t148.h [deleted file]
drivers/video/tegra/host/tsec/tsec.c
drivers/video/tegra/host/vi/vi.c

index 4e84f460cef1e389c344747a2f2f2e9a3c48a70a..98804a0907aba50b5376f8924896f2db719fb738 100644 (file)
@@ -11,15 +11,12 @@ config_present = $(if $(findstring y,$(1)),y,)
 
 all_configs = $(call config_present,$(CONFIG_ARCH_TEGRA_2x_SOC) \
  $(CONFIG_ARCH_TEGRA_3x_SOC) $(CONFIG_ARCH_TEGRA_11x_SOC) \
- $(CONFIG_ARCH_TEGRA_12x_SOC) $(CONFIG_ARCH_TEGRA_14x_SOC))
+ $(CONFIG_ARCH_TEGRA_12x_SOC))
 
 t3x_or_higher_config = $(call config_present,$(CONFIG_ARCH_TEGRA_3x_SOC)\
   $(t11x_or_higher_config))
 
 t11x_or_higher_config = $(call config_present,$(CONFIG_ARCH_TEGRA_11x_SOC)\
-  $(t14x_or_higher_config))
-
-t14x_or_higher_config = $(call config_present,$(CONFIG_ARCH_TEGRA_14x_SOC)\
   $(t12x_or_higher_config))
 
 t12x_or_higher_config = $(call config_present,$(CONFIG_ARCH_TEGRA_12x_SOC))
@@ -42,7 +39,6 @@ obj-$(all_configs) += nvhost.o
 obj-$(all_configs) += host1x/
 obj-$(all_configs) += gr3d/
 obj-$(t11x_or_higher_config) += t114/
-obj-$(t14x_or_higher_config) += t148/
 obj-$(t11x_or_higher_config) += msenc/
 obj-$(t11x_or_higher_config) += tsec/
 obj-$(CONFIG_TEGRA_GRHOST) += gr2d/
index ead47dc32caac3b5afedd594593b7c3cc29632cc..be626e13964a62b99f82b97500daed3b747adbdc 100644 (file)
@@ -1,9 +1,7 @@
 /*
- * drivers/video/tegra/host/chip_support.c
- *
  * Tegra Graphics Host Chip support module
  *
- * Copyright (c) 2012, NVIDIA Corporation.
+ * Copyright (c) 2012-2014, 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,
@@ -27,7 +25,6 @@
 #include "chip_support.h"
 #include "t114/t114.h"
 #include "t124/t124.h"
-#include "t148/t148.h"
 
 struct nvhost_chip_support *nvhost_chip_ops;
 
@@ -65,11 +62,6 @@ int nvhost_init_chip_support(struct nvhost_master *host)
                err = nvhost_init_t124_support(host, nvhost_chip_ops);
                break;
 
-       case TEGRA_CHIPID_TEGRA14:
-               nvhost_chip_ops->soc_name = "tegra14x";
-               err = nvhost_init_t148_support(host, nvhost_chip_ops);
-               break;
-
        default:
                err = -ENODEV;
        }
index 157ce1156a4e1775d157da3d427c9d029ba41e0f..3b30217f75f23863e15b06ff48ee1f9dfe494488 100644 (file)
@@ -1,9 +1,7 @@
 /*
- * drivers/video/tegra/host/gr2d/gr2d.c
- *
  * Tegra Graphics 2D
  *
- * Copyright (c) 2012-2013, NVIDIA Corporation.  All rights reserved.
+ * Copyright (c) 2012-2014, 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,
 #include "nvhost_acm.h"
 #include "gr2d_t114.h"
 #include "t114/t114.h"
-#include "t148/t148.h"
 
 static struct of_device_id tegra_gr2d_of_match[] = {
 #ifdef TEGRA_11X_OR_HIGHER_CONFIG
        { .compatible = "nvidia,tegra114-gr2d",
                .data = (struct nvhost_device_data *)&t11_gr2d_info },
-#endif
-#ifdef TEGRA_14X_OR_HIGHER_CONFIG
-       { .compatible = "nvidia,tegra148-gr2d",
-               .data = (struct nvhost_device_data *)&t14_gr2d_info },
 #endif
        { },
 };
index 164ca8e23aa3428e138d418304c5300c14d80a0d..8b30d452f99efcfdf815aa27671ee801b8f4106b 100644 (file)
@@ -1,6 +1,4 @@
 /*
- * drivers/video/tegra/host/gr3d/gr3d.c
- *
  * Tegra Graphics Host 3D
  *
  * Copyright (c) 2012-2014 NVIDIA Corporation.  All rights reserved.
@@ -34,7 +32,6 @@
 #include <mach/gpufuse.h>
 
 #include "t114/t114.h"
-#include "t148/t148.h"
 #include "host1x/host1x01_hardware.h"
 #include "nvhost_hwctx.h"
 #include "nvhost_acm.h"
@@ -189,10 +186,6 @@ static struct of_device_id tegra_gr3d_of_match[] = {
 #ifdef TEGRA_11X_OR_HIGHER_CONFIG
        { .compatible = "nvidia,tegra114-gr3d",
                .data = (struct nvhost_device_data *)&t11_gr3d_info },
-#endif
-#ifdef TEGRA_14X_OR_HIGHER_CONFIG
-       { .compatible = "nvidia,tegra148-gr3d",
-               .data = (struct nvhost_device_data *)&t14_gr3d_info },
 #endif
        { },
 };
index b1e26c10cf90c440ddc4267cc2610d2ff5d40133..8c45351448277cdda5044be56221a6970032d9b0 100644 (file)
@@ -53,7 +53,6 @@
 #include "nvhost_scale.h"
 #include "chip_support.h"
 #include "t114/t114.h"
-#include "t148/t148.h"
 #include "t124/t124.h"
 
 #define DRIVER_NAME            "host1x"
@@ -633,10 +632,6 @@ static struct of_device_id tegra_host1x_of_match[] = {
        { .compatible = "nvidia,tegra114-host1x",
                .data = (struct nvhost_device_data *)&t11_host1x_info },
 #endif
-#ifdef TEGRA_14X_OR_HIGHER_CONFIG
-       { .compatible = "nvidia,tegra148-host1x",
-               .data = (struct nvhost_device_data *)&t14_host1x_info },
-#endif
 #ifdef TEGRA_12X_OR_HIGHER_CONFIG
        { .compatible = "nvidia,tegra124-host1x",
                .data = (struct nvhost_device_data *)&t124_host1x_info },
@@ -653,10 +648,6 @@ void nvhost_host1x_update_clk(struct platform_device *pdev)
 #ifdef TEGRA_11X_OR_HIGHER_CONFIG
        if (tegra_get_chipid() == TEGRA_CHIPID_TEGRA11)
                pdata = &t11_gr3d_info;
-#endif
-#ifdef TEGRA_14X_OR_HIGHER_CONFIG
-       if (tegra_get_chipid() == TEGRA_CHIPID_TEGRA14)
-               pdata = &t14_gr3d_info;
 #endif
        if (!pdata)
                return;
index e847056508c1d8207609e3d45768577f2b75726c..0aaf0ae9dcf1413d78e712ead38142e8fae6a153 100644 (file)
@@ -33,7 +33,6 @@
 #include "bus_client.h"
 #include "nvhost_acm.h"
 #include "t114/t114.h"
-#include "t148/t148.h"
 #include "t124/t124.h"
 
 #include <linux/uaccess.h>
@@ -58,10 +57,6 @@ static struct of_device_id tegra_isp_of_match[] = {
        { .compatible = "nvidia,tegra114-isp",
                .data = (struct nvhost_device_data *)&t11_isp_info },
 #endif
-#ifdef TEGRA_14X_OR_HIGHER_CONFIG
-       { .compatible = "nvidia,tegra148-isp",
-               .data = (struct nvhost_device_data *)&t14_isp_info },
-#endif
 #ifdef TEGRA_12X_OR_HIGHER_CONFIG
        { .compatible = "nvidia,tegra124-isp",
                .data = (struct nvhost_device_data *)&t124_isp_info },
index 056438bf214e0c1c101bedd9761e81835d43e351..1149773c2cd3f25cd1a9559a2a466e0a71bffd08 100644 (file)
@@ -1,6 +1,4 @@
 /*
- * drivers/video/tegra/host/msenc/msenc.c
- *
  * Tegra MSENC Module Support
  *
  * Copyright (c) 2012-2014, NVIDIA CORPORATION.  All rights reserved.
@@ -42,7 +40,6 @@
 #include "nvhost_scale.h"
 #include "chip_support.h"
 #include "t114/t114.h"
-#include "t148/t148.h"
 #include "t124/t124.h"
 
 #define MSENC_IDLE_TIMEOUT_DEFAULT     10000   /* 10 milliseconds */
@@ -423,10 +420,6 @@ static struct of_device_id tegra_msenc_of_match[] = {
        { .compatible = "nvidia,tegra114-msenc",
                .data = (struct nvhost_device_data *)&t11_msenc_info },
 #endif
-#ifdef TEGRA_14X_OR_HIGHER_CONFIG
-       { .compatible = "nvidia,tegra148-msenc",
-               .data = (struct nvhost_device_data *)&t14_msenc_info },
-#endif
 #ifdef TEGRA_12X_OR_HIGHER_CONFIG
        { .compatible = "nvidia,tegra124-msenc",
                .data = (struct nvhost_device_data *)&t124_msenc_info },
diff --git a/drivers/video/tegra/host/t148/Makefile b/drivers/video/tegra/host/t148/Makefile
deleted file mode 100644 (file)
index 29706a2..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-GCOV_PROFILE := y
-ccflags-y += -Idrivers/video/tegra/host
-ccflags-y += -Werror
-
-nvhost-t148-objs  = \
-        t148.o
-
-obj-$(CONFIG_TEGRA_GRHOST) += nvhost-t148.o
diff --git a/drivers/video/tegra/host/t148/t148.c b/drivers/video/tegra/host/t148/t148.c
deleted file mode 100644 (file)
index 7debe0e..0000000
+++ /dev/null
@@ -1,357 +0,0 @@
-/*
- * drivers/video/tegra/host/t148/t148.c
- *
- * Tegra Graphics Init for T148 Architecture Chips
- *
- * Copyright (c) 2012-2014, 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,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <linux/export.h>
-#include <linux/mutex.h>
-#include <linux/tegra-powergate.h>
-#include <linux/nvhost.h>
-
-#include <mach/mc.h>
-
-#include "dev.h"
-#include "class_ids.h"
-#include "host1x/host1x_cdma.h"
-#include "t148/t148.h"
-#include "t114/t114.h"
-#include "host1x/host1x03_hardware.h"
-#include "gr2d/gr2d_t114.h"
-#include "gr3d/gr3d.h"
-#include "gr3d/gr3d_t114.h"
-#include "gr3d/scale3d.h"
-#include "nvhost_scale.h"
-#include "msenc/msenc.h"
-#include "tsec/tsec.h"
-#include "linux/nvhost_ioctl.h"
-#include "nvhost_channel.h"
-#include "chip_support.h"
-#include "class_ids.h"
-
-/* HACK! This needs to come from DT */
-#include "../../../../../arch/arm/mach-tegra/iomap.h"
-
-static int t148_num_alloc_channels = 0;
-
-static struct resource tegra_host1x03_resources[] = {
-       {
-               .start = TEGRA_HOST1X_BASE,
-               .end = TEGRA_HOST1X_BASE + TEGRA_HOST1X_SIZE - 1,
-               .flags = IORESOURCE_MEM,
-       },
-       {
-               .start = INT_HOST1X_MPCORE_SYNCPT,
-               .end = INT_HOST1X_MPCORE_SYNCPT,
-               .flags = IORESOURCE_IRQ,
-       },
-       {
-               .start = INT_HOST1X_MPCORE_GENERAL,
-               .end = INT_HOST1X_MPCORE_GENERAL,
-               .flags = IORESOURCE_IRQ,
-       },
-};
-
-static struct host1x_device_info host1x03_info = {
-       .nb_channels    = 12,
-       .nb_pts         = 48,
-       .nb_mlocks      = 16,
-       .nb_bases       = 12,
-};
-
-struct nvhost_device_data t14_host1x_info = {
-       .clocks         = { {"host1x", 81600000} },
-       NVHOST_MODULE_NO_POWERGATE_IDS,
-       .private_data   = &host1x03_info,
-};
-
-static struct platform_device tegra_host1x03_device = {
-       .name           = "host1x",
-       .id             = -1,
-       .resource       = tegra_host1x03_resources,
-       .num_resources  = ARRAY_SIZE(tegra_host1x03_resources),
-       .dev            = {
-               .platform_data = &t14_host1x_info,
-       },
-};
-
-struct nvhost_device_data t14_gr3d_info = {
-       .version        = 3,
-       .index          = 1,
-       .waitbases      = {NVWAITBASE_3D},
-       .modulemutexes  = {NVMODMUTEX_3D},
-       .class          = NV_GRAPHICS_3D_CLASS_ID,
-       .clocks         = { {"gr3d", UINT_MAX, 8, TEGRA_MC_CLIENT_NV},
-                           {"emc", UINT_MAX, 75} },
-       .powergate_ids  = { TEGRA_POWERGATE_3D, -1 },
-       NVHOST_DEFAULT_CLOCKGATE_DELAY,
-       .can_powergate  = true,
-       .powergate_delay = 250,
-       .powerup_reset  = true,
-       .moduleid       = NVHOST_MODULE_NONE,
-
-       .busy           = nvhost_scale_notify_busy,
-       .idle           = nvhost_scale_notify_idle,
-       .init           = nvhost_scale_hw_init,
-       .deinit         = nvhost_scale_hw_deinit,
-       .scaling_init   = nvhost_scale3d_init,
-       .scaling_deinit = nvhost_scale3d_deinit,
-       .scaling_post_cb = &nvhost_scale3d_callback,
-       .devfreq_governor = "nvhost_podgov",
-       .actmon_enabled = true,
-       .gpu_edp_device = true,
-
-       .suspend_ndev   = nvhost_scale3d_suspend,
-       .prepare_poweroff = nvhost_gr3d_t114_prepare_power_off,
-       .finalize_poweron = nvhost_gr3d_t114_finalize_power_on,
-       .alloc_hwctx_handler = nvhost_gr3d_t114_ctxhandler_init,
-};
-
-static struct platform_device tegra_gr3d03_device = {
-       .name           = "gr3d",
-       .id             = -1,
-       .dev            = {
-               .platform_data = &t14_gr3d_info,
-       },
-};
-
-struct nvhost_device_data t14_gr2d_info = {
-       .index          = 2,
-       .waitbases      = {NVWAITBASE_2D_0, NVWAITBASE_2D_1},
-       .modulemutexes  = {NVMODMUTEX_2D_FULL, NVMODMUTEX_2D_SIMPLE,
-                         NVMODMUTEX_2D_SB_A, NVMODMUTEX_2D_SB_B},
-       .clocks         = { {"gr2d", 0, 7, TEGRA_MC_CLIENT_G2},
-                           {"epp", 0, 10, TEGRA_MC_CLIENT_EPP},
-                           {"emc", 300000000, 75 } },
-       .powergate_ids  = { TEGRA_POWERGATE_HEG, -1 },
-       .clockgate_delay = 0,
-       .can_powergate  = true,
-       .powergate_delay = 100,
-       .moduleid       = NVHOST_MODULE_NONE,
-       .serialize      = true,
-       .finalize_poweron = nvhost_gr2d_t114_finalize_poweron,
-};
-
-static struct platform_device tegra_gr2d03_device = {
-       .name           = "gr2d",
-       .id             = -1,
-       .dev            = {
-               .platform_data = &t14_gr2d_info,
-       },
-};
-
-static struct resource isp_resources[] = {
-       {
-               .name = "regs",
-               .start = TEGRA_ISP_BASE,
-               .end = TEGRA_ISP_BASE + TEGRA_ISP_SIZE - 1,
-               .flags = IORESOURCE_MEM,
-       }
-};
-
-struct nvhost_device_data t14_isp_info = {
-       .index          = 3,
-       NVHOST_MODULE_NO_POWERGATE_IDS,
-       NVHOST_DEFAULT_CLOCKGATE_DELAY,
-       .moduleid       = NVHOST_MODULE_ISP,
-};
-
-static struct platform_device tegra_isp01_device = {
-       .name           = "isp",
-       .id             = -1,
-       .resource       = isp_resources,
-       .num_resources  = ARRAY_SIZE(isp_resources),
-       .dev            = {
-               .platform_data = &t14_isp_info,
-       },
-};
-
-static struct resource vi_resources[] = {
-       {
-               .name = "regs",
-               .start = TEGRA_VI_BASE,
-               .end = TEGRA_VI_BASE + TEGRA_VI_SIZE - 1,
-               .flags = IORESOURCE_MEM,
-       },
-       {
-               .name = "irq",
-               .start = INT_VI_GENERAL,
-               .end = INT_VI_GENERAL,
-               .flags = IORESOURCE_IRQ,
-       },
-};
-
-struct nvhost_device_data t14_vi_info = {
-       .index          = 4,
-       .modulemutexes  = {NVMODMUTEX_VI_0},
-       .clocks         = { {"host1x", 136000000, 6} },
-       .exclusive      = true,
-       NVHOST_MODULE_NO_POWERGATE_IDS,
-       NVHOST_DEFAULT_CLOCKGATE_DELAY,
-       .moduleid       = NVHOST_MODULE_VI,
-       .update_clk     = nvhost_host1x_update_clk,
-};
-EXPORT_SYMBOL(t14_vi_info);
-
-static struct platform_device tegra_vi01_device = {
-       .name           = "vi",
-       .id             = -1,
-       .resource       = vi_resources,
-       .num_resources  = ARRAY_SIZE(vi_resources),
-       .dev            = {
-               .platform_data = &t14_vi_info,
-       },
-};
-
-static struct resource msenc_resources[] = {
-       {
-               .name = "regs",
-               .start = TEGRA_MSENC_BASE,
-               .end = TEGRA_MSENC_BASE + TEGRA_MSENC_SIZE - 1,
-               .flags = IORESOURCE_MEM,
-       },
-};
-
-struct nvhost_device_data t14_msenc_info = {
-       .version        = NVHOST_ENCODE_MSENC_VER(3, 0),
-       .index          = 5,
-       .waitbases      = {NVWAITBASE_MSENC},
-       .class          = NV_VIDEO_ENCODE_MSENC_CLASS_ID,
-       .clocks         = { {"msenc", UINT_MAX, 107, TEGRA_MC_CLIENT_MSENC},
-                           {"emc", 300000000, 75} },
-       .powergate_ids = { TEGRA_POWERGATE_MPE, -1 },
-       NVHOST_DEFAULT_CLOCKGATE_DELAY,
-       .powergate_delay = 100,
-       .can_powergate = true,
-       .moduleid       = NVHOST_MODULE_MSENC,
-       .powerup_reset  = true,
-       .init           = nvhost_msenc_init,
-       .deinit         = nvhost_msenc_deinit,
-       .finalize_poweron = nvhost_msenc_finalize_poweron,
-};
-
-static struct platform_device tegra_msenc03_device = {
-       .name           = "msenc",
-       .id             = -1,
-       .resource       = msenc_resources,
-       .num_resources  = ARRAY_SIZE(msenc_resources),
-       .dev            = {
-               .platform_data = &t14_msenc_info,
-       },
-};
-
-static struct resource tsec_resources[] = {
-       {
-               .name = "regs",
-               .start = TEGRA_TSEC_BASE,
-               .end = TEGRA_TSEC_BASE + TEGRA_TSEC_SIZE - 1,
-               .flags = IORESOURCE_MEM,
-       },
-};
-
-struct nvhost_device_data t14_tsec_info = {
-       .version        = NVHOST_ENCODE_TSEC_VER(1,0),
-       .index          = 7,
-       .waitbases      = {NVWAITBASE_TSEC},
-       .class          = NV_TSEC_CLASS_ID,
-       .exclusive      = false,
-       .clocks         = { {"tsec", UINT_MAX, 108, TEGRA_MC_CLIENT_TSEC},
-                           {"emc", 300000000, 75} },
-       NVHOST_MODULE_NO_POWERGATE_IDS,
-       NVHOST_DEFAULT_CLOCKGATE_DELAY,
-       .moduleid       = NVHOST_MODULE_TSEC,
-       .init          = nvhost_tsec_init,
-       .deinit        = nvhost_tsec_deinit,
-};
-
-static struct platform_device tegra_tsec01_device = {
-       .name           = "tsec",
-       .id             = -1,
-       .resource       = tsec_resources,
-       .num_resources  = ARRAY_SIZE(tsec_resources),
-       .dev            = {
-               .platform_data = &t14_tsec_info,
-       },
-};
-
-static struct platform_device *t14_devices[] = {
-       &tegra_gr3d03_device,
-       &tegra_gr2d03_device,
-       &tegra_isp01_device,
-       &tegra_vi01_device,
-       &tegra_msenc03_device,
-       &tegra_tsec01_device,
-};
-
-struct platform_device *tegra14_register_host1x_devices(void)
-{
-       int index = 0;
-       struct platform_device *pdev;
-
-       /* register host1x device first */
-       platform_device_register(&tegra_host1x03_device);
-       tegra_host1x03_device.dev.parent = NULL;
-
-       /* register clients with host1x device as parent */
-       for (index = 0; index < ARRAY_SIZE(t14_devices); index++) {
-               pdev = t14_devices[index];
-               pdev->dev.parent = &tegra_host1x03_device.dev;
-               platform_device_register(pdev);
-       }
-
-       return &tegra_host1x03_device;
-}
-
-#include "host1x/host1x_channel.c"
-#include "host1x/host1x_cdma.c"
-#include "host1x/host1x_debug.c"
-#include "host1x/host1x_syncpt.c"
-#include "host1x/host1x_intr.c"
-#include "host1x/host1x_actmon_t114.c"
-
-static void t148_free_nvhost_channel(struct nvhost_channel *ch)
-{
-       nvhost_free_channel_internal(ch, &t148_num_alloc_channels);
-}
-
-static struct nvhost_channel *t148_alloc_nvhost_channel(
-               struct platform_device *dev)
-{
-       struct nvhost_device_data *pdata = platform_get_drvdata(dev);
-       struct nvhost_channel *ch = nvhost_alloc_channel_internal(pdata->index,
-               nvhost_get_host(dev)->info.nb_channels,
-               &t148_num_alloc_channels);
-       if (ch)
-               ch->ops = host1x_channel_ops;
-       return ch;
-}
-
-int nvhost_init_t148_support(struct nvhost_master *host,
-       struct nvhost_chip_support *op)
-{
-       op->cdma = host1x_cdma_ops;
-       op->push_buffer = host1x_pushbuffer_ops;
-       op->debug = host1x_debug_ops;
-       host->sync_aperture = host->aperture + HOST1X_CHANNEL_SYNC_REG_BASE;
-       op->syncpt = host1x_syncpt_ops;
-       op->intr = host1x_intr_ops;
-       op->nvhost_dev.alloc_nvhost_channel = t148_alloc_nvhost_channel;
-       op->nvhost_dev.free_nvhost_channel = t148_free_nvhost_channel;
-       op->actmon = host1x_actmon_ops;
-
-       return 0;
-}
diff --git a/drivers/video/tegra/host/t148/t148.h b/drivers/video/tegra/host/t148/t148.h
deleted file mode 100644 (file)
index 9910b1a..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * drivers/video/tegra/host/t148/t148.h
- *
- * Support for T148 Architecture Chips
- *
- * Copyright (c) 2012, NVIDIA Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef _NVHOST_T148_H_
-#define _NVHOST_T148_H_
-
-#include "chip_support.h"
-
-#ifdef TEGRA_14X_OR_HIGHER_CONFIG
-int nvhost_init_t148_support(struct nvhost_master *host,
-               struct nvhost_chip_support *);
-#else
-static inline int nvhost_init_t148_support(struct nvhost_master *host,
-                                          struct nvhost_chip_support *op)
-{
-       return -ENODEV;
-}
-#endif
-
-extern struct nvhost_device_data t14_host1x_info;
-extern struct nvhost_device_data t14_gr3d_info;
-extern struct nvhost_device_data t14_gr2d_info;
-extern struct nvhost_device_data t14_isp_info;
-extern struct nvhost_device_data t14_vi_info;
-extern struct nvhost_device_data t14_msenc_info;
-extern struct nvhost_device_data t14_tsec_info;
-
-#endif
index cbb504d77ae910e188bb65ce290034dbff90f5ec..76bc88292c41c93555f4aacbb81b70371c5c466a 100644 (file)
@@ -1,6 +1,4 @@
 /*
- * drivers/video/tegra/host/tsec/tsec.c
- *
  * Tegra TSEC Module Support
  *
  * Copyright (c) 2012-2014, NVIDIA CORPORATION.  All rights reserved.
@@ -43,7 +41,6 @@
 #include "chip_support.h"
 #include "nvhost_intr.h"
 #include "t114/t114.h"
-#include "t148/t148.h"
 #include "t124/t124.h"
 
 #define TSEC_IDLE_TIMEOUT_DEFAULT      10000   /* 10 milliseconds */
@@ -513,10 +510,6 @@ static struct of_device_id tegra_tsec_of_match[] = {
        { .compatible = "nvidia,tegra114-tsec",
                .data = (struct nvhost_device_data *)&t11_tsec_info },
 #endif
-#ifdef TEGRA_14X_OR_HIGHER_CONFIG
-       { .compatible = "nvidia,tegra148-tsec",
-               .data = (struct nvhost_device_data *)&t14_tsec_info },
-#endif
 #ifdef TEGRA_12X_OR_HIGHER_CONFIG
        { .compatible = "nvidia,tegra124-tsec",
                .data = (struct nvhost_device_data *)&t124_tsec_info },
index f174cff7733f9ad5ecc081950868b58c48f4ab79..d1faafb91c99e2b6bf7b53c6780f2b455fa7da42 100644 (file)
@@ -34,7 +34,6 @@
 #include "bus_client.h"
 #include "nvhost_acm.h"
 #include "t114/t114.h"
-#include "t148/t148.h"
 #include "t124/t124.h"
 #include "vi.h"
 #include "vi_irq.h"
@@ -53,10 +52,6 @@ static struct of_device_id tegra_vi_of_match[] = {
        { .compatible = "nvidia,tegra114-vi",
                .data = (struct nvhost_device_data *)&t11_vi_info },
 #endif
-#ifdef TEGRA_14X_OR_HIGHER_CONFIG
-       { .compatible = "nvidia,tegra148-vi",
-               .data = (struct nvhost_device_data *)&t14_vi_info },
-#endif
 #ifdef TEGRA_12X_OR_HIGHER_CONFIG
        { .compatible = "nvidia,tegra124-vi",
                .data = (struct nvhost_device_data *)&t124_vi_info },