[ARM] tegra: add tegra_wdt_device to devices.c
Gary King [Fri, 27 Aug 2010 03:00:29 +0000 (20:00 -0700)]
Change-Id: I8098fa38ebef8636a6eeb1179e679201445e5237
Signed-off-by: Gary King <gking@nvidia.com>

Rebase-Id: Ra8ae85ee17bd96434753b11e12354a8636a5d8b9

arch/arm/mach-tegra/devices.c
arch/arm/mach-tegra/devices.h

index 175e579..de61ac7 100644 (file)
@@ -902,3 +902,28 @@ struct platform_device tegra_gart_device = {
        .num_resources  = ARRAY_SIZE(tegra_gart_resources),
        .resource       = tegra_gart_resources
 };
+
+static struct resource tegra_wdt_resources[] = {
+       [0] = {
+               .start  = TEGRA_CLK_RESET_BASE,
+               .end    = TEGRA_CLK_RESET_BASE + 4 - 1,
+               .flags  = IORESOURCE_MEM,
+       },
+       [1] = {
+               .start  = TEGRA_TMR1_BASE,
+               .end    = TEGRA_TMR1_BASE + TEGRA_TMR1_SIZE - 1,
+               .flags  = IORESOURCE_MEM,
+       },
+       [2] = {
+               .start  = INT_TMR1,
+               .end    = INT_TMR1,
+               .flags  = IORESOURCE_IRQ,
+       },
+};
+
+struct platform_device tegra_wdt_device = {
+       .name           = "tegra_wdt",
+       .id             = -1,
+       .num_resources  = ARRAY_SIZE(tegra_wdt_resources),
+       .resource       = tegra_wdt_resources,
+};
index d8c30f9..72f4086 100644 (file)
@@ -1,11 +1,5 @@
 /*
-<<<<<<< HEAD
  * Copyright (C) 2010,2011 Google, Inc.
-=======
- * arch/arm/mach-tegra/devices.h
- *
- * Copyright (C) 2010 Google, Inc.
->>>>>>> w1: master: tegra_w1: Adds generic mach-tegra w1 support.
  *
  * Author:
  *     Colin Cross <ccross@android.com>
@@ -62,5 +56,5 @@ extern struct platform_device tegra_ehci3_device;
 extern struct platform_device tegra_i2s_device1;
 extern struct platform_device tegra_i2s_device2;
 extern struct platform_device tegra_gart_device;
-
+extern struct platform_device tegra_wdt_device;
 #endif