Skip to contentSkip to conversation

spi_mpc83xx: in "QE mode" spiclk is sysclk/2

PATCH In review Anton Vorontsov 3 participants 6 messages Aug 2, 2007 – Aug 6, 2007 4 messages not in the archive SPI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 spi_mpc83xx: in "QE mode" spiclk is sysclk/2

For MPC8349E input to SPIBRG is SYSCLK, but it's SYSCLK/2 for MPC8323E (running in so-called "QE mode").

This fixes clocking issues I've noticed recently.

Probably someday mpc83xx_spi->sysclk should be renamed to mpc83xx_spi->spiclk to be less confusing.

---
 drivers/spi/spi_mpc83xx.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
drivers/spi/spi_mpc83xx.c +5 -1
index 0c16a2b..55230f7 100644
@@ -429,13 +429,17 @@ static int __init mpc83xx_spi_probe(struct platform_device *dev)
 	mpc83xx_spi->bitbang.chipselect = mpc83xx_spi_chipselect;
 	mpc83xx_spi->bitbang.setup_transfer = mpc83xx_spi_setup_transfer;
 	mpc83xx_spi->bitbang.txrx_bufs = mpc83xx_spi_bufs;
-	mpc83xx_spi->sysclk = pdata->sysclk;
 	mpc83xx_spi->activate_cs = pdata->activate_cs;
 	mpc83xx_spi->deactivate_cs = pdata->deactivate_cs;
 	mpc83xx_spi->qe_mode = pdata->qe_mode;
 	mpc83xx_spi->get_rx = mpc83xx_spi_rx_buf_u8;
 	mpc83xx_spi->get_tx = mpc83xx_spi_tx_buf_u8;
 
+	if (mpc83xx_spi->qe_mode)
+		mpc83xx_spi->sysclk = pdata->sysclk / 2;
+	else
+		mpc83xx_spi->sysclk = pdata->sysclk;
+
 	mpc83xx_spi->rx_shift = 0;
 	mpc83xx_spi->tx_shift = 0;
 	if (mpc83xx_spi->qe_mode) {
Signature · 7 lines
1.5.0.6

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
#2 lore raw
In reply to a message not in the archive
Quoted 2 lines · Anton Vorontsov

For MPC8349E input to SPIBRG is SYSCLK, but it's SYSCLK/2 for MPC8323E (running in so-called "QE mode").

QE mode or the SPI in QE running in CPU mode?

- k

Quoted 41 lines

This fixes clocking issues I've noticed recently.

Probably someday mpc83xx_spi->sysclk should be renamed to mpc83xx_spi->spiclk to be less confusing.

---
 drivers/spi/spi_mpc83xx.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
drivers/spi/spi_mpc83xx.c +5 -1
index 0c16a2b..55230f7 100644
@@ -429,13 +429,17 @@ static int __init mpc83xx_spi_probe(struct  
 platform_device *dev)
 	mpc83xx_spi->bitbang.chipselect = mpc83xx_spi_chipselect;
 	mpc83xx_spi->bitbang.setup_transfer = mpc83xx_spi_setup_transfer;
 	mpc83xx_spi->bitbang.txrx_bufs = mpc83xx_spi_bufs;
-	mpc83xx_spi->sysclk = pdata->sysclk;
 	mpc83xx_spi->activate_cs = pdata->activate_cs;
 	mpc83xx_spi->deactivate_cs = pdata->deactivate_cs;
 	mpc83xx_spi->qe_mode = pdata->qe_mode;
 	mpc83xx_spi->get_rx = mpc83xx_spi_rx_buf_u8;
 	mpc83xx_spi->get_tx = mpc83xx_spi_tx_buf_u8;
 
+	if (mpc83xx_spi->qe_mode)
+		mpc83xx_spi->sysclk = pdata->sysclk / 2;
+	else
+		mpc83xx_spi->sysclk = pdata->sysclk;
+
 	mpc83xx_spi->rx_shift = 0;
 	mpc83xx_spi->tx_shift = 0;

if (mpc83xx_spi->qe_mode) {

Signature · 5 lines
1.5.0.6
_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://ozlabs.org/mailman/listinfo/linuxppc-dev
#4 lore raw
In reply to a message not in the archive
Quoted 7 lines · Kumar Gala
Quoted 2 lines · Anton Vorontsov

For MPC8349E input to SPIBRG is SYSCLK, but it's SYSCLK/2 for MPC8323E (running in so-called "QE mode").

QE mode or the SPI in QE running in CPU mode?

Yeah, "qe_mode" variable is confusing, but it wasn't me who introduced it. ;-) So, "the SPI in QE running in CPU mode" is correct.

[ Unrelated to that particular patch.

Probably qe_mode should be renamed to something better, maybe spi_in_qe? Or we could back to discussion about auto detecting it somehow. ]

Quoted 1 line

- k

Thanks,

Signature · 10 lines
Anton Vorontsov
email: cbou-JGs/[email protected]
backup email: [email protected]
irc://irc.freenode.net/bd2

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
#5 lore raw
In reply to a message not in the archive
Quoted 2 lines · Anton Vorontsov

Probably someday mpc83xx_spi->sysclk should be renamed to mpc83xx_spi->spiclk to be less confusing.

Why not "today", with this patch? That would fix some of the root cause of this bug...

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/

#7 lore raw
In reply to a message not in the archive
Quoted 6 lines · David Brownell
Quoted 2 lines · Anton Vorontsov

Probably someday mpc83xx_spi->sysclk should be renamed to mpc83xx_spi->spiclk to be less confusing.

Why not "today", with this patch? That would fix some of the root cause of this bug...

I'm fine with this as well. I just called it sysclk to start with since when I wrote the driver it was just for the MPC834x.

- k

#9 lore raw
In reply to a message not in the archive
Quoted 4 lines · Kumar Gala
Quoted 1 line · David Brownell

On Thursday 02 August 2007, Anton Vorontsov wrote:

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

Probably someday mpc83xx_spi->sysclk should be renamed to mpc83xx_spi->spiclk to be less confusing.

Why not "today", with this patch? That would fix some of the root cause of this bug...

I'm fine with this as well. I just called it sysclk to start with since when I wrote the driver it was just for the MPC834x.

Ok, great.

Now I think that spiclk' is the bad name either, because it's output clock of the spi unit. spibrg' should be the best name for this, as it's input clock to the SPI unit. Patch below.

- - - -
From: Anton Vorontsov <[email protected]>
Subject: [PATCH] spi_mpc83xx: for SPI in QE spibrg's input is sysclk/2

For MPC8349E input to SPIBRG is SYSCLK, but it's SYSCLK/2 for MPC8323E (SPI in QE).

Also mpc83xx_spi->sysclk renamed to mpc83xx_spi->spibrg.

---
 drivers/spi/spi_mpc83xx.c |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)
drivers/spi/spi_mpc83xx.c +12 -8
index 0c16a2b..446b624 100644
@@ -86,7 +86,7 @@ struct mpc83xx_spi {
 
 	unsigned nsecs;		/* (clock cycle time)/2 */
 
-	u32 sysclk;
+	u32 spibrg;		/* SPIBRG input clock */
 	u32 rx_shift;		/* RX data reg shift when in qe mode */
 	u32 tx_shift;		/* TX data reg shift when in qe mode */
 
@@ -169,17 +169,17 @@ static void mpc83xx_spi_chipselect(struct spi_device *spi, int value)
 
 		regval |= SPMODE_LEN(len);
 
-		if ((mpc83xx_spi->sysclk / spi->max_speed_hz) >= 64) {
-			u8 pm = mpc83xx_spi->sysclk / (spi->max_speed_hz * 64);
+		if ((mpc83xx_spi->spibrg / spi->max_speed_hz) >= 64) {
+			u8 pm = mpc83xx_spi->spibrg / (spi->max_speed_hz * 64);
 			if (pm > 0x0f) {
-				printk(KERN_WARNING "MPC83xx SPI: SPICLK can't be less then a SYSCLK/1024!\n"
-						"Requested SPICLK is %d Hz. Will use %d Hz instead.\n",
-						spi->max_speed_hz, mpc83xx_spi->sysclk / 1024);
+				dev_warn(&spi->dev, "Requested speed is too "
+					"low: %d Hz. Will use %d Hz instead.\n",
+					spi->max_speed_hz, mpc83xx_spi->spibrg / 1024);
 				pm = 0x0f;
 			}
 			regval |= SPMODE_PM(pm) | SPMODE_DIV16;
 		} else {
-			u8 pm = mpc83xx_spi->sysclk / (spi->max_speed_hz * 4);
+			u8 pm = mpc83xx_spi->spibrg / (spi->max_speed_hz * 4);
 			regval |= SPMODE_PM(pm);
 		}
 
@@ -429,13 +429,17 @@ static int __init mpc83xx_spi_probe(struct platform_device *dev)
 	mpc83xx_spi->bitbang.chipselect = mpc83xx_spi_chipselect;
 	mpc83xx_spi->bitbang.setup_transfer = mpc83xx_spi_setup_transfer;
 	mpc83xx_spi->bitbang.txrx_bufs = mpc83xx_spi_bufs;
-	mpc83xx_spi->sysclk = pdata->sysclk;
 	mpc83xx_spi->activate_cs = pdata->activate_cs;
 	mpc83xx_spi->deactivate_cs = pdata->deactivate_cs;
 	mpc83xx_spi->qe_mode = pdata->qe_mode;
 	mpc83xx_spi->get_rx = mpc83xx_spi_rx_buf_u8;
 	mpc83xx_spi->get_tx = mpc83xx_spi_tx_buf_u8;
 
+	if (mpc83xx_spi->qe_mode)
+		mpc83xx_spi->spibrg = pdata->sysclk / 2;
+	else
+		mpc83xx_spi->spibrg = pdata->sysclk;
+
 	mpc83xx_spi->rx_shift = 0;
 	mpc83xx_spi->tx_shift = 0;
 	if (mpc83xx_spi->qe_mode) {
Signature · 8 lines
1.5.0.6


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/