From a82f9731c741e12650659a7021ad88716710cbc7 Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Mon, 1 Dec 2008 14:15:38 -0800
Subject: [PATCH] --- yaml --- r: 123711 b: refs/heads/master c:
 3d89baa73a392e242b5eb7b0e749a08af3bf014f h: refs/heads/master i:   123709:
 279e92f4e950df08309c77a7c4fbc80d30d87574   123707:
 768016688bd18f661a9c195974beb4bd77d5e3c4   123703:
 f675b4ba5116ec4107a6d97515091923f636ea90   123695:
 9fbad5f5b9cf456fab45d8dd7032e677fa8c9a17   123679:
 4ff28f2b5be2978e98fabc8462f9927eca595554   123647:
 7f95134b629547e4b10c0fc355f2a61cc2219bb6 v: v3

---
 [refs]                            |  2 +-
 trunk/arch/arm/mach-mx2/devices.c | 15 +++++++++++++++
 trunk/arch/arm/mach-mx2/devices.h |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5697070d6356..66ba5a887162 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7180d868e3ff0741e9483c7a056445854e5af876
+refs/heads/master: 3d89baa73a392e242b5eb7b0e749a08af3bf014f
diff --git a/trunk/arch/arm/mach-mx2/devices.c b/trunk/arch/arm/mach-mx2/devices.c
index bd0559d5933e..092e09baeefa 100644
--- a/trunk/arch/arm/mach-mx2/devices.c
+++ b/trunk/arch/arm/mach-mx2/devices.c
@@ -190,6 +190,21 @@ struct platform_device mxc_wdt = {
 	.resource = mxc_wdt_resources,
 };
 
+static struct resource mxc_w1_master_resources[] = {
+	{
+		.start = OWIRE_BASE_ADDR,
+		.end   = OWIRE_BASE_ADDR + SZ_4K - 1,
+		.flags = IORESOURCE_MEM,
+	},
+};
+
+struct platform_device mxc_w1_master_device = {
+	.name = "mxc_w1",
+	.id = 0,
+	.num_resources = ARRAY_SIZE(mxc_w1_master_resources),
+	.resource = mxc_w1_master_resources,
+};
+
 /* GPIO port description */
 static struct mxc_gpio_port imx_gpio_ports[] = {
 	[0] = {
diff --git a/trunk/arch/arm/mach-mx2/devices.h b/trunk/arch/arm/mach-mx2/devices.h
index c77a4b8f73b4..5683c4574325 100644
--- a/trunk/arch/arm/mach-mx2/devices.h
+++ b/trunk/arch/arm/mach-mx2/devices.h
@@ -12,4 +12,4 @@ extern struct platform_device mxc_uart_device2;
 extern struct platform_device mxc_uart_device3;
 extern struct platform_device mxc_uart_device4;
 extern struct platform_device mxc_uart_device5;
-
+extern struct platform_device mxc_w1_master_device;