Skip to contentSkip to conversation

mpc52xx_psc_spi: enlarge clock range

PATCH In review Dragos Carp 4 participants 5 messages Sep 16, 2009 – Sep 17, 2009 2 messages not in the archive SPI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mpc52xx_psc_spi: enlarge clock range

allow spi clock values bellow 78kbps down to ca. 300bps

---
 mpc52xx_psc_spi.c |   26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/spi/mpc52xx_psc_spi.c +13 -13
index 1b74d5c..b15882a 100644
@@ -78,7 +78,8 @@ static void mpc52xx_psc_spi_activate_cs(struct spi_device *spi)
 	struct mpc52xx_psc_spi *mps = spi_master_get_devdata(spi->master);
 	struct mpc52xx_psc __iomem *psc = mps->psc;
 	u32 sicr;
-	u16 ccr;
+	u32 ccr;
+	u32 bitclkdiv;
 
 	sicr = in_be32(&psc->sicr);
 
@@ -98,17 +99,16 @@ static void mpc52xx_psc_spi_activate_cs(struct spi_device *spi)
 		sicr &= ~0x10000000;
 	out_be32(&psc->sicr, sicr);
 
-	/* Set clock frequency and bits per word
-	 * Because psc->ccr is defined as 16bit register instead of 32bit
-	 * just set the lower byte of BitClkDiv
-	 */
-	ccr = in_be16((u16 __iomem *)&psc->ccr);
-	ccr &= 0xFF00;
-	if (cs->speed_hz)
-		ccr |= (MCLK / cs->speed_hz - 1) & 0xFF;
-	else /* by default SPI Clk 1MHz */
-		ccr |= (MCLK / 1000000 - 1) & 0xFF;
-	out_be16((u16 __iomem *)&psc->ccr, ccr);
+	/* Set clock frequency */
+	bitclkdiv = MCLK / (cs->speed_hz ? cs->speed_hz : 1000000) - 1;
+	bitclkdiv &= 0xFFFF;
+	bitclkdiv |= (bitclkdiv & 0xFF) << 16;	/* byte swapped */
+	bitclkdiv &= 0x00FFFF00;
+	ccr = in_be32(&psc->ccr);
+	ccr &= 0xFF0000FF;
+	ccr |= bitclkdiv;
+	out_be32(&psc->ccr, ccr);
+	
 	mps->bits_per_word = cs->bits_per_word;
 
 	if (mps->cs_control)
@@ -333,7 +333,7 @@ static int mpc52xx_psc_spi_port_config(int psc_id, struct mpc52xx_psc_spi *mps)
 	/* Configure 8bit codec mode as a SPI master and use EOF flags */
 	/* SICR_SIM_CODEC8|SICR_GENCLK|SICR_SPI|SICR_MSTR|SICR_USEEOF */
 	out_be32(&psc->sicr, 0x0180C800);
-	out_be16((u16 __iomem *)&psc->ccr, 0x070F); /* default SPI Clk 1MHz */
+	out_be32(&psc->ccr, 0x07130000); /* default SPI Clk 1MHz */
 
 	/* Set 2ms DTL delay */
 	out_8(&psc->ctur, 0x00);

------------------------------------------------------------------------------
Come build with us! The BlackBerry&reg; Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9&#45;12, 2009. Register now&#33;
http://p.sf.net/sfu/devconf

_______________________________________________
spi-devel-general mailing list spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
https://lists.sourceforge.net/lists/listinfo/spi-devel-general

#1 lore raw

Hi,

adding powerpc-list and Grant to cc.

Quoted 1 line · Dragos Carp

allow spi clock values bellow 78kbps down to ca. 300bps

Looks like your patch converts the driver from mpc5200 to mpc5200b? If this is really all which is needed, it should support both versions, I think.

Regards,

Wolfram

Quoted 58 lines
---
 mpc52xx_psc_spi.c |   26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/spi/mpc52xx_psc_spi.c +13 -13
index 1b74d5c..b15882a 100644
@@ -78,7 +78,8 @@ static void mpc52xx_psc_spi_activate_cs(struct spi_device *spi)
 	struct mpc52xx_psc_spi *mps = spi_master_get_devdata(spi->master);
 	struct mpc52xx_psc __iomem *psc = mps->psc;
 	u32 sicr;
-	u16 ccr;
+	u32 ccr;
+	u32 bitclkdiv;
 
 	sicr = in_be32(&psc->sicr);
 
@@ -98,17 +99,16 @@ static void mpc52xx_psc_spi_activate_cs(struct spi_device *spi)
 		sicr &= ~0x10000000;
 	out_be32(&psc->sicr, sicr);
 
-	/* Set clock frequency and bits per word
-	 * Because psc->ccr is defined as 16bit register instead of 32bit
-	 * just set the lower byte of BitClkDiv
-	 */
-	ccr = in_be16((u16 __iomem *)&psc->ccr);
-	ccr &= 0xFF00;
-	if (cs->speed_hz)
-		ccr |= (MCLK / cs->speed_hz - 1) & 0xFF;
-	else /* by default SPI Clk 1MHz */
-		ccr |= (MCLK / 1000000 - 1) & 0xFF;
-	out_be16((u16 __iomem *)&psc->ccr, ccr);
+	/* Set clock frequency */
+	bitclkdiv = MCLK / (cs->speed_hz ? cs->speed_hz : 1000000) - 1;
+	bitclkdiv &= 0xFFFF;
+	bitclkdiv |= (bitclkdiv & 0xFF) << 16;	/* byte swapped */
+	bitclkdiv &= 0x00FFFF00;
+	ccr = in_be32(&psc->ccr);
+	ccr &= 0xFF0000FF;
+	ccr |= bitclkdiv;
+	out_be32(&psc->ccr, ccr);
+	
 	mps->bits_per_word = cs->bits_per_word;
 
 	if (mps->cs_control)
@@ -333,7 +333,7 @@ static int mpc52xx_psc_spi_port_config(int psc_id, struct mpc52xx_psc_spi *mps)
 	/* Configure 8bit codec mode as a SPI master and use EOF flags */
 	/* SICR_SIM_CODEC8|SICR_GENCLK|SICR_SPI|SICR_MSTR|SICR_USEEOF */
 	out_be32(&psc->sicr, 0x0180C800);
-	out_be16((u16 __iomem *)&psc->ccr, 0x070F); /* default SPI Clk 1MHz */
+	out_be32(&psc->ccr, 0x07130000); /* default SPI Clk 1MHz */
 
 	/* Set 2ms DTL delay */
 	out_8(&psc->ctur, 0x00);
Signature · 2 lines
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://lists.ozlabs.org/listinfo/linuxppc-dev

A message that is not in the archive (sent off-list or not yet received): [email protected]

#3 lore raw

Hi,

I wasn't aware that MPC5200 differ from MPC5200B in this regard. I also couldn't find any MPC5200 user manual on Freescale's webpage. Is there a #define that I can use to distinguish between the two processor variants? Querying the PVR register is not a nice solution because the chip-select activate function is called in some scenarios quite often.

Regards,
Dragos

Quoted 72 lines · Wolfram Sang

Hi,

adding powerpc-list and Grant to cc.

Quoted 2 lines · Dragos Carp

allow spi clock values bellow 78kbps down to ca. 300bps

Looks like your patch converts the driver from mpc5200 to mpc5200b? If this is really all which is needed, it should support both versions, I think.

Regards,

Wolfram

Quoted 56 lines
---
 mpc52xx_psc_spi.c |   26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/spi/mpc52xx_psc_spi.c +13 -13
index 1b74d5c..b15882a 100644
@@ -78,7 +78,8 @@ static void mpc52xx_psc_spi_activate_cs(struct spi_device *spi)
 	struct mpc52xx_psc_spi *mps = spi_master_get_devdata(spi->master);
 	struct mpc52xx_psc __iomem *psc = mps->psc;
 	u32 sicr;
-	u16 ccr;
+	u32 ccr;
+	u32 bitclkdiv;
 
 	sicr = in_be32(&psc->sicr);
 
@@ -98,17 +99,16 @@ static void mpc52xx_psc_spi_activate_cs(struct spi_device *spi)
 		sicr &= ~0x10000000;
 	out_be32(&psc->sicr, sicr);
 
-	/* Set clock frequency and bits per word
-	 * Because psc->ccr is defined as 16bit register instead of 32bit
-	 * just set the lower byte of BitClkDiv
-	 */
-	ccr = in_be16((u16 __iomem *)&psc->ccr);
-	ccr &= 0xFF00;
-	if (cs->speed_hz)
-		ccr |= (MCLK / cs->speed_hz - 1) & 0xFF;
-	else /* by default SPI Clk 1MHz */
-		ccr |= (MCLK / 1000000 - 1) & 0xFF;
-	out_be16((u16 __iomem *)&psc->ccr, ccr);
+	/* Set clock frequency */
+	bitclkdiv = MCLK / (cs->speed_hz ? cs->speed_hz : 1000000) - 1;
+	bitclkdiv &= 0xFFFF;
+	bitclkdiv |= (bitclkdiv & 0xFF) << 16;	/* byte swapped */
+	bitclkdiv &= 0x00FFFF00;
+	ccr = in_be32(&psc->ccr);
+	ccr &= 0xFF0000FF;
+	ccr |= bitclkdiv;
+	out_be32(&psc->ccr, ccr);
+	
 	mps->bits_per_word = cs->bits_per_word;
 
 	if (mps->cs_control)
@@ -333,7 +333,7 @@ static int mpc52xx_psc_spi_port_config(int psc_id, struct mpc52xx_psc_spi *mps)
 	/* Configure 8bit codec mode as a SPI master and use EOF flags */
 	/* SICR_SIM_CODEC8|SICR_GENCLK|SICR_SPI|SICR_MSTR|SICR_USEEOF */
 	out_be32(&psc->sicr, 0x0180C800);
-	out_be16((u16 __iomem *)&psc->ccr, 0x070F); /* default SPI Clk 1MHz */
+	out_be32(&psc->ccr, 0x07130000); /* default SPI Clk 1MHz */
 
Quoted 4 lines

drivers/spi/mpc52xx_psc_spi.c static int mpc52xx_psc_spi_port_config(int psc_id, struct mpc52xx_psc_spi *mps) · line 339

Quoted 3 lines
drivers/spi/mpc52xx_psc_spi.c +0 -0
 	/* Set 2ms DTL delay */
 	out_8(&psc->ctur, 0x00);

------------------------------------------------------------------------------
Come build with us! The BlackBerry&reg; Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9&#45;12, 2009. Register now&#33;
http://p.sf.net/sfu/devconf

#4 lore raw
Quoted 8 lines · Dragos Carp

Hi,

I wasn't aware that MPC5200 differ from MPC5200B in this regard. I also couldn't find any MPC5200 user manual on Freescale's webpage. Is there a #define that I can use to distinguish between the two processor variants? Querying the PVR register is not a nice solution because the chip-select activate function is called in some scenarios quite often.

Use the compatible value. That's what it is there for. Only use the extended register format if "fsl,mpc5200b-psc-spi" is present in the compatible list.

g.

Signature · 2 lines
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.

A message that is not in the archive (sent off-list or not yet received): [email protected]

#6 lore raw
Quoted 2 lines

I wasn't aware that MPC5200 differ from MPC5200B in this regard. I also couldn't find any MPC5200 user manual on Freescale's webpage.

Hmm, it was the first hit using a web search engine :)

http://www.freescale.com/files/microcontrollers/doc/user_guide/MPC5200UM.pdf?WT_TYPE=Users%20Guides&WT_VENDOR=FREESCALE&WT_FILE_FORMAT=pdf&WT_ASSET=Documentation

Quoted 2 lines

Is there a #define that I can use to distinguish between the two processor variants? Querying the PVR register is not a nice solution

I think you should have two different functions for calculation, one for 5200 and one for 5200B. During init query the device tree for 'fsl,mpc5200-psc-spi' or 'fsl,mpc5200b-psc-spi' and make the driver use the proper function.

(BTW I haven't checked for further differences between 5200 and 5200B; there may be more)

Regards,

Wolfram

Signature · 2 lines
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

------------------------------------------------------------------------------
Come build with us! The BlackBerry&reg; Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9&#45;12, 2009. Register now&#33;
http://p.sf.net/sfu/devconf

_______________________________________________
spi-devel-general mailing list spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
https://lists.sourceforge.net/lists/listinfo/spi-devel-general