lantiq: update spi driver to upstream version

These patches are backported from upstream Linux kernel.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

5 files changed, 855 insertions, 82 deletions

diff --git a/target/linux/lantiq/dts/falcon.dtsi b/target/linux/lantiq/dts/falcon.dtsi
index 30025e0dc2..98f71819a2 100644
--- a/target/linux/lantiq/dts/falcon.dtsi
+++ b/target/linux/lantiq/dts/falcon.dtsi
@@ -166,7 +166,7 @@
 
 		spi: spi@100D00 {
 			status = "disabled";
-			compatible = "intel,falcon-spi", "intel,xrx100-spi", "lantiq,spi-lantiq-ssc";
+			compatible = "lantiq,falcon-spi", "lantiq,xrx100-spi", "lantiq,spi-lantiq-ssc";
 			interrupts = <22 23 24 25>;
 			interrupt-names = "spi_tx", "spi_rx", "spi_err", "spi_frm";
 			#address-cells = <1>;
diff --git a/target/linux/lantiq/patches-4.9/0090-spi-add-transfer_status-callback.patch b/target/linux/lantiq/patches-4.9/0090-spi-add-transfer_status-callback.patch
deleted file mode 100644
index de50e228b2..0000000000
--- a/target/linux/lantiq/patches-4.9/0090-spi-add-transfer_status-callback.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/drivers/spi/spi.c
-+++ b/drivers/spi/spi.c
-@@ -1013,6 +1013,20 @@ static int spi_transfer_one_message(stru
- 								 msecs_to_jiffies(ms));
- 			}
- 
-+			if (master->transfer_status) {
-+				ret = master->transfer_status(master, ms);
-+				if (ret) {
-+					SPI_STATISTICS_INCREMENT_FIELD(statm,
-+								       errors);
-+					SPI_STATISTICS_INCREMENT_FIELD(stats,
-+								       errors);
-+					dev_err(&msg->spi->dev,
-+						"SPI transfer status: %d\n",
-+						ret);
-+					goto out;
-+				}
-+			}
-+
- 			if (ms == 0) {
- 				SPI_STATISTICS_INCREMENT_FIELD(statm,
- 							       timedout);
---- a/include/linux/spi/spi.h
-+++ b/include/linux/spi/spi.h
-@@ -370,6 +370,8 @@ static inline void spi_unregister_driver
-  *                    transfer_one_message are mutually exclusive; when both
-  *                    are set, the generic subsystem does not call your
-  *                    transfer_one callback.
-+ * @transfer_status: This callback allows the driver to return an error code
-+ *		     in case the scheduled single spi transfer failed.
-  * @handle_err: the subsystem calls the driver to handle an error that occurs
-  *		in the generic implementation of transfer_one_message().
-  * @unprepare_message: undo any work done by prepare_message().
-@@ -546,6 +548,7 @@ struct spi_master {
- 	void (*set_cs)(struct spi_device *spi, bool enable);
- 	int (*transfer_one)(struct spi_master *master, struct spi_device *spi,
- 			    struct spi_transfer *transfer);
-+	int (*transfer_status)(struct spi_master *master, unsigned long timeout);
- 	void (*handle_err)(struct spi_master *master,
- 			   struct spi_message *message);
- 
diff --git a/target/linux/lantiq/patches-4.9/0091-spi-lantiq-ssc-add-support-for-Lantiq-SSC-SPI-controller.patch b/target/linux/lantiq/patches-4.9/0090-spi-lantiq-ssc-add-support-for-Lantiq-SSC-SPI-contro.patch
index 4071dc1e06..da48ae3a18 100644
--- a/target/linux/lantiq/patches-4.9/0091-spi-lantiq-ssc-add-support-for-Lantiq-SSC-SPI-controller.patch
+++ b/target/linux/lantiq/patches-4.9/0090-spi-lantiq-ssc-add-support-for-Lantiq-SSC-SPI-contro.patch
@@ -1,3 +1,36 @@
+From 941ab0bc001fe24e5f8ce88eed27f2a1b89f3e20 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Tue, 14 Feb 2017 00:31:11 +0100
+Subject: spi: lantiq-ssc: add support for Lantiq SSC SPI controller
+
+This driver supports the Lantiq SSC SPI controller in master
+mode. This controller is found on Intel (former Lantiq) SoCs like
+the Danube, Falcon, xRX200, xRX300.
+
+The hardware uses two hardware FIFOs one for received and one for
+transferred bytes. When the driver writes data into the transmit FIFO
+the complete word is taken from the FIFO into a shift register. The
+data from this shift register is then written to the wire. This driver
+uses the interrupts signaling the status of the FIFOs and not the shift
+register. It is also possible to use the interrupts for the shift
+register, but they will send a signal after every word. When using the
+interrupts for the shift register we get a signal when the last word is
+written into the shift register and not when it is written to the wire.
+After all FIFOs are empty the driver busy waits till the hardware is
+not busy any more and returns the transfer status.
+
+Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+Signed-off-by: Mark Brown <broonie@kernel.org>
+---
+ .../devicetree/bindings/spi/spi-lantiq-ssc.txt     |  29 +
+ drivers/spi/Kconfig                                |   8 +
+ drivers/spi/Makefile                               |   1 +
+ drivers/spi/spi-lantiq-ssc.c                       | 983 +++++++++++++++++++++
+ 4 files changed, 1021 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/spi/spi-lantiq-ssc.txt
+ create mode 100644 drivers/spi/spi-lantiq-ssc.c
+
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/spi/spi-lantiq-ssc.txt
 @@ -0,0 +1,29 @@
@@ -59,7 +92,7 @@
  obj-$(CONFIG_SPI_LP8841_RTC)		+= spi-lp8841-rtc.o
 --- /dev/null
 +++ b/drivers/spi/spi-lantiq-ssc.c
-@@ -0,0 +1,952 @@
+@@ -0,0 +1,983 @@
 +/*
 + * Copyright (C) 2011-2015 Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
 + * Copyright (C) 2016 Hauke Mehrtens <hauke@hauke-m.de>
@@ -84,7 +117,9 @@
 +#include <linux/pm_runtime.h>
 +#include <linux/spi/spi.h>
 +
++#ifdef CONFIG_LANTIQ
 +#include <lantiq_soc.h>
++#endif
 +
 +#define SPI_RX_IRQ_NAME		"spi_rx"
 +#define SPI_TX_IRQ_NAME		"spi_tx"
@@ -231,6 +266,8 @@
 +	const struct lantiq_ssc_hwcfg	*hwcfg;
 +
 +	spinlock_t			lock;
++	struct workqueue_struct		*wq;
++	struct work_struct		work;
 +
 +	const u8			*tx;
 +	u8				*rx;
@@ -238,7 +275,6 @@
 +	unsigned int			rx_todo;
 +	unsigned int			bits_per_word;
 +	unsigned int			speed_hz;
-+	int				status;
 +	unsigned int			tx_fifo_size;
 +	unsigned int			rx_fifo_size;
 +	unsigned int			base_cs;
@@ -520,6 +556,8 @@
 +{
 +	struct lantiq_ssc_spi *spi = spi_master_get_devdata(master);
 +
++	flush_workqueue(spi->wq);
++
 +	/* Disable transmitter and receiver while idle */
 +	lantiq_ssc_maskl(spi, 0, SPI_CON_TXOFF | SPI_CON_RXOFF, SPI_CON);
 +
@@ -691,8 +729,7 @@
 +	return IRQ_HANDLED;
 +
 +completed:
-+	spi->status = 0;
-+	spi_finalize_current_transfer(spi->master);
++	queue_work(spi->wq, &spi->work);
 +
 +	return IRQ_HANDLED;
 +}
@@ -722,8 +759,9 @@
 +	lantiq_ssc_maskl(spi, 0, SPI_WHBSTATE_CLR_ERRORS, SPI_WHBSTATE);
 +
 +	/* set bad status so it can be retried */
-+	spi->status = -EIO;
-+	spi_finalize_current_transfer(spi->master);
++	if (spi->master->cur_msg)
++		spi->master->cur_msg->status = -EIO;
++	queue_work(spi->wq, &spi->work);
 +
 +	return IRQ_HANDLED;
 +}
@@ -737,7 +775,6 @@
 +
 +	spi->tx = t->tx_buf;
 +	spi->rx = t->rx_buf;
-+	spi->status = -EINPROGRESS;
 +
 +	if (t->tx_buf) {
 +		spi->tx_todo = t->len;
@@ -759,30 +796,39 @@
 +	return t->len;
 +}
 +
-+static int lantiq_ssc_transfer_status(struct spi_master *master,
-+				      unsigned long timeout)
++/*
++ * The driver only gets an interrupt when the FIFO is empty, but there
++ * is an additional shift register from which the data is written to
++ * the wire. We get the last interrupt when the controller starts to
++ * write the last word to the wire, not when it is finished. Do busy
++ * waiting till it finishes.
++ */
++static void lantiq_ssc_bussy_work(struct work_struct *work)
 +{
-+	struct lantiq_ssc_spi *spi = spi_master_get_devdata(master);
++	struct lantiq_ssc_spi *spi;
++	unsigned long long timeout = 8LL * 1000LL;
 +	unsigned long end;
 +
-+	/*
-+	 * The driver only gets an interrupt when the FIFO is empty, but there
-+	 * is an additional shift register from which the data is written to
-+	 * the wire. We get the last interrupt when the controller starts to
-+	 * write the last word to the wire, not when it is finished. Do busy
-+	 * waiting till it finishes.
-+	 */
-+	end = jiffies + timeout;
++	spi = container_of(work, typeof(*spi), work);
++
++	do_div(timeout, spi->speed_hz);
++	timeout += timeout + 100; /* some tolerance */
++
++	end = jiffies + msecs_to_jiffies(timeout);
 +	do {
 +		u32 stat = lantiq_ssc_readl(spi, SPI_STAT);
 +
-+		if (!(stat & SPI_STAT_BSY))
-+			return spi->status;
++		if (!(stat & SPI_STAT_BSY)) {
++			spi_finalize_current_transfer(spi->master);
++			return;
++		}
 +
 +		cond_resched();
 +	} while (!time_after_eq(jiffies, end));
 +
-+	return -ETIMEDOUT;
++	if (spi->master->cur_msg)
++		spi->master->cur_msg->status = -EIO;
++	spi_finalize_current_transfer(spi->master);
 +}
 +
 +static void lantiq_ssc_handle_err(struct spi_master *master,
@@ -840,6 +886,7 @@
 +
 +static int lantiq_ssc_probe(struct platform_device *pdev)
 +{
++	struct device *dev = &pdev->dev;
 +	struct spi_master *master;
 +	struct resource *res;
 +	struct lantiq_ssc_spi *spi;
@@ -849,69 +896,69 @@
 +	u32 id, supports_dma, revision;
 +	unsigned int num_cs;
 +
-+	match = of_match_device(lantiq_ssc_match, &pdev->dev);
++	match = of_match_device(lantiq_ssc_match, dev);
 +	if (!match) {
-+		dev_err(&pdev->dev, "no device match\n");
++		dev_err(dev, "no device match\n");
 +		return -EINVAL;
 +	}
 +	hwcfg = match->data;
 +
 +	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 +	if (!res) {
-+		dev_err(&pdev->dev, "failed to get resources\n");
++		dev_err(dev, "failed to get resources\n");
 +		return -ENXIO;
 +	}
 +
 +	rx_irq = platform_get_irq_byname(pdev, SPI_RX_IRQ_NAME);
 +	if (rx_irq < 0) {
-+		dev_err(&pdev->dev, "failed to get %s\n", SPI_RX_IRQ_NAME);
++		dev_err(dev, "failed to get %s\n", SPI_RX_IRQ_NAME);
 +		return -ENXIO;
 +	}
 +
 +	tx_irq = platform_get_irq_byname(pdev, SPI_TX_IRQ_NAME);
 +	if (tx_irq < 0) {
-+		dev_err(&pdev->dev, "failed to get %s\n", SPI_TX_IRQ_NAME);
++		dev_err(dev, "failed to get %s\n", SPI_TX_IRQ_NAME);
 +		return -ENXIO;
 +	}
 +
 +	err_irq = platform_get_irq_byname(pdev, SPI_ERR_IRQ_NAME);
 +	if (err_irq < 0) {
-+		dev_err(&pdev->dev, "failed to get %s\n", SPI_ERR_IRQ_NAME);
++		dev_err(dev, "failed to get %s\n", SPI_ERR_IRQ_NAME);
 +		return -ENXIO;
 +	}
 +
-+	master = spi_alloc_master(&pdev->dev, sizeof(struct lantiq_ssc_spi));
++	master = spi_alloc_master(dev, sizeof(struct lantiq_ssc_spi));
 +	if (!master)
 +		return -ENOMEM;
 +
 +	spi = spi_master_get_devdata(master);
 +	spi->master = master;
-+	spi->dev = &pdev->dev;
++	spi->dev = dev;
 +	spi->hwcfg = hwcfg;
 +	platform_set_drvdata(pdev, spi);
 +
-+	spi->regbase = devm_ioremap_resource(&pdev->dev, res);
++	spi->regbase = devm_ioremap_resource(dev, res);
 +	if (IS_ERR(spi->regbase)) {
 +		err = PTR_ERR(spi->regbase);
 +		goto err_master_put;
 +	}
 +
-+	err = devm_request_irq(&pdev->dev, rx_irq, lantiq_ssc_xmit_interrupt,
++	err = devm_request_irq(dev, rx_irq, lantiq_ssc_xmit_interrupt,
 +			       0, SPI_RX_IRQ_NAME, spi);
 +	if (err)
 +		goto err_master_put;
 +
-+	err = devm_request_irq(&pdev->dev, tx_irq, lantiq_ssc_xmit_interrupt,
++	err = devm_request_irq(dev, tx_irq, lantiq_ssc_xmit_interrupt,
 +			       0, SPI_TX_IRQ_NAME, spi);
 +	if (err)
 +		goto err_master_put;
 +
-+	err = devm_request_irq(&pdev->dev, err_irq, lantiq_ssc_err_interrupt,
++	err = devm_request_irq(dev, err_irq, lantiq_ssc_err_interrupt,
 +			       0, SPI_ERR_IRQ_NAME, spi);
 +	if (err)
 +		goto err_master_put;
 +
-+	spi->spi_clk = devm_clk_get(&pdev->dev, NULL);
++	spi->spi_clk = devm_clk_get(dev, "gate");
 +	if (IS_ERR(spi->spi_clk)) {
 +		err = PTR_ERR(spi->spi_clk);
 +		goto err_master_put;
@@ -920,7 +967,15 @@
 +	if (err)
 +		goto err_master_put;
 +
++	/*
++	 * Use the old clk_get_fpi() function on Lantiq platform, till it
++	 * supports common clk.
++	 */
++#if defined(CONFIG_LANTIQ) && !defined(CONFIG_COMMON_CLK)
 +	spi->fpi_clk = clk_get_fpi();
++#else
++	spi->fpi_clk = clk_get(dev, "freq");
++#endif
 +	if (IS_ERR(spi->fpi_clk)) {
 +		err = PTR_ERR(spi->fpi_clk);
 +		goto err_clk_disable;
@@ -944,12 +999,18 @@
 +	master->prepare_message = lantiq_ssc_prepare_message;
 +	master->unprepare_message = lantiq_ssc_unprepare_message;
 +	master->transfer_one = lantiq_ssc_transfer_one;
-+	master->transfer_status = lantiq_ssc_transfer_status;
 +	master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_LSB_FIRST | SPI_CS_HIGH |
 +				SPI_LOOP;
 +	master->bits_per_word_mask = SPI_BPW_RANGE_MASK(2, 8) |
 +				     SPI_BPW_MASK(16) | SPI_BPW_MASK(32);
 +
++	spi->wq = alloc_ordered_workqueue(dev_name(dev), 0);
++	if (!spi->wq) {
++		err = -ENOMEM;
++		goto err_clk_put;
++	}
++	INIT_WORK(&spi->work, lantiq_ssc_bussy_work);
++
 +	id = lantiq_ssc_readl(spi, SPI_ID);
 +	spi->tx_fifo_size = (id & SPI_ID_TXFS_M) >> SPI_ID_TXFS_S;
 +	spi->rx_fifo_size = (id & SPI_ID_RXFS_M) >> SPI_ID_RXFS_S;
@@ -958,18 +1019,20 @@
 +
 +	lantiq_ssc_hw_init(spi);
 +
-+	dev_info(&pdev->dev,
++	dev_info(dev,
 +		"Lantiq SSC SPI controller (Rev %i, TXFS %u, RXFS %u, DMA %u)\n",
 +		revision, spi->tx_fifo_size, spi->rx_fifo_size, supports_dma);
 +
-+	err = devm_spi_register_master(&pdev->dev, master);
++	err = devm_spi_register_master(dev, master);
 +	if (err) {
-+		dev_err(&pdev->dev, "failed to register spi_master\n");
-+		goto err_clk_put;
++		dev_err(dev, "failed to register spi_master\n");
++		goto err_wq_destroy;
 +	}
 +
 +	return 0;
 +
++err_wq_destroy:
++	destroy_workqueue(spi->wq);
 +err_clk_put:
 +	clk_put(spi->fpi_clk);
 +err_clk_disable:
@@ -990,6 +1053,7 @@
 +	tx_fifo_flush(spi);
 +	hw_enter_config_mode(spi);
 +
++	destroy_workqueue(spi->wq);
 +	clk_disable_unprepare(spi->spi_clk);
 +	clk_put(spi->fpi_clk);
 +
diff --git a/target/linux/lantiq/patches-4.9/0091-spi-lantiq-ssc-fix-platform_no_drv_owner.cocci-warni.patch b/target/linux/lantiq/patches-4.9/0091-spi-lantiq-ssc-fix-platform_no_drv_owner.cocci-warni.patch
new file mode 100644
index 0000000000..e81f97f9d4
--- /dev/null
+++ b/target/linux/lantiq/patches-4.9/0091-spi-lantiq-ssc-fix-platform_no_drv_owner.cocci-warni.patch
@@ -0,0 +1,28 @@
+From ba6e1e39969fa5435127a632757e2906caca7730 Mon Sep 17 00:00:00 2001
+From: kbuild test robot <fengguang.wu@intel.com>
+Date: Mon, 20 Feb 2017 01:33:10 +0800
+Subject: spi: lantiq-ssc: fix platform_no_drv_owner.cocci warnings
+
+drivers/spi/spi-lantiq-ssc.c:973:3-8: No need to set .owner here. The core will do it.
+
+ Remove .owner field if calls are used which set it automatically
+
+Generated by: scripts/coccinelle/api/platform_no_drv_owner.cocci
+
+Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
+Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
+Signed-off-by: Mark Brown <broonie@kernel.org>
+---
+ drivers/spi/spi-lantiq-ssc.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/drivers/spi/spi-lantiq-ssc.c
++++ b/drivers/spi/spi-lantiq-ssc.c
+@@ -970,7 +970,6 @@ static struct platform_driver lantiq_ssc
+ 	.remove = lantiq_ssc_remove,
+ 	.driver = {
+ 		.name = "spi-lantiq-ssc",
+-		.owner = THIS_MODULE,
+ 		.of_match_table = lantiq_ssc_match,
+ 	},
+ };
diff --git a/target/linux/lantiq/patches-4.9/0092-spi-lantiq-ssc-add-LTQ_-prefix-to-defines.patch b/target/linux/lantiq/patches-4.9/0092-spi-lantiq-ssc-add-LTQ_-prefix-to-defines.patch
new file mode 100644
index 0000000000..9bcde3c08a
--- /dev/null
+++ b/target/linux/lantiq/patches-4.9/0092-spi-lantiq-ssc-add-LTQ_-prefix-to-defines.patch
@@ -0,0 +1,723 @@
+From 1aa83e0a2821cd7f4e8f3ddb367859f52e468bf1 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Mon, 27 Feb 2017 23:21:25 +0100
+Subject: spi: lantiq-ssc: add LTQ_ prefix to defines
+
+The blackfin architecture has a SPI_STAT define which conflicts with
+the define from the spi-lantiq-ssc driver in compile test mode. Fix
+this by adding a prefix in front of every define.
+
+Reported-by: kbuild test robot <fengguang.wu@intel.com>
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+Signed-off-by: Mark Brown <broonie@kernel.org>
+---
+ drivers/spi/spi-lantiq-ssc.c | 437 ++++++++++++++++++++++---------------------
+ 1 file changed, 222 insertions(+), 215 deletions(-)
+
+--- a/drivers/spi/spi-lantiq-ssc.c
++++ b/drivers/spi/spi-lantiq-ssc.c
+@@ -26,136 +26,140 @@
+ #include <lantiq_soc.h>
+ #endif
+ 
+-#define SPI_RX_IRQ_NAME		"spi_rx"
+-#define SPI_TX_IRQ_NAME		"spi_tx"
+-#define SPI_ERR_IRQ_NAME	"spi_err"
+-#define SPI_FRM_IRQ_NAME	"spi_frm"
+-
+-#define SPI_CLC			0x00
+-#define SPI_PISEL		0x04
+-#define SPI_ID			0x08
+-#define SPI_CON			0x10
+-#define SPI_STAT		0x14
+-#define SPI_WHBSTATE		0x18
+-#define SPI_TB			0x20
+-#define SPI_RB			0x24
+-#define SPI_RXFCON		0x30
+-#define SPI_TXFCON		0x34
+-#define SPI_FSTAT		0x38
+-#define SPI_BRT			0x40
+-#define SPI_BRSTAT		0x44
+-#define SPI_SFCON		0x60
+-#define SPI_SFSTAT		0x64
+-#define SPI_GPOCON		0x70
+-#define SPI_GPOSTAT		0x74
+-#define SPI_FPGO		0x78
+-#define SPI_RXREQ		0x80
+-#define SPI_RXCNT		0x84
+-#define SPI_DMACON		0xec
+-#define SPI_IRNEN		0xf4
+-#define SPI_IRNICR		0xf8
+-#define SPI_IRNCR		0xfc
+-
+-#define SPI_CLC_SMC_S		16	/* Clock divider for sleep mode */
+-#define SPI_CLC_SMC_M		(0xFF << SPI_CLC_SMC_S)
+-#define SPI_CLC_RMC_S		8	/* Clock divider for normal run mode */
+-#define SPI_CLC_RMC_M		(0xFF << SPI_CLC_RMC_S)
+-#define SPI_CLC_DISS		BIT(1)	/* Disable status bit */
+-#define SPI_CLC_DISR		BIT(0)	/* Disable request bit */
+-
+-#define SPI_ID_TXFS_S		24	/* Implemented TX FIFO size */
+-#define SPI_ID_TXFS_M		(0x3F << SPI_ID_TXFS_S)
+-#define SPI_ID_RXFS_S		16	/* Implemented RX FIFO size */
+-#define SPI_ID_RXFS_M		(0x3F << SPI_ID_RXFS_S)
+-#define SPI_ID_MOD_S		8	/* Module ID */
+-#define SPI_ID_MOD_M		(0xff << SPI_ID_MOD_S)
+-#define SPI_ID_CFG_S		5	/* DMA interface support */
+-#define SPI_ID_CFG_M		(1 << SPI_ID_CFG_S)
+-#define SPI_ID_REV_M		0x1F	/* Hardware revision number */
+-
+-#define SPI_CON_BM_S		16	/* Data width selection */
+-#define SPI_CON_BM_M		(0x1F << SPI_CON_BM_S)
+-#define SPI_CON_EM		BIT(24)	/* Echo mode */
+-#define SPI_CON_IDLE		BIT(23)	/* Idle bit value */
+-#define SPI_CON_ENBV		BIT(22)	/* Enable byte valid control */
+-#define SPI_CON_RUEN		BIT(12)	/* Receive underflow error enable */
+-#define SPI_CON_TUEN		BIT(11)	/* Transmit underflow error enable */
+-#define SPI_CON_AEN		BIT(10)	/* Abort error enable */
+-#define SPI_CON_REN		BIT(9)	/* Receive overflow error enable */
+-#define SPI_CON_TEN		BIT(8)	/* Transmit overflow error enable */
+-#define SPI_CON_LB		BIT(7)	/* Loopback control */
+-#define SPI_CON_PO		BIT(6)	/* Clock polarity control */
+-#define SPI_CON_PH		BIT(5)	/* Clock phase control */
+-#define SPI_CON_HB		BIT(4)	/* Heading control */
+-#define SPI_CON_RXOFF		BIT(1)	/* Switch receiver off */
+-#define SPI_CON_TXOFF		BIT(0)	/* Switch transmitter off */
+-
+-#define SPI_STAT_RXBV_S		28
+-#define SPI_STAT_RXBV_M		(0x7 << SPI_STAT_RXBV_S)
+-#define SPI_STAT_BSY		BIT(13)	/* Busy flag */
+-#define SPI_STAT_RUE		BIT(12)	/* Receive underflow error flag */
+-#define SPI_STAT_TUE		BIT(11)	/* Transmit underflow error flag */
+-#define SPI_STAT_AE		BIT(10)	/* Abort error flag */
+-#define SPI_STAT_RE		BIT(9)	/* Receive error flag */
+-#define SPI_STAT_TE		BIT(8)	/* Transmit error flag */
+-#define SPI_STAT_ME		BIT(7)	/* Mode error flag */
+-#define SPI_STAT_MS		BIT(1)	/* Master/slave select bit */
+-#define SPI_STAT_EN		BIT(0)	/* Enable bit */
+-#define SPI_STAT_ERRORS		(SPI_STAT_ME | SPI_STAT_TE | SPI_STAT_RE | \
+-				 SPI_STAT_AE | SPI_STAT_TUE | SPI_STAT_RUE)
+-
+-#define SPI_WHBSTATE_SETTUE	BIT(15)	/* Set transmit underflow error flag */
+-#define SPI_WHBSTATE_SETAE	BIT(14)	/* Set abort error flag */
+-#define SPI_WHBSTATE_SETRE	BIT(13)	/* Set receive error flag */
+-#define SPI_WHBSTATE_SETTE	BIT(12)	/* Set transmit error flag */
+-#define SPI_WHBSTATE_CLRTUE	BIT(11)	/* Clear transmit underflow error flag */
+-#define SPI_WHBSTATE_CLRAE	BIT(10)	/* Clear abort error flag */
+-#define SPI_WHBSTATE_CLRRE	BIT(9)	/* Clear receive error flag */
+-#define SPI_WHBSTATE_CLRTE	BIT(8)	/* Clear transmit error flag */
+-#define SPI_WHBSTATE_SETME	BIT(7)	/* Set mode error flag */
+-#define SPI_WHBSTATE_CLRME	BIT(6)	/* Clear mode error flag */
+-#define SPI_WHBSTATE_SETRUE	BIT(5)	/* Set receive underflow error flag */
+-#define SPI_WHBSTATE_CLRRUE	BIT(4)	/* Clear receive underflow error flag */
+-#define SPI_WHBSTATE_SETMS	BIT(3)	/* Set master select bit */
+-#define SPI_WHBSTATE_CLRMS	BIT(2)	/* Clear master select bit */
+-#define SPI_WHBSTATE_SETEN	BIT(1)	/* Set enable bit (operational mode) */
+-#define SPI_WHBSTATE_CLREN	BIT(0)	/* Clear enable bit (config mode */
+-#define SPI_WHBSTATE_CLR_ERRORS	(SPI_WHBSTATE_CLRRUE | SPI_WHBSTATE_CLRME | \
+-				 SPI_WHBSTATE_CLRTE | SPI_WHBSTATE_CLRRE | \
+-				 SPI_WHBSTATE_CLRAE | SPI_WHBSTATE_CLRTUE)
+-
+-#define SPI_RXFCON_RXFITL_S	8	/* FIFO interrupt trigger level */
+-#define SPI_RXFCON_RXFITL_M	(0x3F << SPI_RXFCON_RXFITL_S)
+-#define SPI_RXFCON_RXFLU	BIT(1)	/* FIFO flush */
+-#define SPI_RXFCON_RXFEN	BIT(0)	/* FIFO enable */
+-
+-#define SPI_TXFCON_TXFITL_S	8	/* FIFO interrupt trigger level */
+-#define SPI_TXFCON_TXFITL_M	(0x3F << SPI_TXFCON_TXFITL_S)
+-#define SPI_TXFCON_TXFLU	BIT(1)	/* FIFO flush */
+-#define SPI_TXFCON_TXFEN	BIT(0)	/* FIFO enable */
+-
+-#define SPI_FSTAT_RXFFL_S	0
+-#define SPI_FSTAT_RXFFL_M	(0x3f << SPI_FSTAT_RXFFL_S)
+-#define SPI_FSTAT_TXFFL_S	8
+-#define SPI_FSTAT_TXFFL_M	(0x3f << SPI_FSTAT_TXFFL_S)
+-
+-#define SPI_GPOCON_ISCSBN_S	8
+-#define SPI_GPOCON_INVOUTN_S	0
+-
+-#define SPI_FGPO_SETOUTN_S	8
+-#define SPI_FGPO_CLROUTN_S	0
+-
+-#define SPI_RXREQ_RXCNT_M	0xFFFF	/* Receive count value */
+-#define SPI_RXCNT_TODO_M	0xFFFF	/* Recevie to-do value */
+-
+-#define SPI_IRNEN_TFI		BIT(4)	/* TX finished interrupt */
+-#define SPI_IRNEN_F		BIT(3)	/* Frame end interrupt request */
+-#define SPI_IRNEN_E		BIT(2)	/* Error end interrupt request */
+-#define SPI_IRNEN_T_XWAY	BIT(1)	/* Transmit end interrupt request */
+-#define SPI_IRNEN_R_XWAY	BIT(0)	/* Receive end interrupt request */
+-#define SPI_IRNEN_R_XRX		BIT(1)	/* Transmit end interrupt request */
+-#define SPI_IRNEN_T_XRX		BIT(0)	/* Receive end interrupt request */
+-#define SPI_IRNEN_ALL		0x1F
++#define LTQ_SPI_RX_IRQ_NAME	"spi_rx"
++#define LTQ_SPI_TX_IRQ_NAME	"spi_tx"
++#define LTQ_SPI_ERR_IRQ_NAME	"spi_err"
++#define LTQ_SPI_FRM_IRQ_NAME	"spi_frm"
++
++#define LTQ_SPI_CLC		0x00
++#define LTQ_SPI_PISEL		0x04
++#define LTQ_SPI_ID		0x08
++#define LTQ_SPI_CON		0x10
++#define LTQ_SPI_STAT		0x14
++#define LTQ_SPI_WHBSTATE	0x18
++#define LTQ_SPI_TB		0x20
++#define LTQ_SPI_RB		0x24
++#define LTQ_SPI_RXFCON		0x30
++#define LTQ_SPI_TXFCON		0x34
++#define LTQ_SPI_FSTAT		0x38
++#define LTQ_SPI_BRT		0x40
++#define LTQ_SPI_BRSTAT		0x44
++#define LTQ_SPI_SFCON		0x60
++#define LTQ_SPI_SFSTAT		0x64
++#define LTQ_SPI_GPOCON		0x70
++#define LTQ_SPI_GPOSTAT		0x74
++#define LTQ_SPI_FPGO		0x78
++#define LTQ_SPI_RXREQ		0x80
++#define LTQ_SPI_RXCNT		0x84
++#define LTQ_SPI_DMACON		0xec
++#define LTQ_SPI_IRNEN		0xf4
++#define LTQ_SPI_IRNICR		0xf8
++#define LTQ_SPI_IRNCR		0xfc
++
++#define LTQ_SPI_CLC_SMC_S	16	/* Clock divider for sleep mode */
++#define LTQ_SPI_CLC_SMC_M	(0xFF << LTQ_SPI_CLC_SMC_S)
++#define LTQ_SPI_CLC_RMC_S	8	/* Clock divider for normal run mode */
++#define LTQ_SPI_CLC_RMC_M	(0xFF << LTQ_SPI_CLC_RMC_S)
++#define LTQ_SPI_CLC_DISS	BIT(1)	/* Disable status bit */
++#define LTQ_SPI_CLC_DISR	BIT(0)	/* Disable request bit */
++
++#define LTQ_SPI_ID_TXFS_S	24	/* Implemented TX FIFO size */
++#define LTQ_SPI_ID_TXFS_M	(0x3F << LTQ_SPI_ID_TXFS_S)
++#define LTQ_SPI_ID_RXFS_S	16	/* Implemented RX FIFO size */
++#define LTQ_SPI_ID_RXFS_M	(0x3F << LTQ_SPI_ID_RXFS_S)
++#define LTQ_SPI_ID_MOD_S	8	/* Module ID */
++#define LTQ_SPI_ID_MOD_M	(0xff << LTQ_SPI_ID_MOD_S)
++#define LTQ_SPI_ID_CFG_S	5	/* DMA interface support */
++#define LTQ_SPI_ID_CFG_M	(1 << LTQ_SPI_ID_CFG_S)
++#define LTQ_SPI_ID_REV_M	0x1F	/* Hardware revision number */
++
++#define LTQ_SPI_CON_BM_S	16	/* Data width selection */
++#define LTQ_SPI_CON_BM_M	(0x1F << LTQ_SPI_CON_BM_S)
++#define LTQ_SPI_CON_EM		BIT(24)	/* Echo mode */
++#define LTQ_SPI_CON_IDLE	BIT(23)	/* Idle bit value */
++#define LTQ_SPI_CON_ENBV	BIT(22)	/* Enable byte valid control */
++#define LTQ_SPI_CON_RUEN	BIT(12)	/* Receive underflow error enable */
++#define LTQ_SPI_CON_TUEN	BIT(11)	/* Transmit underflow error enable */
++#define LTQ_SPI_CON_AEN		BIT(10)	/* Abort error enable */
++#define LTQ_SPI_CON_REN		BIT(9)	/* Receive overflow error enable */
++#define LTQ_SPI_CON_TEN		BIT(8)	/* Transmit overflow error enable */
++#define LTQ_SPI_CON_LB		BIT(7)	/* Loopback control */
++#define LTQ_SPI_CON_PO		BIT(6)	/* Clock polarity control */
++#define LTQ_SPI_CON_PH		BIT(5)	/* Clock phase control */
++#define LTQ_SPI_CON_HB		BIT(4)	/* Heading control */
++#define LTQ_SPI_CON_RXOFF	BIT(1)	/* Switch receiver off */
++#define LTQ_SPI_CON_TXOFF	BIT(0)	/* Switch transmitter off */
++
++#define LTQ_SPI_STAT_RXBV_S	28
++#define LTQ_SPI_STAT_RXBV_M	(0x7 << LTQ_SPI_STAT_RXBV_S)
++#define LTQ_SPI_STAT_BSY	BIT(13)	/* Busy flag */
++#define LTQ_SPI_STAT_RUE	BIT(12)	/* Receive underflow error flag */
++#define LTQ_SPI_STAT_TUE	BIT(11)	/* Transmit underflow error flag */
++#define LTQ_SPI_STAT_AE		BIT(10)	/* Abort error flag */
++#define LTQ_SPI_STAT_RE		BIT(9)	/* Receive error flag */
++#define LTQ_SPI_STAT_TE		BIT(8)	/* Transmit error flag */
++#define LTQ_SPI_STAT_ME		BIT(7)	/* Mode error flag */
++#define LTQ_SPI_STAT_MS		BIT(1)	/* Master/slave select bit */
++#define LTQ_SPI_STAT_EN		BIT(0)	/* Enable bit */
++#define LTQ_SPI_STAT_ERRORS	(LTQ_SPI_STAT_ME | LTQ_SPI_STAT_TE | \
++				 LTQ_SPI_STAT_RE | LTQ_SPI_STAT_AE | \
++				 LTQ_SPI_STAT_TUE | LTQ_SPI_STAT_RUE)
++
++#define LTQ_SPI_WHBSTATE_SETTUE	BIT(15)	/* Set transmit underflow error flag */
++#define LTQ_SPI_WHBSTATE_SETAE	BIT(14)	/* Set abort error flag */
++#define LTQ_SPI_WHBSTATE_SETRE	BIT(13)	/* Set receive error flag */
++#define LTQ_SPI_WHBSTATE_SETTE	BIT(12)	/* Set transmit error flag */
++#define LTQ_SPI_WHBSTATE_CLRTUE	BIT(11)	/* Clear transmit underflow error flag */
++#define LTQ_SPI_WHBSTATE_CLRAE	BIT(10)	/* Clear abort error flag */
++#define LTQ_SPI_WHBSTATE_CLRRE	BIT(9)	/* Clear receive error flag */
++#define LTQ_SPI_WHBSTATE_CLRTE	BIT(8)	/* Clear transmit error flag */
++#define LTQ_SPI_WHBSTATE_SETME	BIT(7)	/* Set mode error flag */
++#define LTQ_SPI_WHBSTATE_CLRME	BIT(6)	/* Clear mode error flag */
++#define LTQ_SPI_WHBSTATE_SETRUE	BIT(5)	/* Set receive underflow error flag */
++#define LTQ_SPI_WHBSTATE_CLRRUE	BIT(4)	/* Clear receive underflow error flag */
++#define LTQ_SPI_WHBSTATE_SETMS	BIT(3)	/* Set master select bit */
++#define LTQ_SPI_WHBSTATE_CLRMS	BIT(2)	/* Clear master select bit */
++#define LTQ_SPI_WHBSTATE_SETEN	BIT(1)	/* Set enable bit (operational mode) */
++#define LTQ_SPI_WHBSTATE_CLREN	BIT(0)	/* Clear enable bit (config mode */
++#define LTQ_SPI_WHBSTATE_CLR_ERRORS	(LTQ_SPI_WHBSTATE_CLRRUE | \
++					 LTQ_SPI_WHBSTATE_CLRME | \
++					 LTQ_SPI_WHBSTATE_CLRTE | \
++					 LTQ_SPI_WHBSTATE_CLRRE | \
++					 LTQ_SPI_WHBSTATE_CLRAE | \
++					 LTQ_SPI_WHBSTATE_CLRTUE)
++
++#define LTQ_SPI_RXFCON_RXFITL_S	8	/* FIFO interrupt trigger level */
++#define LTQ_SPI_RXFCON_RXFITL_M	(0x3F << LTQ_SPI_RXFCON_RXFITL_S)
++#define LTQ_SPI_RXFCON_RXFLU	BIT(1)	/* FIFO flush */
++#define LTQ_SPI_RXFCON_RXFEN	BIT(0)	/* FIFO enable */
++
++#define LTQ_SPI_TXFCON_TXFITL_S	8	/* FIFO interrupt trigger level */
++#define LTQ_SPI_TXFCON_TXFITL_M	(0x3F << LTQ_SPI_TXFCON_TXFITL_S)
++#define LTQ_SPI_TXFCON_TXFLU	BIT(1)	/* FIFO flush */
++#define LTQ_SPI_TXFCON_TXFEN	BIT(0)	/* FIFO enable */
++
++#define LTQ_SPI_FSTAT_RXFFL_S	0
++#define LTQ_SPI_FSTAT_RXFFL_M	(0x3f << LTQ_SPI_FSTAT_RXFFL_S)
++#define LTQ_SPI_FSTAT_TXFFL_S	8
++#define LTQ_SPI_FSTAT_TXFFL_M	(0x3f << LTQ_SPI_FSTAT_TXFFL_S)
++
++#define LTQ_SPI_GPOCON_ISCSBN_S	8
++#define LTQ_SPI_GPOCON_INVOUTN_S	0
++
++#define LTQ_SPI_FGPO_SETOUTN_S	8
++#define LTQ_SPI_FGPO_CLROUTN_S	0
++
++#define LTQ_SPI_RXREQ_RXCNT_M	0xFFFF	/* Receive count value */
++#define LTQ_SPI_RXCNT_TODO_M	0xFFFF	/* Recevie to-do value */
++
++#define LTQ_SPI_IRNEN_TFI	BIT(4)	/* TX finished interrupt */
++#define LTQ_SPI_IRNEN_F		BIT(3)	/* Frame end interrupt request */
++#define LTQ_SPI_IRNEN_E		BIT(2)	/* Error end interrupt request */
++#define LTQ_SPI_IRNEN_T_XWAY	BIT(1)	/* Transmit end interrupt request */
++#define LTQ_SPI_IRNEN_R_XWAY	BIT(0)	/* Receive end interrupt request */
++#define LTQ_SPI_IRNEN_R_XRX	BIT(1)	/* Transmit end interrupt request */
++#define LTQ_SPI_IRNEN_T_XRX	BIT(0)	/* Receive end interrupt request */
++#define LTQ_SPI_IRNEN_ALL	0x1F
+ 
+ struct lantiq_ssc_hwcfg {
+ 	unsigned int irnen_r;
+@@ -208,16 +212,16 @@ static void lantiq_ssc_maskl(const struc
+ 
+ static unsigned int tx_fifo_level(const struct lantiq_ssc_spi *spi)
+ {
+-	u32 fstat = lantiq_ssc_readl(spi, SPI_FSTAT);
++	u32 fstat = lantiq_ssc_readl(spi, LTQ_SPI_FSTAT);
+ 
+-	return (fstat & SPI_FSTAT_TXFFL_M) >> SPI_FSTAT_TXFFL_S;
++	return (fstat & LTQ_SPI_FSTAT_TXFFL_M) >> LTQ_SPI_FSTAT_TXFFL_S;
+ }
+ 
+ static unsigned int rx_fifo_level(const struct lantiq_ssc_spi *spi)
+ {
+-	u32 fstat = lantiq_ssc_readl(spi, SPI_FSTAT);
++	u32 fstat = lantiq_ssc_readl(spi, LTQ_SPI_FSTAT);
+ 
+-	return fstat & SPI_FSTAT_RXFFL_M;
++	return fstat & LTQ_SPI_FSTAT_RXFFL_M;
+ }
+ 
+ static unsigned int tx_fifo_free(const struct lantiq_ssc_spi *spi)
+@@ -227,38 +231,38 @@ static unsigned int tx_fifo_free(const s
+ 
+ static void rx_fifo_reset(const struct lantiq_ssc_spi *spi)
+ {
+-	u32 val = spi->rx_fifo_size << SPI_RXFCON_RXFITL_S;
++	u32 val = spi->rx_fifo_size << LTQ_SPI_RXFCON_RXFITL_S;
+ 
+-	val |= SPI_RXFCON_RXFEN | SPI_RXFCON_RXFLU;
+-	lantiq_ssc_writel(spi, val, SPI_RXFCON);
++	val |= LTQ_SPI_RXFCON_RXFEN | LTQ_SPI_RXFCON_RXFLU;
++	lantiq_ssc_writel(spi, val, LTQ_SPI_RXFCON);
+ }
+ 
+ static void tx_fifo_reset(const struct lantiq_ssc_spi *spi)
+ {
+-	u32 val = 1 << SPI_TXFCON_TXFITL_S;
++	u32 val = 1 << LTQ_SPI_TXFCON_TXFITL_S;
+ 
+-	val |= SPI_TXFCON_TXFEN | SPI_TXFCON_TXFLU;
+-	lantiq_ssc_writel(spi, val, SPI_TXFCON);
++	val |= LTQ_SPI_TXFCON_TXFEN | LTQ_SPI_TXFCON_TXFLU;
++	lantiq_ssc_writel(spi, val, LTQ_SPI_TXFCON);
+ }
+ 
+ static void rx_fifo_flush(const struct lantiq_ssc_spi *spi)
+ {
+-	lantiq_ssc_maskl(spi, 0, SPI_RXFCON_RXFLU, SPI_RXFCON);
++	lantiq_ssc_maskl(spi, 0, LTQ_SPI_RXFCON_RXFLU, LTQ_SPI_RXFCON);
+ }
+ 
+ static void tx_fifo_flush(const struct lantiq_ssc_spi *spi)
+ {
+-	lantiq_ssc_maskl(spi, 0, SPI_TXFCON_TXFLU, SPI_TXFCON);
++	lantiq_ssc_maskl(spi, 0, LTQ_SPI_TXFCON_TXFLU, LTQ_SPI_TXFCON);
+ }
+ 
+ static void hw_enter_config_mode(const struct lantiq_ssc_spi *spi)
+ {
+-	lantiq_ssc_writel(spi, SPI_WHBSTATE_CLREN, SPI_WHBSTATE);
++	lantiq_ssc_writel(spi, LTQ_SPI_WHBSTATE_CLREN, LTQ_SPI_WHBSTATE);
+ }
+ 
+ static void hw_enter_active_mode(const struct lantiq_ssc_spi *spi)
+ {
+-	lantiq_ssc_writel(spi, SPI_WHBSTATE_SETEN, SPI_WHBSTATE);
++	lantiq_ssc_writel(spi, LTQ_SPI_WHBSTATE_SETEN, LTQ_SPI_WHBSTATE);
+ }
+ 
+ static void hw_setup_speed_hz(const struct lantiq_ssc_spi *spi,
+@@ -287,7 +291,7 @@ static void hw_setup_speed_hz(const stru
+ 	dev_dbg(spi->dev, "spi_clk %u, max_speed_hz %u, brt %u\n",
+ 		spi_clk, max_speed_hz, brt);
+ 
+-	lantiq_ssc_writel(spi, brt, SPI_BRT);
++	lantiq_ssc_writel(spi, brt, LTQ_SPI_BRT);
+ }
+ 
+ static void hw_setup_bits_per_word(const struct lantiq_ssc_spi *spi,
+@@ -296,9 +300,9 @@ static void hw_setup_bits_per_word(const
+ 	u32 bm;
+ 
+ 	/* CON.BM value = bits_per_word - 1 */
+-	bm = (bits_per_word - 1) << SPI_CON_BM_S;
++	bm = (bits_per_word - 1) << LTQ_SPI_CON_BM_S;
+ 
+-	lantiq_ssc_maskl(spi, SPI_CON_BM_M, bm, SPI_CON);
++	lantiq_ssc_maskl(spi, LTQ_SPI_CON_BM_M, bm, LTQ_SPI_CON);
+ }
+ 
+ static void hw_setup_clock_mode(const struct lantiq_ssc_spi *spi,
+@@ -315,28 +319,28 @@ static void hw_setup_clock_mode(const st
+ 	 *  3    1    1      1      0
+ 	 */
+ 	if (mode & SPI_CPHA)
+-		con_clr |= SPI_CON_PH;
++		con_clr |= LTQ_SPI_CON_PH;
+ 	else
+-		con_set |= SPI_CON_PH;
++		con_set |= LTQ_SPI_CON_PH;
+ 
+ 	if (mode & SPI_CPOL)
+-		con_set |= SPI_CON_PO | SPI_CON_IDLE;
++		con_set |= LTQ_SPI_CON_PO | LTQ_SPI_CON_IDLE;
+ 	else
+-		con_clr |= SPI_CON_PO | SPI_CON_IDLE;
++		con_clr |= LTQ_SPI_CON_PO | LTQ_SPI_CON_IDLE;
+ 
+ 	/* Set heading control */
+ 	if (mode & SPI_LSB_FIRST)
+-		con_clr |= SPI_CON_HB;
++		con_clr |= LTQ_SPI_CON_HB;
+ 	else
+-		con_set |= SPI_CON_HB;
++		con_set |= LTQ_SPI_CON_HB;
+ 
+ 	/* Set loopback mode */
+ 	if (mode & SPI_LOOP)
+-		con_set |= SPI_CON_LB;
++		con_set |= LTQ_SPI_CON_LB;
+ 	else
+-		con_clr |= SPI_CON_LB;
++		con_clr |= LTQ_SPI_CON_LB;
+ 
+-	lantiq_ssc_maskl(spi, con_clr, con_set, SPI_CON);
++	lantiq_ssc_maskl(spi, con_clr, con_set, LTQ_SPI_CON);
+ }
+ 
+ static void lantiq_ssc_hw_init(const struct lantiq_ssc_spi *spi)
+@@ -347,37 +351,39 @@ static void lantiq_ssc_hw_init(const str
+ 	 * Set clock divider for run mode to 1 to
+ 	 * run at same frequency as FPI bus
+ 	 */
+-	lantiq_ssc_writel(spi, 1 << SPI_CLC_RMC_S, SPI_CLC);
++	lantiq_ssc_writel(spi, 1 << LTQ_SPI_CLC_RMC_S, LTQ_SPI_CLC);
+ 
+ 	/* Put controller into config mode */
+ 	hw_enter_config_mode(spi);
+ 
+ 	/* Clear error flags */
+-	lantiq_ssc_maskl(spi, 0, SPI_WHBSTATE_CLR_ERRORS, SPI_WHBSTATE);
++	lantiq_ssc_maskl(spi, 0, LTQ_SPI_WHBSTATE_CLR_ERRORS, LTQ_SPI_WHBSTATE);
+ 
+ 	/* Enable error checking, disable TX/RX */
+-	lantiq_ssc_writel(spi, SPI_CON_RUEN | SPI_CON_AEN | SPI_CON_TEN |
+-		SPI_CON_REN | SPI_CON_TXOFF | SPI_CON_RXOFF, SPI_CON);
++	lantiq_ssc_writel(spi, LTQ_SPI_CON_RUEN | LTQ_SPI_CON_AEN |
++		LTQ_SPI_CON_TEN | LTQ_SPI_CON_REN | LTQ_SPI_CON_TXOFF |
++		LTQ_SPI_CON_RXOFF, LTQ_SPI_CON);
+ 
+ 	/* Setup default SPI mode */
+ 	hw_setup_bits_per_word(spi, spi->bits_per_word);
+ 	hw_setup_clock_mode(spi, SPI_MODE_0);
+ 
+ 	/* Enable master mode and clear error flags */
+-	lantiq_ssc_writel(spi, SPI_WHBSTATE_SETMS | SPI_WHBSTATE_CLR_ERRORS,
+-			       SPI_WHBSTATE);
++	lantiq_ssc_writel(spi, LTQ_SPI_WHBSTATE_SETMS |
++			       LTQ_SPI_WHBSTATE_CLR_ERRORS,
++			       LTQ_SPI_WHBSTATE);
+ 
+ 	/* Reset GPIO/CS registers */
+-	lantiq_ssc_writel(spi, 0, SPI_GPOCON);
+-	lantiq_ssc_writel(spi, 0xFF00, SPI_FPGO);
++	lantiq_ssc_writel(spi, 0, LTQ_SPI_GPOCON);
++	lantiq_ssc_writel(spi, 0xFF00, LTQ_SPI_FPGO);
+ 
+ 	/* Enable and flush FIFOs */
+ 	rx_fifo_reset(spi);
+ 	tx_fifo_reset(spi);
+ 
+ 	/* Enable interrupts */
+-	lantiq_ssc_writel(spi, hwcfg->irnen_t | hwcfg->irnen_r | SPI_IRNEN_E,
+-			  SPI_IRNEN);
++	lantiq_ssc_writel(spi, hwcfg->irnen_t | hwcfg->irnen_r |
++			  LTQ_SPI_IRNEN_E, LTQ_SPI_IRNEN);
+ }
+ 
+ static int lantiq_ssc_setup(struct spi_device *spidev)
+@@ -400,13 +406,13 @@ static int lantiq_ssc_setup(struct spi_d
+ 	}
+ 
+ 	/* set GPO pin to CS mode */
+-	gpocon = 1 << ((cs - spi->base_cs) + SPI_GPOCON_ISCSBN_S);
++	gpocon = 1 << ((cs - spi->base_cs) + LTQ_SPI_GPOCON_ISCSBN_S);
+ 
+ 	/* invert GPO pin */
+ 	if (spidev->mode & SPI_CS_HIGH)
+ 		gpocon |= 1 << (cs - spi->base_cs);
+ 
+-	lantiq_ssc_maskl(spi, 0, gpocon, SPI_GPOCON);
++	lantiq_ssc_maskl(spi, 0, gpocon, LTQ_SPI_GPOCON);
+ 
+ 	return 0;
+ }
+@@ -442,18 +448,18 @@ static void hw_setup_transfer(struct lan
+ 	}
+ 
+ 	/* Configure transmitter and receiver */
+-	con = lantiq_ssc_readl(spi, SPI_CON);
++	con = lantiq_ssc_readl(spi, LTQ_SPI_CON);
+ 	if (t->tx_buf)
+-		con &= ~SPI_CON_TXOFF;
++		con &= ~LTQ_SPI_CON_TXOFF;
+ 	else
+-		con |= SPI_CON_TXOFF;
++		con |= LTQ_SPI_CON_TXOFF;
+ 
+ 	if (t->rx_buf)
+-		con &= ~SPI_CON_RXOFF;
++		con &= ~LTQ_SPI_CON_RXOFF;
+ 	else
+-		con |= SPI_CON_RXOFF;
++		con |= LTQ_SPI_CON_RXOFF;
+ 
+-	lantiq_ssc_writel(spi, con, SPI_CON);
++	lantiq_ssc_writel(spi, con, LTQ_SPI_CON);
+ }
+ 
+ static int lantiq_ssc_unprepare_message(struct spi_master *master,
+@@ -464,7 +470,8 @@ static int lantiq_ssc_unprepare_message(
+ 	flush_workqueue(spi->wq);
+ 
+ 	/* Disable transmitter and receiver while idle */
+-	lantiq_ssc_maskl(spi, 0, SPI_CON_TXOFF | SPI_CON_RXOFF, SPI_CON);
++	lantiq_ssc_maskl(spi, 0, LTQ_SPI_CON_TXOFF | LTQ_SPI_CON_RXOFF,
++			 LTQ_SPI_CON);
+ 
+ 	return 0;
+ }
+@@ -503,7 +510,7 @@ static void tx_fifo_write(struct lantiq_
+ 			break;
+ 		}
+ 
+-		lantiq_ssc_writel(spi, data, SPI_TB);
++		lantiq_ssc_writel(spi, data, LTQ_SPI_TB);
+ 		tx_free--;
+ 	}
+ }
+@@ -517,7 +524,7 @@ static void rx_fifo_read_full_duplex(str
+ 	unsigned int rx_fill = rx_fifo_level(spi);
+ 
+ 	while (rx_fill) {
+-		data = lantiq_ssc_readl(spi, SPI_RB);
++		data = lantiq_ssc_readl(spi, LTQ_SPI_RB);
+ 
+ 		switch (spi->bits_per_word) {
+ 		case 2 ... 8:
+@@ -563,9 +570,9 @@ static void rx_fifo_read_half_duplex(str
+ 	 */
+ 	while (rx_fill) {
+ 		if (spi->rx_todo < 4)  {
+-			rxbv = (lantiq_ssc_readl(spi, SPI_STAT) &
+-				SPI_STAT_RXBV_M) >> SPI_STAT_RXBV_S;
+-			data = lantiq_ssc_readl(spi, SPI_RB);
++			rxbv = (lantiq_ssc_readl(spi, LTQ_SPI_STAT) &
++				LTQ_SPI_STAT_RXBV_M) >> LTQ_SPI_STAT_RXBV_S;
++			data = lantiq_ssc_readl(spi, LTQ_SPI_RB);
+ 
+ 			shift = (rxbv - 1) * 8;
+ 			rx8 = spi->rx;
+@@ -578,7 +585,7 @@ static void rx_fifo_read_half_duplex(str
+ 				spi->rx++;
+ 			}
+ 		} else {
+-			data = lantiq_ssc_readl(spi, SPI_RB);
++			data = lantiq_ssc_readl(spi, LTQ_SPI_RB);
+ 			rx32 = (u32 *) spi->rx;
+ 
+ 			*rx32++ = data;
+@@ -603,7 +610,7 @@ static void rx_request(struct lantiq_ssc
+ 	if (rxreq > rxreq_max)
+ 		rxreq = rxreq_max;
+ 
+-	lantiq_ssc_writel(spi, rxreq, SPI_RXREQ);
++	lantiq_ssc_writel(spi, rxreq, LTQ_SPI_RXREQ);
+ }
+ 
+ static irqreturn_t lantiq_ssc_xmit_interrupt(int irq, void *data)
+@@ -642,26 +649,26 @@ completed:
+ static irqreturn_t lantiq_ssc_err_interrupt(int irq, void *data)
+ {
+ 	struct lantiq_ssc_spi *spi = data;
+-	u32 stat = lantiq_ssc_readl(spi, SPI_STAT);
++	u32 stat = lantiq_ssc_readl(spi, LTQ_SPI_STAT);
+ 
+-	if (!(stat & SPI_STAT_ERRORS))
++	if (!(stat & LTQ_SPI_STAT_ERRORS))
+ 		return IRQ_NONE;
+ 
+-	if (stat & SPI_STAT_RUE)
++	if (stat & LTQ_SPI_STAT_RUE)
+ 		dev_err(spi->dev, "receive underflow error\n");
+-	if (stat & SPI_STAT_TUE)
++	if (stat & LTQ_SPI_STAT_TUE)
+ 		dev_err(spi->dev, "transmit underflow error\n");
+-	if (stat & SPI_STAT_AE)
++	if (stat & LTQ_SPI_STAT_AE)
+ 		dev_err(spi->dev, "abort error\n");
+-	if (stat & SPI_STAT_RE)
++	if (stat & LTQ_SPI_STAT_RE)
+ 		dev_err(spi->dev, "receive overflow error\n");
+-	if (stat & SPI_STAT_TE)
++	if (stat & LTQ_SPI_STAT_TE)
+ 		dev_err(spi->dev, "transmit overflow error\n");
+-	if (stat & SPI_STAT_ME)
++	if (stat & LTQ_SPI_STAT_ME)
+ 		dev_err(spi->dev, "mode error\n");
+ 
+ 	/* Clear error flags */
+-	lantiq_ssc_maskl(spi, 0, SPI_WHBSTATE_CLR_ERRORS, SPI_WHBSTATE);
++	lantiq_ssc_maskl(spi, 0, LTQ_SPI_WHBSTATE_CLR_ERRORS, LTQ_SPI_WHBSTATE);
+ 
+ 	/* set bad status so it can be retried */
+ 	if (spi->master->cur_msg)
+@@ -721,9 +728,9 @@ static void lantiq_ssc_bussy_work(struct
+ 
+ 	end = jiffies + msecs_to_jiffies(timeout);
+ 	do {
+-		u32 stat = lantiq_ssc_readl(spi, SPI_STAT);
++		u32 stat = lantiq_ssc_readl(spi, LTQ_SPI_STAT);
+ 
+-		if (!(stat & SPI_STAT_BSY)) {
++		if (!(stat & LTQ_SPI_STAT_BSY)) {
+ 			spi_finalize_current_transfer(spi->master);
+ 			return;
+ 		}
+@@ -755,9 +762,9 @@ static void lantiq_ssc_set_cs(struct spi
+ 	if (!!(spidev->mode & SPI_CS_HIGH) == enable)
+ 		fgpo = (1 << (cs - spi->base_cs));
+ 	else
+-		fgpo = (1 << (cs - spi->base_cs + SPI_FGPO_SETOUTN_S));
++		fgpo = (1 << (cs - spi->base_cs + LTQ_SPI_FGPO_SETOUTN_S));
+ 
+-	lantiq_ssc_writel(spi, fgpo, SPI_FPGO);
++	lantiq_ssc_writel(spi, fgpo, LTQ_SPI_FPGO);
+ }
+ 
+ static int lantiq_ssc_transfer_one(struct spi_master *master,
+@@ -772,13 +779,13 @@ static int lantiq_ssc_transfer_one(struc
+ }
+ 
+ static const struct lantiq_ssc_hwcfg lantiq_ssc_xway = {
+-	.irnen_r = SPI_IRNEN_R_XWAY,
+-	.irnen_t = SPI_IRNEN_T_XWAY,
++	.irnen_r = LTQ_SPI_IRNEN_R_XWAY,
++	.irnen_t = LTQ_SPI_IRNEN_T_XWAY,
+ };
+ 
+ static const struct lantiq_ssc_hwcfg lantiq_ssc_xrx = {
+-	.irnen_r = SPI_IRNEN_R_XRX,
+-	.irnen_t = SPI_IRNEN_T_XRX,
++	.irnen_r = LTQ_SPI_IRNEN_R_XRX,
++	.irnen_t = LTQ_SPI_IRNEN_T_XRX,
+ };
+ 
+ static const struct of_device_id lantiq_ssc_match[] = {
+@@ -814,21 +821,21 @@ static int lantiq_ssc_probe(struct platf
+ 		return -ENXIO;
+ 	}
+ 
+-	rx_irq = platform_get_irq_byname(pdev, SPI_RX_IRQ_NAME);
++	rx_irq = platform_get_irq_byname(pdev, LTQ_SPI_RX_IRQ_NAME);
+ 	if (rx_irq < 0) {
+-		dev_err(dev, "failed to get %s\n", SPI_RX_IRQ_NAME);
++		dev_err(dev, "failed to get %s\n", LTQ_SPI_RX_IRQ_NAME);
+ 		return -ENXIO;
+ 	}
+ 
+-	tx_irq = platform_get_irq_byname(pdev, SPI_TX_IRQ_NAME);
++	tx_irq = platform_get_irq_byname(pdev, LTQ_SPI_TX_IRQ_NAME);
+ 	if (tx_irq < 0) {
+-		dev_err(dev, "failed to get %s\n", SPI_TX_IRQ_NAME);
++		dev_err(dev, "failed to get %s\n", LTQ_SPI_TX_IRQ_NAME);
+ 		return -ENXIO;
+ 	}
+ 
+-	err_irq = platform_get_irq_byname(pdev, SPI_ERR_IRQ_NAME);
++	err_irq = platform_get_irq_byname(pdev, LTQ_SPI_ERR_IRQ_NAME);
+ 	if (err_irq < 0) {
+-		dev_err(dev, "failed to get %s\n", SPI_ERR_IRQ_NAME);
++		dev_err(dev, "failed to get %s\n", LTQ_SPI_ERR_IRQ_NAME);
+ 		return -ENXIO;
+ 	}
+ 
+@@ -849,17 +856,17 @@ static int lantiq_ssc_probe(struct platf
+ 	}
+ 
+ 	err = devm_request_irq(dev, rx_irq, lantiq_ssc_xmit_interrupt,
+-			       0, SPI_RX_IRQ_NAME, spi);
++			       0, LTQ_SPI_RX_IRQ_NAME, spi);
+ 	if (err)
+ 		goto err_master_put;
+ 
+ 	err = devm_request_irq(dev, tx_irq, lantiq_ssc_xmit_interrupt,
+-			       0, SPI_TX_IRQ_NAME, spi);
++			       0, LTQ_SPI_TX_IRQ_NAME, spi);
+ 	if (err)
+ 		goto err_master_put;
+ 
+ 	err = devm_request_irq(dev, err_irq, lantiq_ssc_err_interrupt,
+-			       0, SPI_ERR_IRQ_NAME, spi);
++			       0, LTQ_SPI_ERR_IRQ_NAME, spi);
+ 	if (err)
+ 		goto err_master_put;
+ 
+@@ -916,11 +923,11 @@ static int lantiq_ssc_probe(struct platf
+ 	}
+ 	INIT_WORK(&spi->work, lantiq_ssc_bussy_work);
+ 
+-	id = lantiq_ssc_readl(spi, SPI_ID);
+-	spi->tx_fifo_size = (id & SPI_ID_TXFS_M) >> SPI_ID_TXFS_S;
+-	spi->rx_fifo_size = (id & SPI_ID_RXFS_M) >> SPI_ID_RXFS_S;
+-	supports_dma = (id & SPI_ID_CFG_M) >> SPI_ID_CFG_S;
+-	revision = id & SPI_ID_REV_M;
++	id = lantiq_ssc_readl(spi, LTQ_SPI_ID);
++	spi->tx_fifo_size = (id & LTQ_SPI_ID_TXFS_M) >> LTQ_SPI_ID_TXFS_S;
++	spi->rx_fifo_size = (id & LTQ_SPI_ID_RXFS_M) >> LTQ_SPI_ID_RXFS_S;
++	supports_dma = (id & LTQ_SPI_ID_CFG_M) >> LTQ_SPI_ID_CFG_S;
++	revision = id & LTQ_SPI_ID_REV_M;
+ 
+ 	lantiq_ssc_hw_init(spi);
+ 
+@@ -952,8 +959,8 @@ static int lantiq_ssc_remove(struct plat
+ {
+ 	struct lantiq_ssc_spi *spi = platform_get_drvdata(pdev);
+ 
+-	lantiq_ssc_writel(spi, 0, SPI_IRNEN);
+-	lantiq_ssc_writel(spi, 0, SPI_CLC);
++	lantiq_ssc_writel(spi, 0, LTQ_SPI_IRNEN);
++	lantiq_ssc_writel(spi, 0, LTQ_SPI_CLC);
+ 	rx_fifo_flush(spi);
+ 	tx_fifo_flush(spi);
+ 	hw_enter_config_mode(spi);