Merge branches 'pxa' and 'orion-fixes1'

diff --combined drivers/mfd/htc-pasic3.c
index 4edc120a6359490a816eca96f30dbbc3a5eda624,cb4ab27a2ef5a348e8c780a1c99ade1dce414c76,4edc120a6359490a816eca96f30dbbc3a5eda624..633cbba072f024f013a17f42cc8b3181c63ef8a4
--- 1/drivers/mfd/htc-pasic3.c
--- 2/drivers/mfd/htc-pasic3.c
--- 3/drivers/mfd/htc-pasic3.c
+++ b/drivers/mfd/htc-pasic3.c
@@@@ -19,6 -19,8 -19,6 +19,6 @@@@
   #include <linux/interrupt.h>
   #include <linux/mfd/htc-pasic3.h>
   
 - #include <asm/arch/pxa-regs.h>
 - 
   struct pasic3_data {
        void __iomem *mapping;
        unsigned int bus_shift;
@@@@ -28,6 -30,7 -28,6 +28,6 @@@@
   
   #define REG_ADDR  5
   #define REG_DATA  6
 - #define NUM_REGS  7
   
   #define READ_MODE 0x80
   
@@@@ -132,8 -135,9 -132,8 +132,9 @@@@ static struct ds1wm_platform_data ds1wm
        .disable   = ds1wm_disable,
   };
   
- -static int ds1wm_device_add(struct device *pasic3_dev, int bus_shift)
+ +static int ds1wm_device_add(struct platform_device *pasic3_pdev, int bus_shift)
   {
+ +     struct device *pasic3_dev = &pasic3_pdev->dev;
        struct pasic3_data *asic = pasic3_dev->driver_data;
        struct platform_device *pdev;
        int ret;
@@@@ -144,8 -148,8 -144,8 +145,8 @@@@
                return -ENOMEM;
        }
   
- -     ret = platform_device_add_resources(pdev, pdev->resource,
- -                                             pdev->num_resources);
+ +     ret = platform_device_add_resources(pdev, pasic3_pdev->resource,
+ +                                             pasic3_pdev->num_resources);
        if (ret < 0) {
                dev_dbg(pasic3_dev, "failed to add DS1WM resources\n");
                goto exit_pdev_put;
@@@@ -207,7 -211,7 -207,7 +208,7 @@@@ static int __init pasic3_probe(struct p
                return -ENOMEM;
        }
   
- -     ret = ds1wm_device_add(dev, asic->bus_shift);
+ +     ret = ds1wm_device_add(pdev, asic->bus_shift);
        if (ret < 0)
                dev_warn(dev, "failed to register DS1WM\n");