From 69230a5dd6accab386b6357f72d9c9ffe3af3a06 Mon Sep 17 00:00:00 2001
From: Pawel Moll <pawel.moll@arm.com>
Date: Wed, 7 Sep 2011 13:36:26 +0100
Subject: [PATCH] --- yaml --- r: 269325 b: refs/heads/master c:
 37210fbe1ddcd91b0331877fae81645978b5c3b1 h: refs/heads/master i:   269323:
 a76620c513fef273be8f8b73a9ace9214c5a93d3 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/ata/Kconfig            | 2 +-
 trunk/drivers/ata/pata_of_platform.c | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 7705a029be55..c64e842d6448 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: edc7d12ede4333a1fd7b59cebae970b4953ec9d0
+refs/heads/master: 37210fbe1ddcd91b0331877fae81645978b5c3b1
diff --git a/trunk/drivers/ata/Kconfig b/trunk/drivers/ata/Kconfig
index 5987e0ba8c2d..c6ef9d0cf370 100644
--- a/trunk/drivers/ata/Kconfig
+++ b/trunk/drivers/ata/Kconfig
@@ -820,7 +820,7 @@ config PATA_PLATFORM
 
 config PATA_OF_PLATFORM
 	tristate "OpenFirmware platform device PATA support"
-	depends on PATA_PLATFORM && PPC_OF
+	depends on PATA_PLATFORM && OF
 	help
 	  This option enables support for generic directly connected ATA
 	  devices commonly found on embedded systems with OpenFirmware
diff --git a/trunk/drivers/ata/pata_of_platform.c b/trunk/drivers/ata/pata_of_platform.c
index f3054009bd25..a72ab0dde4e5 100644
--- a/trunk/drivers/ata/pata_of_platform.c
+++ b/trunk/drivers/ata/pata_of_platform.c
@@ -11,6 +11,8 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/ata_platform.h>
 
@@ -57,11 +59,11 @@ static int __devinit pata_of_platform_probe(struct platform_device *ofdev)
 
 	prop = of_get_property(dn, "reg-shift", NULL);
 	if (prop)
-		reg_shift = *prop;
+		reg_shift = be32_to_cpup(prop);
 
 	prop = of_get_property(dn, "pio-mode", NULL);
 	if (prop) {
-		pio_mode = *prop;
+		pio_mode = be32_to_cpup(prop);
 		if (pio_mode > 6) {
 			dev_err(&ofdev->dev, "invalid pio-mode\n");
 			return -EINVAL;