[POWERPC] MPC832x_RDB: Update dts to use SPI1 in QE, register mmc_spi stub

Enabled using SPI controller on the MPC832x RDB board.  We currently use
a modalias of "spidev" as a place holder (replace with "mmc_spie") until
the mmc_spi driver support is merged in.

This gets us the ability to test SPI until then.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index cdc4a94..388c8a7 100644 (file)
--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -175,7 +175,7 @@
                        reg = <4c0 40>;
                        interrupts = <2>;
                        interrupt-parent = <&qeic>;
-                       mode = "cpu";
+                       mode = "cpu-qe";
                };
 
                spi@500 {

diff --git a/arch/powerpc/platforms/83xx/mpc832x_rdb.c b/arch/powerpc/platforms/83xx/mpc832x_rdb.c
index e6c1760..24a790c 100644 (file)
--- a/arch/powerpc/platforms/83xx/mpc832x_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc832x_rdb.c
@@ -15,6 +15,7 @@
  */
 
 #include <linux/pci.h>
+#include <linux/spi/spi.h>
 
 #include <asm/of_platform.h>
 #include <asm/time.h>
@@ -22,6 +23,7 @@
 #include <asm/udbg.h>
 #include <asm/qe.h>
 #include <asm/qe_ic.h>
+#include <sysdev/fsl_soc.h>
 
 #include "mpc83xx.h"
 
@@ -32,6 +34,50 @@
 #define DBG(fmt...)
 #endif
 
+static void mpc83xx_spi_activate_cs(u8 cs, u8 polarity)
+{
+       pr_debug("%s %d %d\n", __func__, cs, polarity);
+       par_io_data_set(3, 13, polarity);
+}
+
+static void mpc83xx_spi_deactivate_cs(u8 cs, u8 polarity)
+{
+       pr_debug("%s %d %d\n", __func__, cs, polarity);
+       par_io_data_set(3, 13, !polarity);
+}
+
+static struct spi_board_info mpc832x_spi_boardinfo = {
+       .bus_num = 0x4c0,
+       .chip_select = 0,
+       .max_speed_hz = 50000000,
+       /*
+        * XXX: This is spidev (spi in userspace) stub, should
+        * be replaced by "mmc_spi" when mmc_spi will hit mainline.
+        */
+       .modalias = "spidev",
+};
+
+static int __init mpc832x_spi_init(void)
+{
+       if (!machine_is(mpc832x_rdb))
+               return 0;
+
+       par_io_config_pin(3,  0, 3, 0, 1, 0); /* SPI1 MOSI, I/O */
+       par_io_config_pin(3,  1, 3, 0, 1, 0); /* SPI1 MISO, I/O */
+       par_io_config_pin(3,  2, 3, 0, 1, 0); /* SPI1 CLK,  I/O */
+       par_io_config_pin(3,  3, 2, 0, 1, 0); /* SPI1 SEL,  I   */
+
+       par_io_config_pin(3, 13, 1, 0, 0, 0); /* !SD_CS,    O */
+       par_io_config_pin(3, 14, 2, 0, 0, 0); /* SD_INSERT, I */
+       par_io_config_pin(3, 15, 2, 0, 0, 0); /* SD_PROTECT,I */
+
+       return fsl_spi_init(&mpc832x_spi_boardinfo, 1,
+                           mpc83xx_spi_activate_cs,
+                           mpc83xx_spi_deactivate_cs);
+}
+
+device_initcall(mpc832x_spi_init);
+
 /* ************************************************************************
  *
  * Setup the architecture