summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAdam Jiang <chaoj@nvidia.com>2011-11-21 15:48:41 +0900
committerVarun Colbert <vcolbert@nvidia.com>2012-01-13 14:05:48 -0800
commit5645a8ee9a7a89a90de766ef0f1104c51d3b689c (patch)
tree0d07d2118df25f96a288441b9c7269f9e272c5ec /arch
parent76127876b09a54f9fee7290e23d36754b398ecee (diff)
Tegra: DTV: Added resources and device for DTV
Added dtv interface device to Tegra3 platform. Fixed Bug 904626 Fixed Bug 881303 Change-Id: Id2a4e6f015d3edf1ecd0e76f5586ae2ec00ed380 Signed-off-by: Adam Jiang <chaoj@nvidia.com> Reviewed-on: http://git-master/r/66627 Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com> Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com> Reviewed-on: http://git-master/r/74890 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-tegra/devices.c34
-rw-r--r--arch/arm/mach-tegra/devices.h1
-rw-r--r--arch/arm/mach-tegra/include/mach/irqs.h1
3 files changed, 36 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/devices.c b/arch/arm/mach-tegra/devices.c
index 59638a59d275..b9a3b035f162 100644
--- a/arch/arm/mach-tegra/devices.c
+++ b/arch/arm/mach-tegra/devices.c
@@ -271,6 +271,27 @@ static struct resource spi_resource6[] = {
};
#endif
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
+static struct resource dtv_resource[] = {
+ [0] = {
+ .start = INT_DTV,
+ .end = INT_DTV,
+ .flags = IORESOURCE_IRQ,
+ },
+ [1] = {
+ .start = TEGRA_DTV_BASE,
+ .end = TEGRA_DTV_BASE + TEGRA_DTV_SIZE - 1,
+ .flags = IORESOURCE_MEM,
+ },
+ [2] = {
+ .start = TEGRA_DMA_REQ_SEL_DTV,
+ .end = TEGRA_DMA_REQ_SEL_DTV,
+ .flags = IORESOURCE_DMA
+ },
+};
+#endif
+
+
struct platform_device tegra_spi_device1 = {
.name = "spi_tegra",
.id = 0,
@@ -423,6 +444,19 @@ struct platform_device tegra_nor_device = {
},
};
+#ifndef CONFIG_ARCH_TEGRA_2x_SOC
+struct platform_device tegra_dtv_device = {
+ .name = "tegra_dtv",
+ .id = -1,
+ .resource = dtv_resource,
+ .num_resources = ARRAY_SIZE(dtv_resource),
+ .dev = {
+ .init_name = "dtv",
+ .coherent_dma_mask = 0xffffffff,
+ },
+};
+#endif
+
static struct resource sdhci_resource1[] = {
[0] = {
.start = INT_SDMMC1,
diff --git a/arch/arm/mach-tegra/devices.h b/arch/arm/mach-tegra/devices.h
index 0facd56ce3df..f205d2b5e9ab 100644
--- a/arch/arm/mach-tegra/devices.h
+++ b/arch/arm/mach-tegra/devices.h
@@ -49,6 +49,7 @@ extern struct platform_device tegra_spi_device5;
extern struct platform_device tegra_spi_device6;
extern struct platform_device tegra_spi_slave_device5;
extern struct platform_device tegra_spi_slave_device6;
+extern struct platform_device tegra_dtv_device;
#endif
extern struct platform_device tegra_ehci1_device;
extern struct platform_device tegra_ehci2_device;
diff --git a/arch/arm/mach-tegra/include/mach/irqs.h b/arch/arm/mach-tegra/include/mach/irqs.h
index 986820fa5ff0..bf1b12559be8 100644
--- a/arch/arm/mach-tegra/include/mach/irqs.h
+++ b/arch/arm/mach-tegra/include/mach/irqs.h
@@ -229,6 +229,7 @@
#define INT_UARTB (INT_SEC_BASE + 5)
#define INT_I2C (INT_SEC_BASE + 6)
#define INT_SPI (INT_SEC_BASE + 7)
+#define INT_DTV INT_SPI
#define INT_TWC (INT_SEC_BASE + 8)
#define INT_TMR3 (INT_SEC_BASE + 9)
#define INT_TMR4 (INT_SEC_BASE + 10)