Merge remote-tracking branch 'spi/topic/pl022' into spi-next

diff --combined drivers/spi/spi-pl022.c
index 4b564b74c99c7a16b7e4fb2074a587143b5fe3dc,1871bf3fd389a3da29318b050e7f1581aeea9d82..5a9e05e20bb5b4e0e61231e35cf538b565ddc550
--- 1/drivers/spi/spi-pl022.c
--- 2/drivers/spi/spi-pl022.c
+++ b/drivers/spi/spi-pl022.c
@@@ -2091,8 -2091,7 +2091,8 @@@ pl022_platform_data_dt_get(struct devic
  static int pl022_probe(struct amba_device *adev, const struct amba_id *id)
  {
        struct device *dev = &adev->dev;
 -      struct pl022_ssp_controller *platform_info = adev->dev.platform_data;
 +      struct pl022_ssp_controller *platform_info =
 +                      dev_get_platdata(&adev->dev);
        struct spi_master *master;
        struct pl022 *pl022 = NULL;     /*Data for this driver */
        struct device_node *np = adev->dev.of_node;
@@@ -2194,8 -2193,8 +2194,8 @@@
                status = -ENOMEM;
                goto err_no_ioremap;
        }
-       printk(KERN_INFO "pl022: mapped registers from 0x%08x to %p\n",
-              adev->res.start, pl022->virtbase);
+       printk(KERN_INFO "pl022: mapped registers from %pa to %p\n",
+              &adev->res.start, pl022->virtbase);
  
        pl022->clk = devm_clk_get(&adev->dev, NULL);
        if (IS_ERR(pl022->clk)) {