6 files changed, 24 insertions, 8 deletions

diff --git a/drivers/mmc/host/sdhci-of-core.c b/drivers/mmc/host/sdhci-of-core.c
index fa19d849a920..dd84124f4209 100644
--- a/drivers/mmc/host/sdhci-of-core.c
+++ b/drivers/mmc/host/sdhci-of-core.c
@@ -13,6 +13,7 @@
  * your option) any later version.
  */
 
+#include <linux/err.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/io.h>
@@ -20,8 +21,12 @@
 #include <linux/delay.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/mmc/host.h>
+#ifdef CONFIG_PPC
 #include <asm/machdep.h>
+#endif
 #include "sdhci-of.h"
 #include "sdhci.h"
 
@@ -112,7 +117,11 @@ static bool __devinit sdhci_of_wp_inverted(struct device_node *np)
                 return true;
 
         /* Old device trees don't have the wp-inverted property. */
+#ifdef CONFIG_PPC
         return machine_is(mpc837x_rdb) || machine_is(mpc837x_mds);
+#else
+        return false;
+#endif
 }
 
 static int __devinit sdhci_of_probe(struct platform_device *ofdev,
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 1906840c1113..13bfa9d48082 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -156,10 +156,10 @@ config SPI_IMX_VER_0_4
         def_bool y if ARCH_MX31
 
 config SPI_IMX_VER_0_7
-        def_bool y if ARCH_MX25 || ARCH_MX35 || ARCH_MX51
+        def_bool y if ARCH_MX25 || ARCH_MX35 || ARCH_MX51 || ARCH_MX53
 
 config SPI_IMX_VER_2_3
-        def_bool y if ARCH_MX51
+        def_bool y if ARCH_MX51 || ARCH_MX53
 
 config SPI_IMX
         tristate "Freescale i.MX SPI controllers"
@@ -310,8 +310,8 @@ config SPI_S3C24XX_GPIO
 
 config SPI_S3C64XX
         tristate "Samsung S3C64XX series type SPI"
-        depends on ARCH_S3C64XX && EXPERIMENTAL
-        select S3C64XX_DMA
+        depends on (ARCH_S3C64XX || ARCH_S5P64X0)
+        select S3C64XX_DMA if ARCH_S3C64XX
         help
           SPI driver for Samsung S3C64XX and newer SoCs.
 
diff --git a/drivers/spi/amba-pl022.c b/drivers/spi/amba-pl022.c
index a2a5921c730a..71a1219a995d 100644
--- a/drivers/spi/amba-pl022.c
+++ b/drivers/spi/amba-pl022.c
@@ -1795,7 +1795,7 @@ static int pl022_setup(struct spi_device *spi)
 {
         struct pl022_config_chip const *chip_info;
         struct chip_data *chip;
-        struct ssp_clock_params clk_freq;
+        struct ssp_clock_params clk_freq = {0, };
         int status = 0;
         struct pl022 *pl022 = spi_master_get_devdata(spi->master);
         unsigned int bits = spi->bits_per_word;
diff --git a/drivers/spi/dw_spi_mmio.c b/drivers/spi/dw_spi_mmio.c
index db35bd9c1b24..2fa012c109bc 100644
--- a/drivers/spi/dw_spi_mmio.c
+++ b/drivers/spi/dw_spi_mmio.c
@@ -9,6 +9,7 @@
  */
 
 #include <linux/clk.h>
+#include <linux/err.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
@@ -68,8 +69,8 @@ static int __devinit dw_spi_mmio_probe(struct platform_device *pdev)
         }
 
         dwsmmio->clk = clk_get(&pdev->dev, NULL);
-        if (!dwsmmio->clk) {
-                ret = -ENODEV;
+        if (IS_ERR(dwsmmio->clk)) {
+                ret = PTR_ERR(dwsmmio->clk);
                 goto err_irq;
         }
         clk_enable(dwsmmio->clk);
diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c
index 9469564e6888..1cf9d5faabf4 100644
--- a/drivers/spi/spi_imx.c
+++ b/drivers/spi/spi_imx.c
@@ -743,6 +743,12 @@ static struct platform_device_id spi_imx_devtype[] = {
                 .name = "imx51-ecspi",
                 .driver_data = SPI_IMX_VER_2_3,
         }, {
+                .name = "imx53-cspi",
+                .driver_data = SPI_IMX_VER_0_7,
+        }, {
+                .name = "imx53-ecspi",
+                .driver_data = SPI_IMX_VER_2_3,
+        }, {
                 /* sentinel */
         }
 };
diff --git a/drivers/spi/spi_tegra.c b/drivers/spi/spi_tegra.c
index bb7df02a5472..891e5909038c 100644
--- a/drivers/spi/spi_tegra.c
+++ b/drivers/spi/spi_tegra.c
@@ -513,7 +513,7 @@ static int __init spi_tegra_probe(struct platform_device *pdev)
         }
 
         tspi->clk = clk_get(&pdev->dev, NULL);
-        if (IS_ERR_OR_NULL(tspi->clk)) {
+        if (IS_ERR(tspi->clk)) {
                 dev_err(&pdev->dev, "can not get clock\n");
                 ret = PTR_ERR(tspi->clk);
                 goto err2;