linux-spi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: dirk.brandewie-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
Cc: Dirk Brandewie <dirk.brandewie-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Subject: [PATCH 03/11] spi-dw: change MRST prefix to generic prefix
Date: Wed, 22 Jun 2011 19:00:05 -0700	[thread overview]
Message-ID: <1308794413-11069-4-git-send-email-dirk.brandewie@gmail.com> (raw)
In-Reply-To: <1308794413-11069-1-git-send-email-dirk.brandewie-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

From: Dirk Brandewie <dirk.brandewie-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

The designware SPI core is now used in multiple SOC's.  Make the
prefix more generic and match other naming changes.

Signed-off-by: Dirk Brandewie <dirk.brandewie-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 drivers/spi/spi-dw.c       |   10 +++++-----
 drivers/spi/spi-dw.h       |    3 +--
 include/linux/spi/spi-dw.h |    4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c
index fb09a9d..3d98e4c 100644
--- a/drivers/spi/spi-dw.c
+++ b/drivers/spi/spi-dw.c
@@ -131,7 +131,7 @@ static const struct file_operations spi_dw_regs_ops = {
 
 static int spi_dw_debugfs_init(struct spi_dw *dws)
 {
-	dws->debugfs = debugfs_create_dir("mrst_spi", NULL);
+	dws->debugfs = debugfs_create_dir("spi-dw", NULL);
 	if (!dws->debugfs)
 		return -ENOMEM;
 
@@ -283,7 +283,7 @@ static void spi_dw_giveback(struct spi_dw *dws)
 					transfer_list);
 
 	if (!last_transfer->cs_change && dws->cs_control)
-		dws->cs_control(MRST_SPI_DEASSERT);
+		dws->cs_control(SPI_DW_DEASSERT);
 
 	msg->state = NULL;
 	if (msg->complete)
@@ -443,7 +443,7 @@ static void spi_dw_pump_transfers(unsigned long data)
 		if (transfer->speed_hz != speed) {
 			speed = transfer->speed_hz;
 			if (speed > dws->max_freq) {
-				printk(KERN_ERR "MRST SPI0: unsupported"
+				printk(KERN_ERR "DW SPI: unsupported"
 					"freq: %dHz\n", speed);
 				message->status = -EIO;
 				goto early_exit;
@@ -466,7 +466,7 @@ static void spi_dw_pump_transfers(unsigned long data)
 			dws->n_bytes = dws->dma_width = bits >> 3;
 			break;
 		default:
-			printk(KERN_ERR "MRST SPI0: unsupported bits:"
+			printk(KERN_ERR "DW SPI: unsupported bits:"
 				"%db\n", bits);
 			message->status = -EIO;
 			goto early_exit;
@@ -669,7 +669,7 @@ static int spi_dw_setup(struct spi_device *spi)
 		chip->n_bytes = 2;
 		chip->dma_width = 2;
 	} else {
-		/* Never take >16b case for MRST SPIC */
+		/* Never take >16b case for DW SPIC */
 		dev_err(&spi->dev, "invalid wordsize\n");
 		return -EINVAL;
 	}
diff --git a/drivers/spi/spi-dw.h b/drivers/spi/spi-dw.h
index 83b9a59..0148356 100644
--- a/drivers/spi/spi-dw.h
+++ b/drivers/spi/spi-dw.h
@@ -50,7 +50,6 @@
 /* TX RX interrupt level threshold, max can be 256 */
 #define SPI_INT_THRESHOLD		32
 
-
 struct spi_dw_reg {
 	u32	ctrl0;
 	u32	ctrl1;
@@ -181,7 +180,7 @@ static inline void spi_dw_chip_sel(struct spi_dw *dws, u16 cs)
 		return;
 
 	if (dws->cs_control)
-		dws->cs_control(1);
+		dws->cs_control(SPI_DW_ASSERT);
 
 	dw_writel(dws, ser, 1 << cs);
 }
diff --git a/include/linux/spi/spi-dw.h b/include/linux/spi/spi-dw.h
index 787b154..4fb72d9 100644
--- a/include/linux/spi/spi-dw.h
+++ b/include/linux/spi/spi-dw.h
@@ -24,8 +24,8 @@ enum spi_dw_ssi_type {
 	SSI_NS_MICROWIRE,
 };
 
-#define MRST_SPI_DEASSERT	0
-#define MRST_SPI_ASSERT		1
+#define SPI_DW_DEASSERT		0
+#define SPI_DW_ASSERT		1
 
 /*
  * Each SPI slave device to work with dw_api controller should
-- 
1.7.3.4


------------------------------------------------------------------------------
Simplify data backup and recovery for your virtual environment with vRanger.
Installation's a snap, and flexible recovery options mean your data is safe,
secure and there when you need it. Data protection magic?
Nope - It's vRanger. Get your free trial download today.
http://p.sf.net/sfu/quest-sfdev2dev

  parent reply	other threads:[~2011-06-23  2:00 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-23  2:00 [PATCH 00/11] RFC spi-dw updates dirk.brandewie
2011-06-23  2:00 ` [PATCH 01/11] spi-dw: expose platform data stucture dirk.brandewie
2011-06-23  3:47   ` Grant Likely
2011-06-23  4:00     ` Dirk Brandewie
2011-06-23  4:03       ` glikely@secretlab.ca
2011-06-23  4:37         ` Dirk Brandewie
2011-06-23  5:06           ` glikely@secretlab.ca
2011-06-23  5:16             ` Dirk Brandewie
     [not found] ` <1308794413-11069-1-git-send-email-dirk.brandewie-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2011-06-23  2:00   ` [PATCH 02/11] spi-dw: update function naming convention to match file naming dirk.brandewie-Re5JQEeQqe8AvxtiuMwx3w
2011-06-23  2:00   ` dirk.brandewie-Re5JQEeQqe8AvxtiuMwx3w [this message]
2011-06-23  2:00   ` [PATCH 04/11] spi-dw: remove unused definition dirk.brandewie-Re5JQEeQqe8AvxtiuMwx3w
2011-06-23  2:00   ` [PATCH 05/11] spi-dw: split spi_dw_enable_chip() into spi_dw_enable()/spi_dw_disable() dirk.brandewie-Re5JQEeQqe8AvxtiuMwx3w
2011-06-23  2:00   ` [PATCH 06/11] spi-dw: Force error on out of range chip select dirk.brandewie-Re5JQEeQqe8AvxtiuMwx3w
2011-06-23  3:51     ` Grant Likely
2011-06-23  4:13       ` Dirk Brandewie
2011-06-23  2:00   ` [PATCH 07/11] spi-dw: Set number of available chip selects correctly dirk.brandewie-Re5JQEeQqe8AvxtiuMwx3w
2011-06-23  3:53     ` Grant Likely
2011-06-23  2:00   ` [PATCH 08/11] spi-dw: Ensure fifo lenght is set dirk.brandewie-Re5JQEeQqe8AvxtiuMwx3w
2011-06-23  2:41     ` Feng Tang
2011-06-23  3:01       ` Dirk Brandewie
2011-06-23  3:21         ` Feng Tang
2011-06-23  3:55     ` Grant Likely
2011-06-23  4:20       ` Dirk Brandewie
2011-06-23  2:00   ` [PATCH 09/11] spi-dw: Fix condition in spi_dw_{writer/reader} dirk.brandewie-Re5JQEeQqe8AvxtiuMwx3w
2011-06-23  2:45     ` Feng Tang
2011-06-23  3:09       ` Dirk Brandewie
2011-06-23  3:25         ` Feng Tang
2011-06-23  3:30           ` Dirk Brandewie
2011-06-23  5:09             ` Feng Tang
2011-06-23  2:00   ` [PATCH 11/11] spi-dw: remove noop else clause dirk.brandewie-Re5JQEeQqe8AvxtiuMwx3w
2011-06-23  2:47     ` Feng Tang
2011-06-23  3:13       ` Dirk Brandewie
2011-06-23  2:00 ` [PATCH 10/11] spi-dw: Move checking of max_speed_hz value to be a prerequisite in spi_dw_setup dirk.brandewie
2011-06-23  2:39 ` [PATCH 00/11] RFC spi-dw updates Feng Tang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1308794413-11069-4-git-send-email-dirk.brandewie@gmail.com \
    --to=dirk.brandewie-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).