From 2053513ec4fa1754feb133127222b7c417e8f187 Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@linaro.org>
Date: Tue, 29 May 2012 15:06:55 +0800
Subject: [PATCH] --- yaml --- r: 310119 b: refs/heads/master c:
 48a4ea626ddfad1c714ac4e3b7049347c22f2aa2 h: refs/heads/master i:   310117:
 7d01f71d68ebfc603298d5e2cec4d2435673872c   310115:
 9e170141f21e39556bf212d641c7f3958174712e   310111:
 17dd12989a5130e2b9866f2b768bd4161c17a031 v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/arm/mach-ux500/board-mop500.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 3a87f6b2db26..8dfb425a2e3a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93b5698aae844f75709f759a6c92109ce40780da
+refs/heads/master: 48a4ea626ddfad1c714ac4e3b7049347c22f2aa2
diff --git a/trunk/arch/arm/mach-ux500/board-mop500.c b/trunk/arch/arm/mach-ux500/board-mop500.c
index c27a9b07bd50..5c5bfd5d1b11 100644
--- a/trunk/arch/arm/mach-ux500/board-mop500.c
+++ b/trunk/arch/arm/mach-ux500/board-mop500.c
@@ -680,7 +680,6 @@ static struct platform_device *snowball_platform_devs[] __initdata = {
 static struct platform_device *snowball_of_platform_devs[] __initdata = {
 	&snowball_led_dev,
 	&snowball_key_dev,
-	&ab8500_device,
 };
 
 static void __init mop500_init_machine(void)
@@ -841,6 +840,9 @@ struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {
 static const struct of_device_id u8500_local_bus_nodes[] = {
 	/* only create devices below soc node */
 	{ .compatible = "stericsson,db8500", },
+	{ .compatible = "stericsson,db8500-prcmu", },
+	{ .compatible = "stericsson,ab8500", },
+	{ .compatible = "stericsson,ab8500-regulator", },
 	{ .compatible = "simple-bus"},
 	{ },
 };
@@ -876,7 +878,6 @@ static void __init u8500_init_machine(void)
 				ARRAY_SIZE(mop500_platform_devs));
 
 		mop500_sdi_init(parent);
-
 		i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices);
 		i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs);
 		i2c_register_board_info(2, mop500_i2c2_devices,
@@ -888,7 +889,7 @@ static void __init u8500_init_machine(void)
 		 *   snowball_led_dev   = todo
 		 *   snowball_key_dev   = todo
 		 *   snowball_sbnet_dev = done
-		 *   ab8500_device      = todo
+		 *   ab8500_device      = done
 		 */
 		platform_add_devices(snowball_of_platform_devs,
 				ARRAY_SIZE(snowball_of_platform_devs));