Signed-off-by: John Crispin <blogic@openwrt.org>
Backport of r46951
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@47087
3c298f89-4303-0410-b956-
a3cf2f4a3e73
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
-@@ -439,6 +439,12 @@ config SPI_RT2880
help
This selects a driver for the Ralink RT288x/RT305x SPI Controller.
help
This selects a driver for the Ralink RT288x/RT305x SPI Controller.
depends on ARCH_S3C24XX
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
depends on ARCH_S3C24XX
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
-@@ -46,6 +46,7 @@ obj-$(CONFIG_SPI_LM70_LLP) += spi-lm70l
obj-$(CONFIG_SPI_MPC512x_PSC) += spi-mpc512x-psc.o
obj-$(CONFIG_SPI_MPC52xx_PSC) += spi-mpc52xx-psc.o
obj-$(CONFIG_SPI_MPC52xx) += spi-mpc52xx.o
obj-$(CONFIG_SPI_MPC512x_PSC) += spi-mpc512x-psc.o
obj-$(CONFIG_SPI_MPC52xx_PSC) += spi-mpc52xx-psc.o
obj-$(CONFIG_SPI_MPC52xx) += spi-mpc52xx.o
obj-$(CONFIG_SPI_OC_TINY) += spi-oc-tiny.o
--- /dev/null
+++ b/drivers/spi/spi-mt7621.c
obj-$(CONFIG_SPI_OC_TINY) += spi-oc-tiny.o
--- /dev/null
+++ b/drivers/spi/spi-mt7621.c
+/*
+ * spi-mt7621.c -- MediaTek MT7621 SPI controller driver
+ *
+/*
+ * spi-mt7621.c -- MediaTek MT7621 SPI controller driver
+ *
+static void mt7621_spi_set_cs(struct spi_device *spi, int enable)
+{
+ struct mt7621_spi *rs = spidev_to_mt7621_spi(spi);
+static void mt7621_spi_set_cs(struct spi_device *spi, int enable)
+{
+ struct mt7621_spi *rs = spidev_to_mt7621_spi(spi);
-+ u32 polar = mt7621_spi_read(rs, MT7621_SPI_POLAR);
++ int cs = spi->chip_select;
++ u32 polar = 0;
-+ polar |= 1;
-+ else
-+ polar &= ~1;
+ mt7621_spi_write(rs, MT7621_SPI_POLAR, polar);
+}
+
+ mt7621_spi_write(rs, MT7621_SPI_POLAR, polar);
+}
+
+ master->transfer_one_message = mt7621_spi_transfer_one_message;
+ master->bits_per_word_mask = SPI_BPW_MASK(8);
+ master->dev.of_node = pdev->dev.of_node;
+ master->transfer_one_message = mt7621_spi_transfer_one_message;
+ master->bits_per_word_mask = SPI_BPW_MASK(8);
+ master->dev.of_node = pdev->dev.of_node;
-+ master->num_chipselect = 1;
++ master->num_chipselect = 2;
+
+ dev_set_drvdata(&pdev->dev, master);
+
+
+ dev_set_drvdata(&pdev->dev, master);
+