3 files changed, 27 insertions, 28 deletions

diff --git a/arch/arm/boot/dts/omap3-devkit8000.dts b/arch/arm/boot/dts/omap3-devkit8000.dts
index af32eff9f4b7..7ef282795dd4 100644
--- a/arch/arm/boot/dts/omap3-devkit8000.dts
+++ b/arch/arm/boot/dts/omap3-devkit8000.dts
@@ -124,20 +124,21 @@
                 reg = <0 0 0>; /* CS0, offset 0 */
                 nand-bus-width = <16>;
 
-                gpmc,sync-clk = <0>;
-                gpmc,cs-on = <0>;
-                gpmc,cs-rd-off = <44>;
-                gpmc,cs-wr-off = <44>;
-                gpmc,adv-on = <6>;
-                gpmc,adv-rd-off = <34>;
-                gpmc,adv-wr-off = <44>;
-                gpmc,we-off = <40>;
-                gpmc,oe-off = <54>;
-                gpmc,access = <64>;
-                gpmc,rd-cycle = <82>;
-                gpmc,wr-cycle = <82>;
-                gpmc,wr-access = <40>;
-                gpmc,wr-data-mux-bus = <0>;
+                gpmc,device-nand;
+                gpmc,sync-clki-ps = <0>;
+                gpmc,cs-on-ns = <0>;
+                gpmc,cs-rd-off-ns = <44>;
+                gpmc,cs-wr-off-ns = <44>;
+                gpmc,adv-on-ns = <6>;
+                gpmc,adv-rd-off-ns = <34>;
+                gpmc,adv-wr-off-ns = <44>;
+                gpmc,we-off-ns = <40>;
+                gpmc,oe-off-ns = <54>;
+                gpmc,access-ns = <64>;
+                gpmc,rd-cycle-ns = <82>;
+                gpmc,wr-cycle-ns = <82>;
+                gpmc,wr-access-ns = <40>;
+                gpmc,wr-data-mux-bus-ns = <0>;
 
                 #address-cells = <1>;
                 #size-cells = <1>;
diff --git a/arch/powerpc/include/asm/ibmebus.h b/arch/powerpc/include/asm/ibmebus.h
index 1a9d9aea21fa..088f95b2e14f 100644
--- a/arch/powerpc/include/asm/ibmebus.h
+++ b/arch/powerpc/include/asm/ibmebus.h
@@ -48,8 +48,8 @@
 
 extern struct bus_type ibmebus_bus_type;
 
-int ibmebus_register_driver(struct of_platform_driver *drv);
-void ibmebus_unregister_driver(struct of_platform_driver *drv);
+int ibmebus_register_driver(struct platform_driver *drv);
+void ibmebus_unregister_driver(struct platform_driver *drv);
 
 int ibmebus_request_irq(u32 ist, irq_handler_t handler,
                         unsigned long irq_flags, const char *devname,
diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c
index 8220baa46faf..16a7c2326d48 100644
--- a/arch/powerpc/kernel/ibmebus.c
+++ b/arch/powerpc/kernel/ibmebus.c
@@ -205,7 +205,7 @@ static int ibmebus_create_devices(const struct of_device_id *matches)
         return ret;
 }
 
-int ibmebus_register_driver(struct of_platform_driver *drv)
+int ibmebus_register_driver(struct platform_driver *drv)
 {
         /* If the driver uses devices that ibmebus doesn't know, add them */
         ibmebus_create_devices(drv->driver.of_match_table);
@@ -215,7 +215,7 @@ int ibmebus_register_driver(struct of_platform_driver *drv)
 }
 EXPORT_SYMBOL(ibmebus_register_driver);
 
-void ibmebus_unregister_driver(struct of_platform_driver *drv)
+void ibmebus_unregister_driver(struct platform_driver *drv)
 {
         driver_unregister(&drv->driver);
 }
@@ -338,11 +338,10 @@ static int ibmebus_bus_bus_match(struct device *dev, struct device_driver *drv)
 static int ibmebus_bus_device_probe(struct device *dev)
 {
         int error = -ENODEV;
-        struct of_platform_driver *drv;
+        struct platform_driver *drv;
         struct platform_device *of_dev;
-        const struct of_device_id *match;
 
-        drv = to_of_platform_driver(dev->driver);
+        drv = to_platform_driver(dev->driver);
         of_dev = to_platform_device(dev);
 
         if (!drv->probe)
@@ -350,9 +349,8 @@ static int ibmebus_bus_device_probe(struct device *dev)
 
         of_dev_get(of_dev);
 
-        match = of_match_device(drv->driver.of_match_table, dev);
-        if (match)
-                error = drv->probe(of_dev, match);
+        if (of_driver_match_device(dev, dev->driver))
+                error = drv->probe(of_dev);
         if (error)
                 of_dev_put(of_dev);
 
@@ -362,7 +360,7 @@ static int ibmebus_bus_device_probe(struct device *dev)
 static int ibmebus_bus_device_remove(struct device *dev)
 {
         struct platform_device *of_dev = to_platform_device(dev);
-        struct of_platform_driver *drv = to_of_platform_driver(dev->driver);
+        struct platform_driver *drv = to_platform_driver(dev->driver);
 
         if (dev->driver && drv->remove)
                 drv->remove(of_dev);
@@ -372,7 +370,7 @@ static int ibmebus_bus_device_remove(struct device *dev)
 static void ibmebus_bus_device_shutdown(struct device *dev)
 {
         struct platform_device *of_dev = to_platform_device(dev);
-        struct of_platform_driver *drv = to_of_platform_driver(dev->driver);
+        struct platform_driver *drv = to_platform_driver(dev->driver);
 
         if (dev->driver && drv->shutdown)
                 drv->shutdown(of_dev);
@@ -419,7 +417,7 @@ struct device_attribute ibmebus_bus_device_attrs[] = {
 static int ibmebus_bus_legacy_suspend(struct device *dev, pm_message_t mesg)
 {
         struct platform_device *of_dev = to_platform_device(dev);
-        struct of_platform_driver *drv = to_of_platform_driver(dev->driver);
+        struct platform_driver *drv = to_platform_driver(dev->driver);
         int ret = 0;
 
         if (dev->driver && drv->suspend)
@@ -430,7 +428,7 @@ static int ibmebus_bus_legacy_suspend(struct device *dev, pm_message_t mesg)
 static int ibmebus_bus_legacy_resume(struct device *dev)
 {
         struct platform_device *of_dev = to_platform_device(dev);
-        struct of_platform_driver *drv = to_of_platform_driver(dev->driver);
+        struct platform_driver *drv = to_platform_driver(dev->driver);
         int ret = 0;
 
         if (dev->driver && drv->resume)