Some work for spi_mpc83xx driver, spi-mmc support for MPC8610HPCD
Subsystems (3)
cover Some work for spi_mpc83xx driver, spi-mmc support for MPC8610HPCD
Hi all,
Here are few patches that are needed to support spi-mmc slot on MPC8610HPCD PowerPC boards:
[1/9] spi_mpc83xx: Handles other Freescale processors
[2/9] spi_mpc83xx: Quieten down the "Requested speed is too low" message [3/9] spi_mpc83xx: Add small delay after asserting chip-select line [4/9] powerpc/86xx: Add MMC SPI support for MPC8610HPCD boards
The rest are cleanups, initially Kumar suggested to rename spi_mpc83xx.c to spi_mpc8xxx.c, but checkpatch told me to fix some other issues. So the following cleanups were prepared:
[5/9] spi_mpc83xx: Fix checkpatch issues
[6/9] spi_mpc83xx: Split mpc83xx_spi_work() into two routines [7/9] spi_mpc83xx: Remove dead code
[8/9] spi_mpc83xx: Rename spi_83xx.c to spi_8xxx.c [9/9] spi_mpc8xxx: s/83xx/8xxx/g
Thanks,
Signature · 10 lines
Anton Vorontsov email: [email protected] irc://irc.freenode.net/bd2 ------------------------------------------------------------------------------ Register Now & Save for Velocity, the Web Performance & Operations Conference from O'Reilly Media. Velocity features a full day of expert-led, hands-on workshops and two days of sessions from industry leaders in dedicated Performance & Operations tracks. Use code vel09scf and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf
PATCH 1/9 spi_mpc83xx: Handles other Freescale processors
With this patch we'll able to select spi_mpc83xx driver on the MPC86xx platforms. Let the driver depend on FSL_SOC, so we don't have to worry about Kconfig anymore.
Also remove the "experimental" dependency, the driver has been tested to work on a various hardware, and surely not experimental anymore.
--- drivers/spi/Kconfig | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-)
drivers/spi/Kconfig +6 -8
@@ -140,16 +140,14 @@ config SPI_MPC52xx_PSC Controller in master SPI mode. config SPI_MPC83xx - tristate "Freescale MPC83xx/QUICC Engine SPI controller" - depends on (PPC_83xx || QUICC_ENGINE) && EXPERIMENTAL + tristate "Freescale MPC8xxx SPI controller" + depends on FSL_SOC help - This enables using the Freescale MPC83xx and QUICC Engine SPI - controllers in master mode. + This enables using the Freescale MPC8xxx SPI controllers in master + mode. - Note, this driver uniquely supports the SPI controller on the MPC83xx - family of PowerPC processors, plus processors with QUICC Engine - technology. This driver uses a simple set of shift registers for data - (opposed to the CPM based descriptor model). + This driver uses a simple set of shift registers for data (opposed + to the CPM based descriptor model). config SPI_OMAP_UWIRE tristate "OMAP1 MicroWire"
Signature · 9 lines
1.6.2.2 ------------------------------------------------------------------------------ Register Now & Save for Velocity, the Web Performance & Operations Conference from O'Reilly Media. Velocity features a full day of expert-led, hands-on workshops and two days of sessions from industry leaders in dedicated Performance & Operations tracks. Use code vel09scf and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf
PATCH 2/9 spi_mpc83xx: Quieten down the "Requested speed is too low" message
In reply to Anton VorontsovWhen a platform is running at high frequencies it's not always possible to scale-down a frequency to a requested value, and using mmc_spi driver this leads to the following printk flood during card polling:
...
mmc_spi spi32766.0: Requested speed is too low: 400000 Hz. Will use 520828 Hz instead.
mmc_spi spi32766.0: Requested speed is too low: 400000 Hz. Will use 520828 Hz instead.
...
Fix this by using WARN_ONCE(), it's better than the flood, and also better than turning dev_err() into dev_dbg(), since we actually want to warn that some things may not work correctly.
--- drivers/spi/spi_mpc83xx.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-)
drivers/spi/spi_mpc83xx.c +6 -5
@@ -14,6 +14,7 @@#include <linux/init.h> #include <linux/types.h> #include <linux/kernel.h> +#include <linux/bug.h> #include <linux/errno.h> #include <linux/err.h> #include <linux/completion.h>
@@ -275,12 +276,12 @@ int mpc83xx_spi_setup_transfer(struct spi_device *spi, struct spi_transfer *t)if ((mpc83xx_spi->spibrg / hz) >64 ) { cs->hw_mode |=SPMODE_DIV16 ; pm = mpc83xx_spi->spibrg / (hz *64 ); -if (pm >16 ) { -dev_err (&spi->dev,"Requested speed is too " -"low: %d Hz. Will use %d Hz instead.\n" , - hz, mpc83xx_spi->spibrg /1024 ); + +WARN_ONCE (pm >16 ,"%s: Requested speed is too low: %d Hz. " +"Will use %d Hz instead.\n" ,dev_name (&spi->dev), + hz, mpc83xx_spi->spibrg /1024 ); +if (pm >16 ) pm =16 ; - } }else pm = mpc83xx_spi->spibrg / (hz *4 );if (pm)
Signature · 9 lines
1.6.2.2 ------------------------------------------------------------------------------ Register Now & Save for Velocity, the Web Performance & Operations Conference from O'Reilly Media. Velocity features a full day of expert-led, hands-on workshops and two days of sessions from industry leaders in dedicated Performance & Operations tracks. Use code vel09scf and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf
PATCH 3/9 spi_mpc83xx: Add small delay after asserting chip-select line
In reply to Anton VorontsovThis is needed for some underlaying GPIO controllers that may be a bit slow, or if chip-select signal need some time to stabilize.
For what it's worth, we already have the similar delay for chip-select de-assertion case.
--- drivers/spi/spi_mpc83xx.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
drivers/spi/spi_mpc83xx.c +3 -1
@@ -383,8 +383,10 @@ static void mpc83xx_spi_work(struct work_struct *work)break ; } -if (cs_change) +if (cs_change) {mpc83xx_spi_chipselect (spi,BITBANG_CS_ACTIVE ); +ndelay (nsecs); + } cs_change = t->cs_change;if (t->len) status =mpc83xx_spi_bufs (spi, t);
Signature · 9 lines
1.6.2.2 ------------------------------------------------------------------------------ Register Now & Save for Velocity, the Web Performance & Operations Conference from O'Reilly Media. Velocity features a full day of expert-led, hands-on workshops and two days of sessions from industry leaders in dedicated Performance & Operations tracks. Use code vel09scf and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf
PATCH 4/9 powerpc/86xx: Add MMC SPI support for MPC8610HPCD boards
In reply to Anton VorontsovThis patch adds spi and mmc-spi-slot nodes, plus a gpio-controller for PIXIS' sdcsr bank that is used for managing SPI chip-select and for reading card's states.
--- arch/powerpc/boot/dts/mpc8610_hpcd.dts | 32 ++++++++++++++++++++++++++++ arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 4 +++ 2 files changed, 36 insertions(+), 0 deletions(-)
arch/powerpc/boot/dts/mpc8610_hpcd.dts +32 -0
@@ -100,8 +100,18 @@ }; board-control@3,0 { + #address-cells = <1>; + #size-cells = <1>; compatible = "fsl,fpga-pixis"; reg = <3 0 0x20>; + ranges = <0 3 0 0x20>; + + sdcsr_pio: gpio-controller@a { + #gpio-cells = <2>; + compatible = "fsl,fpga-pixis-gpio-bank"; + reg = <0xa 1>; + gpio-controller; + }; }; };
@@ -164,6 +174,28 @@ interrupt-parent = <&mpic>; }; + spi@7000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "fsl,mpc8610-spi", "fsl,spi"; + reg = <0x7000 0x40>; + cell-index = <0>; + interrupts = <59 2>; + interrupt-parent = <&mpic>; + mode = "cpu"; + gpios = <&sdcsr_pio 7 0>; + + mmc-slot@0 { + compatible = "fsl,mpc8610hpcd-mmc-slot", + "mmc-spi-slot"; + reg = <0>; + gpios = <&sdcsr_pio 0 1 /* nCD */ + &sdcsr_pio 1 0>; /* WP */ + voltage-ranges = <3300 3300>; + spi-max-frequency = <50000000>; + }; + }; + display@2c000 { compatible = "fsl,diu"; reg = <0x2c000 100>;
arch/powerpc/platforms/86xx/mpc8610_hpcd.c +4 -0
@@ -38,6 +38,7 @@#include <linux/of_platform.h> #include <sysdev/fsl_pci.h> #include <sysdev/fsl_soc.h> +#include <sysdev/simple_gpio.h> #include "mpc86xx.h"
@@ -52,6 +53,9 @@ static struct of_device_id __initdata mpc8610_ids[] = {static int __init mpc8610_declare_of_platform_devices (void ) { +/* Firstly, register PIXIS GPIOs. */ +simple_gpiochip_init ("fsl,fpga-pixis-gpio-bank" ); +/* Without this call, the SSI device driver won't get probed. */ of_platform_bus_probe (NULL , mpc8610_ids,NULL );
Signature · 9 lines
1.6.2.2 ------------------------------------------------------------------------------ Register Now & Save for Velocity, the Web Performance & Operations Conference from O'Reilly Media. Velocity features a full day of expert-led, hands-on workshops and two days of sessions from industry leaders in dedicated Performance & Operations tracks. Use code vel09scf and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf
PATCH 5/9 spi_mpc83xx: Fix checkpatch issues
In reply to Anton VorontsovCheckpatch is spitting errors when seeing the rename patch, so fix the errors prior to moving.
Following errors and warnings were fixed:
WARNING: Use #include <linux/io.h> instead of <asm/io.h> #1027: FILE: drivers/spi/spi_mpc8xxx.c:37:
+#include <asm/io.h>
ERROR: "foo * bar" should be "foo *bar"
#1111: FILE: drivers/spi/spi_mpc8xxx.c:121:
+static inline void mpc83xx_spi_write_reg(__be32 __iomem * reg, u32 val)
ERROR: "foo * bar" should be "foo *bar"
#1116: FILE: drivers/spi/spi_mpc8xxx.c:126:
+static inline u32 mpc83xx_spi_read_reg(__be32 __iomem * reg)
ERROR: "foo * bar" should be "foo *bar"
#1125: FILE: drivers/spi/spi_mpc8xxx.c:135:
+ type * rx = mpc83xx_spi->rx; \
ERROR: "foo * bar" should be "foo *bar"
#1135: FILE: drivers/spi/spi_mpc8xxx.c:145:
+ const type * tx = mpc83xx_spi->tx; \
WARNING: suspect code indent for conditional statements (16, 25) #1504: FILE: drivers/spi/spi_mpc8xxx.c:514:
+ while (((event =
[...]
+ cpu_relax();
Following warnings were left over, since fixing them will hurt the readability. We'd better fix them by lowering the indentation level by splitting mpc83xx_spi_work function into two parts.
WARNING: line over 80 characters
#1371: FILE: drivers/spi/spi_mpc8xxx.c:381:
+ status = mpc83xx_spi_setup_transfer(spi, t);
WARNING: line over 80 characters
#1392: FILE: drivers/spi/spi_mpc8xxx.c:402:
+ mpc83xx_spi_chipselect(spi, BITBANG_CS_INACTIVE);
--- drivers/spi/spi_mpc83xx.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
drivers/spi/spi_mpc83xx.c +6 -6
@@ -17,6 +17,7 @@#include <linux/bug.h> #include <linux/errno.h> #include <linux/err.h> +#include <linux/io.h> #include <linux/completion.h> #include <linux/interrupt.h> #include <linux/delay.h>
@@ -34,7 +35,6 @@#include <sysdev/fsl_soc.h> #include <asm/irq.h> -#include <asm/io.h> /* SPI Controller registers */ struct mpc83xx_spi_reg {
@@ -118,12 +118,12 @@ struct spi_mpc83xx_cs {u32 hw_mode;/* Holds HW mode register settings */ }; -static inline void mpc83xx_spi_write_reg (__be32 __iomem * reg,u32 val) +static inline void mpc83xx_spi_write_reg (__be32 __iomem *reg,u32 val) {out_be32 (reg, val); } -static inline u32 mpc83xx_spi_read_reg (__be32 __iomem * reg) +static inline u32 mpc83xx_spi_read_reg (__be32 __iomem *reg) {return in_be32 (reg); }
@@ -132,7 +132,7 @@ static inline u32 mpc83xx_spi_read_reg(__be32 __iomem * reg) static \ void mpc83xx_spi_rx_buf_##type(u32 data, struct mpc83xx_spi *mpc83xx_spi) \ { \ - type * rx = mpc83xx_spi->rx; \ + type *rx = mpc83xx_spi->rx; \ *rx++ = (type)(data >> mpc83xx_spi->rx_shift); \ mpc83xx_spi->rx = rx; \ }
@@ -142,7 +142,7 @@ static \ u32 mpc83xx_spi_tx_buf_##type(struct mpc83xx_spi *mpc83xx_spi) \ { \ u32 data; \ - const type * tx = mpc83xx_spi->tx; \ + const type *tx = mpc83xx_spi->tx; \ if (!tx) \ return 0; \ data = *tx++ << mpc83xx_spi->tx_shift; \
@@ -516,7 +516,7 @@ static irqreturn_t mpc83xx_spi_irq(s32 irq, void *context_data)while (((event =mpc83xx_spi_read_reg (&mpc83xx_spi->base->event)) &SPIE_NF ) ==0 ) -cpu_relax (); +cpu_relax (); mpc83xx_spi->count -=1 ;if (mpc83xx_spi->count) {
Signature · 9 lines
1.6.2.2 ------------------------------------------------------------------------------ Register Now & Save for Velocity, the Web Performance & Operations Conference from O'Reilly Media. Velocity features a full day of expert-led, hands-on workshops and two days of sessions from industry leaders in dedicated Performance & Operations tracks. Use code vel09scf and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf
PATCH 6/9 spi_mpc83xx: Split mpc83xx_spi_work() into two routines
In reply to Anton Vorontsovmpc83xx_spi_work() is quite large, with up to five indentation levels and is quite difficult to read.
So, split the function in two parts:
1. mpc83xx_spi_work() now only traverse queued spi messages;
2. mpc83xx_spi_do_one_msg() only manages single messages.
There should be no functional changes.
--- drivers/spi/spi_mpc83xx.c | 115 +++++++++++++++++++++++--------------------- 1 files changed, 60 insertions(+), 55 deletions(-)
drivers/spi/spi_mpc83xx.c +60 -55
@@ -350,71 +350,76 @@ static int mpc83xx_spi_bufs(struct spi_device *spi, struct spi_transfer *t)return mpc83xx_spi->count; } -static void mpc83xx_spi_work (struct work_struct *work) +static void mpc83xx_spi_do_one_msg (struct spi_message *m) { -struct mpc83xx_spi *mpc83xx_spi = - container_of(work, struct mpc83xx_spi, work); - -spin_lock_irq (&mpc83xx_spi->lock); - mpc83xx_spi->busy =1 ; -while (!list_empty (&mpc83xx_spi->queue)) { -struct spi_message *m; -struct spi_device *spi; -struct spi_transfer *t =NULL ; -unsigned cs_change; -int status, nsecs =50 ; - - m =container_of (mpc83xx_spi->queue.next, - struct spi_message, queue); -list_del_init (&m->queue); -spin_unlock_irq (&mpc83xx_spi->lock); - - spi = m->spi; - cs_change =1 ; - status =0 ; -list_for_each_entry (t, &m->transfers, transfer_list) { -if (t->bits_per_word || t->speed_hz) { -/* Don't allow changes if CS is active */ - status = -EINVAL ; - -if (cs_change) - status =mpc83xx_spi_setup_transfer (spi, t); -if (status <0 ) -break ; - } - -if (cs_change) { -mpc83xx_spi_chipselect (spi,BITBANG_CS_ACTIVE ); -ndelay (nsecs); - } - cs_change = t->cs_change; -if (t->len) - status =mpc83xx_spi_bufs (spi, t); -if (status) { - status = -EMSGSIZE ; +struct spi_device *spi = m->spi; +struct spi_transfer *t; +unsigned int cs_change; +const int nsecs =50 ; +int status; + + cs_change =1 ; + status =0 ; +list_for_each_entry (t, &m->transfers, transfer_list) { +if (t->bits_per_word || t->speed_hz) { +/* Don't allow changes if CS is active */ + status = -EINVAL ; + +if (cs_change) + status =mpc83xx_spi_setup_transfer (spi, t); +if (status <0 )break ; - } - m->actual_length += t->len; - -if (t->delay_usecs) -udelay (t->delay_usecs); + } -if (cs_change) { -ndelay (nsecs); -mpc83xx_spi_chipselect (spi,BITBANG_CS_INACTIVE ); -ndelay (nsecs); - } +if (cs_change) { +mpc83xx_spi_chipselect (spi,BITBANG_CS_ACTIVE ); +ndelay (nsecs); + } + cs_change = t->cs_change; +if (t->len) + status =mpc83xx_spi_bufs (spi, t); +if (status) { + status = -EMSGSIZE ; +break ; } + m->actual_length += t->len; - m->status = status; - m->complete (m->context); +if (t->delay_usecs) +udelay (t->delay_usecs); -if (status || !cs_change) { +if (cs_change) {ndelay (nsecs);mpc83xx_spi_chipselect (spi,BITBANG_CS_INACTIVE ); +ndelay (nsecs); } + } + + m->status = status; + m->complete (m->context); + +if (status || !cs_change) { +ndelay (nsecs); +mpc83xx_spi_chipselect (spi,BITBANG_CS_INACTIVE ); + } + +mpc83xx_spi_setup_transfer (spi,NULL ); +} + +static void mpc83xx_spi_work (struct work_struct *work) +{ + struct mpc83xx_spi *mpc83xx_spi = container_of(work, struct mpc83xx_spi, + work); + +spin_lock_irq (&mpc83xx_spi->lock); + mpc83xx_spi->busy =1 ; +while (!list_empty (&mpc83xx_spi->queue)) { +struct spi_message *m =container_of (mpc83xx_spi->queue.next, + struct spi_message, queue); + +list_del_init (&m->queue); +spin_unlock_irq (&mpc83xx_spi->lock); -mpc83xx_spi_setup_transfer (spi,NULL ); +mpc83xx_spi_do_one_msg (m);spin_lock_irq (&mpc83xx_spi->lock); }
Signature · 9 lines
1.6.2.2 ------------------------------------------------------------------------------ Register Now & Save for Velocity, the Web Performance & Operations Conference from O'Reilly Media. Velocity features a full day of expert-led, hands-on workshops and two days of sessions from industry leaders in dedicated Performance & Operations tracks. Use code vel09scf and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf
PATCH 7/9 spi_mpc83xx: Remove dead code
In reply to Anton VorontsovThis patch removes #if 0'ed code, and spi_mpc83xx->busy variable that is used by that dead snippet only.
--- drivers/spi/spi_mpc83xx.c | 16 ---------------- 1 files changed, 0 insertions(+), 16 deletions(-)
drivers/spi/spi_mpc83xx.c +0 -16
@@ -98,8 +98,6 @@ struct mpc83xx_spi {bool qe_mode; -u8 busy; -struct workqueue_struct *workqueue;struct work_struct work;
@@ -411,7 +409,6 @@ static void mpc83xx_spi_work(struct work_struct *work) work);spin_lock_irq (&mpc83xx_spi->lock); - mpc83xx_spi->busy =1 ;while (!list_empty (&mpc83xx_spi->queue)) {struct spi_message *m =container_of (mpc83xx_spi->queue.next, struct spi_message, queue);
@@ -423,7 +420,6 @@ static void mpc83xx_spi_work(struct work_struct *work)spin_lock_irq (&mpc83xx_spi->lock); } - mpc83xx_spi->busy =0 ;spin_unlock_irq (&mpc83xx_spi->lock); }
@@ -482,18 +478,6 @@ static int mpc83xx_spi_setup(struct spi_device *spi)dev_dbg (&spi->dev,"%s, mode %d, %u bits/w, %u Hz\n" , __func__, spi->mode & (SPI_CPOL |SPI_CPHA ), spi->bits_per_word, spi->max_speed_hz); -#if 0 /* Don't think this is needed */ -/* NOTE we _need_ to call chipselect() early, ideally with adapter -* setup, unless the hardware defaults cooperate to avoid confusion -* between normal (active low) and inverted chipselects. -*/ - -/* deselect chip (low or high) */ -spin_lock (&mpc83xx_spi->lock); -if (!mpc83xx_spi->busy) -mpc83xx_spi_chipselect (spi,BITBANG_CS_INACTIVE ); -spin_unlock (&mpc83xx_spi->lock); -#endif return 0 ; }
Signature · 9 lines
1.6.2.2 ------------------------------------------------------------------------------ Register Now & Save for Velocity, the Web Performance & Operations Conference from O'Reilly Media. Velocity features a full day of expert-led, hands-on workshops and two days of sessions from industry leaders in dedicated Performance & Operations tracks. Use code vel09scf and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf
PATCH 8/9 spi_mpc83xx: Rename spi_83xx.c to spi_8xxx.c
In reply to Anton VorontsovThe driver handles MPC83xx, MPC85xx and MPC86xx SPI controllers, so rename the file for clarity.
--- drivers/spi/Makefile | 2 +- drivers/spi/spi_mpc83xx.c | 958 --------------------------------------------- drivers/spi/spi_mpc8xxx.c | 958 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 959 insertions(+), 959 deletions(-) delete mode 100644 drivers/spi/spi_mpc83xx.c create mode 100644 drivers/spi/spi_mpc8xxx.c
drivers/spi/Makefile +1 -1
@@ -24,7 +24,7 @@ obj-$(CONFIG_SPI_OMAP_UWIRE) += omap_uwire.o obj-$(CONFIG_SPI_OMAP24XX) += omap2_mcspi.o obj-$(CONFIG_SPI_ORION) += orion_spi.o obj-$(CONFIG_SPI_MPC52xx_PSC) += mpc52xx_psc_spi.o -obj-$(CONFIG_SPI_MPC83xx) += spi_mpc83xx.o +obj-$(CONFIG_SPI_MPC83xx) += spi_mpc8xxx.o obj-$(CONFIG_SPI_S3C24XX_GPIO) += spi_s3c24xx_gpio.o obj-$(CONFIG_SPI_S3C24XX) += spi_s3c24xx.o obj-$(CONFIG_SPI_TXX9) += spi_txx9.o
drivers/spi/spi_mpc83xx.c deleted +0 -958
958 lines not on this page · raw message
drivers/spi/spi_mpc8xxx.c new file +958 -0
958 lines not on this page · raw message
Signature · 9 lines
1.6.2.2 ------------------------------------------------------------------------------ Register Now & Save for Velocity, the Web Performance & Operations Conference from O'Reilly Media. Velocity features a full day of expert-led, hands-on workshops and two days of sessions from industry leaders in dedicated Performance & Operations tracks. Use code vel09scf and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf
PATCH 9/9 spi_mpc8xxx: s/83xx/8xxx/g
In reply to Anton VorontsovSince we renamed the file, we might want to rename the file internals too.
Though we don't bother with changing platform driver name and platform module alias. The stuff is legacy and hopefully we'll remove it soon.
--- drivers/spi/Kconfig | 2 +- drivers/spi/Makefile | 2 +- drivers/spi/spi_mpc8xxx.c | 396 ++++++++++++++++++++++---------------------- 3 files changed, 200 insertions(+), 200 deletions(-)
drivers/spi/Kconfig +1 -1
@@ -139,7 +139,7 @@ config SPI_MPC52xx_PSC This enables using the Freescale MPC52xx Programmable Serial Controller in master SPI mode. -config SPI_MPC83xx +config SPI_MPC8xxx tristate "Freescale MPC8xxx SPI controller" depends on FSL_SOC help
drivers/spi/Makefile +1 -1
@@ -24,7 +24,7 @@ obj-$(CONFIG_SPI_OMAP_UWIRE) += omap_uwire.o obj-$(CONFIG_SPI_OMAP24XX) += omap2_mcspi.o obj-$(CONFIG_SPI_ORION) += orion_spi.o obj-$(CONFIG_SPI_MPC52xx_PSC) += mpc52xx_psc_spi.o -obj-$(CONFIG_SPI_MPC83xx) += spi_mpc8xxx.o +obj-$(CONFIG_SPI_MPC8xxx) += spi_mpc8xxx.o obj-$(CONFIG_SPI_S3C24XX_GPIO) += spi_s3c24xx_gpio.o obj-$(CONFIG_SPI_S3C24XX) += spi_s3c24xx.o obj-$(CONFIG_SPI_TXX9) += spi_txx9.o
drivers/spi/spi_mpc8xxx.c +198 -198
863 lines not on this page · raw message
Signature · 8 lines
1.6.2.2 ------------------------------------------------------------------------------ Register Now & Save for Velocity, the Web Performance & Operations Conference from O'Reilly Media. Velocity features a full day of expert-led, hands-on workshops and two days of sessions from industry leaders in dedicated Performance & Operations tracks. Use code vel09scf and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf
Re: [spi-devel-general] [PATCH 9/9] spi_mpc8xxx: s/83xx/8xxx/g
Quoted 7 lines · Anton Vorontsov
Since we renamed the file, we might want to rename the file internals too.
Though we don't bother with changing platform driver name and platform module alias. The stuff is legacy and hopefully we'll remove it soon.
I'd say no personally. Its a lot of churn for very little gain. The filename change alone should be sufficient to clue people into what the driver is for.
g.
Quoted 948 lines
Suggested-by Kumar Gala <[email protected]>Signed-off-by Anton Vorontsov <[email protected]>---
drivers/spi/Kconfig | 2 +-
drivers/spi/Makefile | 2 +-
drivers/spi/spi_mpc8xxx.c | 396 ++++++++++++++++++++++----------------------3 files changed, 200 insertions(+), 200 deletions(-)drivers/spi/Kconfig +0
-0@@ -139,7 +139,7 @@ config SPI_MPC52xx_PSCThis enables using the Freescale MPC52xx Programmable Serial Controller in master SPI mode.
drivers/spi/Kconfig +1
-1-config SPI_MPC83xx +config SPI_MPC8xxxtristate "Freescale MPC8xxx SPI controller" depends on
FSL_SOC
helpdrivers/spi/Makefile +0
-0@@ -24,7 +24,7 @@ obj-$(CONFIG_SPI_OMAP_UWIRE) += omap_uwire.oobj-$(CONFIG_SPI_OMAP24XX) += omap2_mcspi.o obj-$(CONFIG_SPI_ORION) += orion_spi.o obj-$(CONFIG_SPI_MPC52xx_PSC) += mpc52xx_psc_spi.o
drivers/spi/Makefile +1
-1-obj-$(CONFIG_SPI_MPC83xx) += spi_mpc8xxx.o +obj-$(CONFIG_SPI_MPC8xxx) += spi_mpc8xxx.oobj-$(CONFIG_SPI_S3C24XX_GPIO) += spi_s3c24xx_gpio.o obj-$(CONFIG_SPI_S3C24XX) += spi_s3c24xx.o obj-$(CONFIG_SPI_TXX9) += spi_txx9.o
drivers/spi/spi_mpc8xxx.c +9
-9@@ -1,5 +1,5 @@ /* -* MPC83xx SPI controller driver. +* MPC8xxx SPI controller driver. * * Maintainer: Kumar Gala * @@ -37,7 +37,7 @@ #include <asm/irq.h> /* SPI Controller registers */ -struct mpc83xx_spi_reg { +struct mpc8xxx_spi_reg { u8 res1[0x20]; __be32 mode; __be32 event;@@ -76,16 +76,16 @@ struct mpc83xx_spi_reg { #define SPIM_NF 0x00000100 /* Not full */ /* SPI Controller driver's private data. */ -struct mpc83xx_spi { - struct mpc83xx_spi_reg __iomem *base; +struct mpc8xxx_spi { + struct mpc8xxx_spi_reg __iomem *base; /* rx & tx bufs from the spi_transfer */ const void *tx; void *rx; /* functions to deal with different sized buffers */ - void (*get_rx) (u32 rx_data, struct mpc83xx_spi *); - u32(*get_tx) (struct mpc83xx_spi *); + void (*get_rx) (u32 rx_data, struct mpc8xxx_spi *); + u32(*get_tx) (struct mpc8xxx_spi *); unsigned int count; unsigned int irq;@@ -107,44 +107,44 @@ struct mpc83xx_spi { struct completion done; }; -struct spi_mpc83xx_cs { +struct spi_mpc8xxx_cs { /* functions to deal with different sized buffers */ - void (*get_rx) (u32 rx_data, struct mpc83xx_spi *); - u32 (*get_tx) (struct mpc83xx_spi *); + void (*get_rx) (u32 rx_data, struct mpc8xxx_spi *); + u32 (*get_tx) (struct mpc8xxx_spi *);u32
rx_shift; /* RX data reg shift when in qe mode */ u32tx_shift; /* TX data reg shift when in qe mode */ u32hw_mode; /* Holds HW mode register settings */ };drivers/spi/spi_mpc8xxx.c +1
-1-static inline void mpc83xx_spi_write_reg (__be32 __iomem *reg,u32 val) +static inline void mpc8xxx_spi_write_reg (__be32 __iomem *reg,u32 val){
out_be32(reg, val);
}drivers/spi/spi_mpc8xxx.c +1
-1-static inline u32 mpc83xx_spi_read_reg (__be32 __iomem *reg) +static inline u32 mpc8xxx_spi_read_reg (__be32 __iomem *reg){
returnin_be32(reg);
}#define
MPC83XX_SPI_RX_BUF(type)\
static \drivers/spi/spi_mpc8xxx.c +1
-1-void mpc83xx_spi_rx_buf_##type(u32 data, struct mpc83xx_spi *mpc83xx_spi) \ +void mpc8xxx_spi_rx_buf_##type(u32 data, struct mpc8xxx_spi *mpc8xxx_spi) \{ \
- type *rx =mpc83xx_spi->rx; \
- *rx++ = (type)(data >>mpc83xx_spi->rx_shift); \
-mpc83xx_spi->rx= rx; \
+ type *rx =mpc8xxx_spi->rx; \
+ *rx++ = (type)(data >>mpc8xxx_spi->rx_shift); \
+mpc8xxx_spi->rx= rx; \
}#define
MPC83XX_SPI_TX_BUF(type)\
static \drivers/spi/spi_mpc8xxx.c +1
-1-u32 mpc83xx_spi_tx_buf_##type(struct mpc83xx_spi *mpc83xx_spi) \ +u32 mpc8xxx_spi_tx_buf_##type(struct mpc8xxx_spi *mpc8xxx_spi) \{ \
u32 data; \
- const type *tx =mpc83xx_spi->tx; \
+ const type *tx =mpc8xxx_spi->tx; \
if (!tx) \
return 0; \
- data = *tx++ <<mpc83xx_spi->tx_shift; \
-mpc83xx_spi->tx= tx; \
+ data = *tx++ <<mpc8xxx_spi->tx_shift; \
+mpc8xxx_spi->tx= tx; \
return data; \
}drivers/spi/spi_mpc8xxx.c +11
-11@@ -155,12 +155,12 @@ MPC83XX_SPI_TX_BUF(u8) MPC83XX_SPI_TX_BUF(u16) MPC83XX_SPI_TX_BUF(u32) -static void mpc83xx_spi_chipselect(struct spi_device *spi, int value) +static void mpc8xxx_spi_chipselect(struct spi_device *spi, int value) { - struct mpc83xx_spi *mpc83xx_spi = spi_master_get_devdata(spi->master); + struct mpc8xxx_spi *mpc8xxx_spi = spi_master_get_devdata(spi->master); struct fsl_spi_platform_data *pdata = spi->dev.parent->platform_data; bool pol = spi->mode & SPI_CS_HIGH; - struct spi_mpc83xx_cs *cs = spi->controller_state; + struct spi_mpc8xxx_cs *cs = spi->controller_state; if (value == BITBANG_CS_INACTIVE) { if (pdata->cs_control)@@ -168,16 +168,16 @@ static void mpc83xx_spi_chipselect(struct spi_device *spi, int value) } if (value == BITBANG_CS_ACTIVE) { - u32 regval = mpc83xx_spi_read_reg(&mpc83xx_spi->base->mode); + u32 regval = mpc8xxx_spi_read_reg(&mpc8xxx_spi->base->mode); - mpc83xx_spi->rx_shift = cs->rx_shift; - mpc83xx_spi->tx_shift = cs->tx_shift; - mpc83xx_spi->get_rx = cs->get_rx; - mpc83xx_spi->get_tx = cs->get_tx; + mpc8xxx_spi->rx_shift = cs->rx_shift; + mpc8xxx_spi->tx_shift = cs->tx_shift; + mpc8xxx_spi->get_rx = cs->get_rx; + mpc8xxx_spi->get_tx = cs->get_tx; if (cs->hw_mode != regval) { unsigned long flags; - __be32 __iomem *mode = &mpc83xx_spi->base->mode; + __be32 __iomem *mode = &mpc8xxx_spi->base->mode; regval = cs->hw_mode; /* Turn off IRQs locally to minimize time that@@ -185,8 +185,8 @@ static void mpc83xx_spi_chipselect(struct spi_device *spi, int value)*/ local_irq_save(flags); /* Turn off SPI unit prior changing mode */ - mpc83xx_spi_write_reg(mode, regval & ~SPMODE_ENABLE); - mpc83xx_spi_write_reg(mode, regval); + mpc8xxx_spi_write_reg(mode, regval & ~SPMODE_ENABLE); + mpc8xxx_spi_write_reg(mode, regval); local_irq_restore(flags); } if (pdata->cs_control)@@ -195,15 +195,15 @@ static void mpc83xx_spi_chipselect(struct spi_device *spi, int value) }static
drivers/spi/spi_mpc8xxx.c +1
-1-int mpc83xx_spi_setup_transfer (struct spi_device *spi,struct spi_transfer *t) +int mpc8xxx_spi_setup_transfer (struct spi_device *spi,struct spi_transfer *t){
- structmpc83xx_spi*mpc83xx_spi;
+ structmpc8xxx_spi*mpc8xxx_spi;
u32 regval;
u8bits_per_word, pm;
u32 hz;
- structspi_mpc83xx_cs*cs =spi->controller_state;
+ structspi_mpc8xxx_cs*cs =spi->controller_state;-
mpc83xx_spi=spi_master_get_devdata(spi->master);
+mpc8xxx_spi=spi_master_get_devdata(spi->master);if (t) {
bits_per_word =t->bits_per_word;drivers/spi/spi_mpc8xxx.c +15
-15@@ -228,26 +228,26 @@ int mpc83xx_spi_setup_transfer(struct spi_device *spi, struct spi_transfer *t) cs->rx_shift = 0; cs->tx_shift = 0; if (bits_per_word <= 8) { - cs->get_rx = mpc83xx_spi_rx_buf_u8; - cs->get_tx = mpc83xx_spi_tx_buf_u8; - if (mpc83xx_spi->qe_mode) { + cs->get_rx = mpc8xxx_spi_rx_buf_u8; + cs->get_tx = mpc8xxx_spi_tx_buf_u8; + if (mpc8xxx_spi->qe_mode) { cs->rx_shift = 16; cs->tx_shift = 24; } } else if (bits_per_word <= 16) { - cs->get_rx = mpc83xx_spi_rx_buf_u16; - cs->get_tx = mpc83xx_spi_tx_buf_u16; - if (mpc83xx_spi->qe_mode) { + cs->get_rx = mpc8xxx_spi_rx_buf_u16; + cs->get_tx = mpc8xxx_spi_tx_buf_u16; + if (mpc8xxx_spi->qe_mode) { cs->rx_shift = 16; cs->tx_shift = 16; } } else if (bits_per_word <= 32) { - cs->get_rx = mpc83xx_spi_rx_buf_u32; - cs->get_tx = mpc83xx_spi_tx_buf_u32; + cs->get_rx = mpc8xxx_spi_rx_buf_u32; + cs->get_tx = mpc8xxx_spi_tx_buf_u32; } else return -EINVAL; - if (mpc83xx_spi->qe_mode && spi->mode & SPI_LSB_FIRST) { + if (mpc8xxx_spi->qe_mode && spi->mode & SPI_LSB_FIRST) { cs->tx_shift = 0; if (bits_per_word <= 8) cs->rx_shift = 8;@@ -255,10 +255,10 @@ int mpc83xx_spi_setup_transfer(struct spi_device *spi, struct spi_transfer *t) cs->rx_shift = 0; } - mpc83xx_spi->rx_shift = cs->rx_shift; - mpc83xx_spi->tx_shift = cs->tx_shift; - mpc83xx_spi->get_rx = cs->get_rx; - mpc83xx_spi->get_tx = cs->get_tx; + mpc8xxx_spi->rx_shift = cs->rx_shift; + mpc8xxx_spi->tx_shift = cs->tx_shift; + mpc8xxx_spi->get_rx = cs->get_rx; + mpc8xxx_spi->get_tx = cs->get_tx; if (bits_per_word == 32) bits_per_word = 0;@@ -271,25 +271,25 @@ int mpc83xx_spi_setup_transfer(struct spi_device *spi, struct spi_transfer *t) cs->hw_mode |= SPMODE_LEN(bits_per_word); - if ((mpc83xx_spi->spibrg / hz) > 64) { + if ((mpc8xxx_spi->spibrg / hz) > 64) { cs->hw_mode |= SPMODE_DIV16; - pm = mpc83xx_spi->spibrg / (hz * 64); + pm = mpc8xxx_spi->spibrg / (hz * 64);WARN_ONCE(pm > 16, "%s: Requested speed is too low: %d Hz. " "Will use %d Hz instead.\n",
dev_name(&spi->dev),
- hz,mpc83xx_spi->spibrg/ 1024);
+ hz,mpc8xxx_spi->spibrg/ 1024);
if (pm > 16)
pm = 16;
} else
- pm =mpc83xx_spi->spibrg/ (hz * 4);
+ pm =mpc8xxx_spi->spibrg/ (hz * 4);
if (pm)
pm--;cs->hw_mode |=
SPMODE_PM(pm);
- regval = mpc83xx_spi_read_reg(&mpc83xx_spi->base->mode);
+ regval = mpc8xxx_spi_read_reg(&mpc8xxx_spi->base->mode); if (cs->hw_mode!= regval) {
unsigned long flags;
-__be32__iomem*mode =&mpc83xx_spi->base->mode;
+__be32__iomem*mode =&mpc8xxx_spi->base->mode;regval =
cs->hw_mode;
/* Turn off IRQs locally to minimize timedrivers/spi/spi_mpc8xxx.c +35
-35@@ -297,22 +297,22 @@ int mpc83xx_spi_setup_transfer(struct spi_device *spi, struct spi_transfer *t)*/ local_irq_save(flags); /* Turn off SPI unit prior changing mode */ - mpc83xx_spi_write_reg(mode, regval & ~SPMODE_ENABLE); - mpc83xx_spi_write_reg(mode, regval); + mpc8xxx_spi_write_reg(mode, regval & ~SPMODE_ENABLE); + mpc8xxx_spi_write_reg(mode, regval); local_irq_restore(flags); } return 0; } -static int mpc83xx_spi_bufs (struct spi_device *spi,struct spi_transfer *t) +static int mpc8xxx_spi_bufs (struct spi_device *spi,struct spi_transfer *t) { - struct mpc83xx_spi *mpc83xx_spi; + struct mpc8xxx_spi *mpc8xxx_spi; u32 word, len, bits_per_word; - mpc83xx_spi = spi_master_get_devdata(spi->master); + mpc8xxx_spi = spi_master_get_devdata(spi->master); - mpc83xx_spi->tx = t->tx_buf; - mpc83xx_spi->rx = t->rx_buf; + mpc8xxx_spi->tx = t->tx_buf; + mpc8xxx_spi->rx = t->rx_buf; bits_per_word = spi->bits_per_word; if (t->bits_per_word) bits_per_word = t->bits_per_word;@@ -329,26 +329,26 @@ static int mpc83xx_spi_bufs(struct spi_device *spi, struct spi_transfer *t) return -EINVAL; len /= 2; } - mpc83xx_spi->count = len; + mpc8xxx_spi->count = len; - INIT_COMPLETION(mpc83xx_spi->done); + INIT_COMPLETION(mpc8xxx_spi->done); /* enable rx ints */ - mpc83xx_spi_write_reg(&mpc83xx_spi->base->mask, SPIM_NE); + mpc8xxx_spi_write_reg(&mpc8xxx_spi->base->mask, SPIM_NE); /* transmit word */ - word = mpc83xx_spi->get_tx(mpc83xx_spi); - mpc83xx_spi_write_reg(&mpc83xx_spi->base->transmit, word); + word = mpc8xxx_spi->get_tx(mpc8xxx_spi); + mpc8xxx_spi_write_reg(&mpc8xxx_spi->base->transmit, word); - wait_for_completion(&mpc83xx_spi->done); + wait_for_completion(&mpc8xxx_spi->done); /* disable rx ints */ - mpc83xx_spi_write_reg(&mpc83xx_spi->base->mask, 0); + mpc8xxx_spi_write_reg(&mpc8xxx_spi->base->mask, 0); - return mpc83xx_spi->count; + return mpc8xxx_spi->count; } -static void mpc83xx_spi_do_one_msg (struct spi_message *m) +static void mpc8xxx_spi_do_one_msg (struct spi_message *m) { struct spi_device *spi = m->spi; struct spi_transfer *t;@@ -364,18 +364,18 @@ static void mpc83xx_spi_do_one_msg(struct spi_message *m) status = -EINVAL; if (cs_change) - status = mpc83xx_spi_setup_transfer(spi, t); + status = mpc8xxx_spi_setup_transfer(spi, t); if (status < 0) break; } if (cs_change) { - mpc83xx_spi_chipselect(spi, BITBANG_CS_ACTIVE); + mpc8xxx_spi_chipselect(spi, BITBANG_CS_ACTIVE); ndelay(nsecs); } cs_change = t->cs_change; if (t->len) - status = mpc83xx_spi_bufs(spi, t); + status = mpc8xxx_spi_bufs(spi, t); if (status) { status = -EMSGSIZE; break;@@ -387,7 +387,7 @@ static void mpc83xx_spi_do_one_msg(struct spi_message *m) if (cs_change) { ndelay(nsecs); - mpc83xx_spi_chipselect(spi, BITBANG_CS_INACTIVE); + mpc8xxx_spi_chipselect(spi, BITBANG_CS_INACTIVE); ndelay(nsecs); } }@@ -397,42 +397,42 @@ static void mpc83xx_spi_do_one_msg(struct spi_message *m) if (status || !cs_change) { ndelay(nsecs); - mpc83xx_spi_chipselect(spi, BITBANG_CS_INACTIVE); + mpc8xxx_spi_chipselect(spi, BITBANG_CS_INACTIVE); } - mpc83xx_spi_setup_transfer(spi, NULL); + mpc8xxx_spi_setup_transfer(spi, NULL); } -static void mpc83xx_spi_work (struct work_struct *work) +static void mpc8xxx_spi_work (struct work_struct *work) { - struct mpc83xx_spi *mpc83xx_spi = container_of(work, struct mpc83xx_spi, + struct mpc8xxx_spi *mpc8xxx_spi = container_of(work, struct mpc8xxx_spi, work); - spin_lock_irq(&mpc83xx_spi->lock); - while (!list_empty(&mpc83xx_spi->queue)) { - struct spi_message *m = container_of(mpc83xx_spi->queue.next, + spin_lock_irq(&mpc8xxx_spi->lock); + while (!list_empty(&mpc8xxx_spi->queue)) { + struct spi_message *m = container_of(mpc8xxx_spi->queue.next, struct spi_message, queue); list_del_init(&m->queue); - spin_unlock_irq(&mpc83xx_spi->lock); + spin_unlock_irq(&mpc8xxx_spi->lock); - mpc83xx_spi_do_one_msg(m); + mpc8xxx_spi_do_one_msg(m); - spin_lock_irq(&mpc83xx_spi->lock); + spin_lock_irq(&mpc8xxx_spi->lock); } - spin_unlock_irq(&mpc83xx_spi->lock); + spin_unlock_irq(&mpc8xxx_spi->lock); } /* the spi->mode bits understood by this driver: */ #define MODEBITS (SPI_CPOL | SPI_CPHA | SPI_CS_HIGH \ | SPI_LSB_FIRST | SPI_LOOP) -static int mpc83xx_spi_setup (struct spi_device *spi) +static int mpc8xxx_spi_setup (struct spi_device *spi) { - struct mpc83xx_spi *mpc83xx_spi; + struct mpc8xxx_spi *mpc8xxx_spi; int retval; u32 hw_mode; - struct spi_mpc83xx_cs *cs = spi->controller_state; + struct spi_mpc8xxx_cs *cs = spi->controller_state; if (spi->mode & ~MODEBITS) { dev_dbg(&spi->dev, "setup: unsupported mode bits %x\n",@@ -449,13 +449,13 @@ static int mpc83xx_spi_setup(struct spi_device *spi) return -ENOMEM; spi->controller_state = cs; } - mpc83xx_spi = spi_master_get_devdata(spi->master); + mpc8xxx_spi = spi_master_get_devdata(spi->master); if (!spi->bits_per_word) spi->bits_per_word = 8;hw_mode =
cs->hw_mode; /* Save orginal settings */
-cs->hw_mode=mpc83xx_spi_read_reg(&mpc83xx_spi->base->mode);
+cs->hw_mode=mpc8xxx_spi_read_reg(&mpc8xxx_spi->base->mode); /* mask out bits we are going to set */
cs->hw_mode &= ~(SPMODE_CP_BEGIN_EDGECLK |SPMODE_CI_INACTIVEHIGH|SPMODE_REV|SPMODE_LOOP);drivers/spi/spi_mpc8xxx.c +1
-1@@ -469,7 +469,7 @@ static int mpc83xx_spi_setup(struct spi_device *spi) if (spi->mode & SPI_LOOP) cs->hw_mode |= SPMODE_LOOP; - retval = mpc83xx_spi_setup_transfer(spi, NULL); + retval = mpc8xxx_spi_setup_transfer(spi, NULL); if (retval < 0) {cs->hw_mode =
hw_mode; /* Restore settings */ return retval;drivers/spi/spi_mpc8xxx.c +6
-6@@ -481,21 +481,21 @@ static int mpc83xx_spi_setup(struct spi_device *spi) return 0; } -static irqreturn_t mpc83xx_spi_irq (s32 irq,void *context_data) +static irqreturn_t mpc8xxx_spi_irq (s32 irq,void *context_data) { - struct mpc83xx_spi *mpc83xx_spi = context_data; + struct mpc8xxx_spi *mpc8xxx_spi = context_data; u32 event; irqreturn_t ret = IRQ_NONE; /* Get interrupt events(tx/rx) */ - event = mpc83xx_spi_read_reg(&mpc83xx_spi->base->event); + event = mpc8xxx_spi_read_reg(&mpc8xxx_spi->base->event); /* We need handle RX first */ if (event & SPIE_NE) { - u32 rx_data = mpc83xx_spi_read_reg(&mpc83xx_spi->base->receive); + u32 rx_data = mpc8xxx_spi_read_reg(&mpc8xxx_spi->base->receive); - if (mpc83xx_spi->rx) - mpc83xx_spi->get_rx(rx_data, mpc83xx_spi); + if (mpc8xxx_spi->rx) + mpc8xxx_spi->get_rx(rx_data, mpc8xxx_spi); ret = IRQ_HANDLED; }@@ -503,56 +503,56 @@ static irqreturn_t mpc83xx_spi_irq(s32 irq, void *context_data) if ((event & SPIE_NF) == 0) /* spin until TX is done */while (((event =
- mpc83xx_spi_read_reg(&mpc83xx_spi->base->event)) &
+ mpc8xxx_spi_read_reg(&mpc8xxx_spi->base->event)) &SPIE_NF) == 0)cpu_relax();-
mpc83xx_spi->count-= 1;
- if (mpc83xx_spi->count) {
- u32 word =mpc83xx_spi->get_tx(mpc83xx_spi);
-mpc83xx_spi_write_reg(&mpc83xx_spi->base->transmit, word);
+mpc8xxx_spi->count-= 1;
+ if (mpc8xxx_spi->count) {
+ u32 word =mpc8xxx_spi->get_tx(mpc8xxx_spi);
+mpc8xxx_spi_write_reg(&mpc8xxx_spi->base->transmit, word); } else {
-complete(&mpc83xx_spi->done);
+complete(&mpc8xxx_spi->done);
}/* Clear the events */
-mpc83xx_spi_write_reg(&mpc83xx_spi->base->event, event);
+mpc8xxx_spi_write_reg(&mpc8xxx_spi->base->event, event);return ret;
}drivers/spi/spi_mpc8xxx.c +1
-1-static int mpc83xx_spi_transfer(struct spi_device *spi, +static int mpc8xxx_spi_transfer(struct spi_device *spi,struct
spi_message*m)
{
- structmpc83xx_spi*mpc83xx_spi=spi_master_get_devdata(spi->master);
+ structmpc8xxx_spi*mpc8xxx_spi=spi_master_get_devdata(spi->master); unsigned long flags;m->actual_length = 0;
m->status =-EINPROGRESS;-
spin_lock_irqsave(&mpc83xx_spi->lock, flags);
-list_add_tail(&m->queue, &mpc83xx_spi->queue);
-queue_work(mpc83xx_spi->workqueue, &mpc83xx_spi->work);
-spin_unlock_irqrestore(&mpc83xx_spi->lock, flags);
+spin_lock_irqsave(&mpc8xxx_spi->lock, flags);
+list_add_tail(&m->queue, &mpc8xxx_spi->queue);
+queue_work(mpc8xxx_spi->workqueue, &mpc8xxx_spi->work);
+spin_unlock_irqrestore(&mpc8xxx_spi->lock, flags);return 0;
}drivers/spi/spi_mpc8xxx.c +1
-1-static void mpc83xx_spi_cleanup (struct spi_device *spi) +static void mpc8xxx_spi_cleanup (struct spi_device *spi){
kfree(spi->controller_state);
}static struct
spi_master*__devinitdrivers/spi/spi_mpc8xxx.c +1
-1-mpc83xx_spi_probe(struct device *dev, struct resource *mem, unsigned int irq) +mpc8xxx_spi_probe(struct device *dev, struct resource *mem, unsigned int irq){
structfsl_spi_platform_data*pdata =dev->platform_data; structspi_master*master;
- structmpc83xx_spi*mpc83xx_spi;
+ structmpc8xxx_spi*mpc8xxx_spi;
u32 regval;
int ret = 0;- master =
spi_alloc_master(dev, sizeof(struct mpc83xx_spi));
+ master =spi_alloc_master(dev, sizeof(struct mpc8xxx_spi)); if (master == NULL) {
ret =-ENOMEM;
goto err;drivers/spi/spi_mpc8xxx.c +32
-32@@ -560,36 +560,36 @@ mpc83xx_spi_probe(struct device *dev, struct resource *mem, unsigned int irq) dev_set_drvdata(dev, master); - master->setup = mpc83xx_spi_setup; - master->transfer = mpc83xx_spi_transfer; - master->cleanup = mpc83xx_spi_cleanup; - - mpc83xx_spi = spi_master_get_devdata(master); - 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; - mpc83xx_spi->spibrg = pdata->sysclk; - - mpc83xx_spi->rx_shift = 0; - mpc83xx_spi->tx_shift = 0; - if (mpc83xx_spi->qe_mode) { - mpc83xx_spi->rx_shift = 16; - mpc83xx_spi->tx_shift = 24; + master->setup = mpc8xxx_spi_setup; + master->transfer = mpc8xxx_spi_transfer; + master->cleanup = mpc8xxx_spi_cleanup; + + mpc8xxx_spi = spi_master_get_devdata(master); + mpc8xxx_spi->qe_mode = pdata->qe_mode; + mpc8xxx_spi->get_rx = mpc8xxx_spi_rx_buf_u8; + mpc8xxx_spi->get_tx = mpc8xxx_spi_tx_buf_u8; + mpc8xxx_spi->spibrg = pdata->sysclk; + + mpc8xxx_spi->rx_shift = 0; + mpc8xxx_spi->tx_shift = 0; + if (mpc8xxx_spi->qe_mode) { + mpc8xxx_spi->rx_shift = 16; + mpc8xxx_spi->tx_shift = 24; } - init_completion(&mpc83xx_spi->done); + init_completion(&mpc8xxx_spi->done); - mpc83xx_spi->base = ioremap(mem->start, mem->end - mem->start + 1); - if (mpc83xx_spi->base == NULL) { + mpc8xxx_spi->base = ioremap(mem->start, mem->end - mem->start + 1); + if (mpc8xxx_spi->base == NULL) { ret = -ENOMEM; goto put_master; } - mpc83xx_spi->irq = irq; + mpc8xxx_spi->irq = irq; /* Register for SPI Interrupt */ - ret = request_irq(mpc83xx_spi->irq, mpc83xx_spi_irq, - 0, "mpc83xx_spi", mpc83xx_spi); + ret = request_irq(mpc8xxx_spi->irq, mpc8xxx_spi_irq, + 0, "mpc8xxx_spi", mpc8xxx_spi); if (ret != 0) goto unmap_io;@@ -598,25 +598,25 @@ mpc83xx_spi_probe(struct device *dev, struct resource *mem, unsigned int irq) master->num_chipselect = pdata->max_chipselect; /* SPI controller initializations */ - mpc83xx_spi_write_reg(&mpc83xx_spi->base->mode, 0); - mpc83xx_spi_write_reg(&mpc83xx_spi->base->mask, 0); - mpc83xx_spi_write_reg(&mpc83xx_spi->base->command, 0); - mpc83xx_spi_write_reg(&mpc83xx_spi->base->event, 0xffffffff); + mpc8xxx_spi_write_reg(&mpc8xxx_spi->base->mode, 0); + mpc8xxx_spi_write_reg(&mpc8xxx_spi->base->mask, 0); + mpc8xxx_spi_write_reg(&mpc8xxx_spi->base->command, 0); + mpc8xxx_spi_write_reg(&mpc8xxx_spi->base->event, 0xffffffff); /* Enable SPI interface */ regval = pdata->initial_spmode | SPMODE_INIT_VAL | SPMODE_ENABLE; if (pdata->qe_mode) regval |= SPMODE_OP; - mpc83xx_spi_write_reg(&mpc83xx_spi->base->mode, regval); - spin_lock_init(&mpc83xx_spi->lock); - init_completion(&mpc83xx_spi->done); - INIT_WORK(&mpc83xx_spi->work, mpc83xx_spi_work); - INIT_LIST_HEAD(&mpc83xx_spi->queue); + mpc8xxx_spi_write_reg(&mpc8xxx_spi->base->mode, regval); + spin_lock_init(&mpc8xxx_spi->lock); + init_completion(&mpc8xxx_spi->done); + INIT_WORK(&mpc8xxx_spi->work, mpc8xxx_spi_work); + INIT_LIST_HEAD(&mpc8xxx_spi->queue); - mpc83xx_spi->workqueue = create_singlethread_workqueue( + mpc8xxx_spi->workqueue = create_singlethread_workqueue( dev_name(master->dev.parent)); - if (mpc83xx_spi->workqueue == NULL) { + if (mpc8xxx_spi->workqueue == NULL) { ret = -EBUSY; goto free_irq; }@@ -626,57 +626,57 @@ mpc83xx_spi_probe(struct device *dev, struct resource *mem, unsigned int irq) goto unreg_master;printk(KERN_INFO
- "%s: MPC83xx SPI Controller driver at 0x%p (irq = %d)\n",
- dev_name(dev),mpc83xx_spi->base,mpc83xx_spi->irq);
+ "%s: MPC8xxx SPI Controller driver at 0x%p (irq = %d)\n",
+ dev_name(dev),mpc8xxx_spi->base,mpc8xxx_spi->irq);return master;
unreg_master:
-destroy_workqueue(mpc83xx_spi->workqueue);
+destroy_workqueue(mpc8xxx_spi->workqueue);free_irq:
-free_irq(mpc83xx_spi->irq, mpc83xx_spi);
+free_irq(mpc8xxx_spi->irq, mpc8xxx_spi);unmap_io:
-iounmap(mpc83xx_spi->base);
+iounmap(mpc8xxx_spi->base);put_master:
spi_master_put(master);
err:
returnERR_PTR(ret);
}drivers/spi/spi_mpc8xxx.c +1
-1-static int __devexit mpc83xx_spi_remove(struct device *dev) +static int __devexit mpc8xxx_spi_remove(struct device *dev){
- structmpc83xx_spi*mpc83xx_spi;
+ structmpc8xxx_spi*mpc8xxx_spi;
structspi_master*master;master =
dev_get_drvdata(dev);
-mpc83xx_spi=spi_master_get_devdata(master);
+mpc8xxx_spi=spi_master_get_devdata(master);-
flush_workqueue(mpc83xx_spi->workqueue);
-destroy_workqueue(mpc83xx_spi->workqueue);
+flush_workqueue(mpc8xxx_spi->workqueue);
+destroy_workqueue(mpc8xxx_spi->workqueue);spi_unregister_master(master);-
free_irq(mpc83xx_spi->irq, mpc83xx_spi);
-iounmap(mpc83xx_spi->base);
+free_irq(mpc8xxx_spi->irq, mpc8xxx_spi);
+iounmap(mpc8xxx_spi->base);return 0;
}drivers/spi/spi_mpc8xxx.c +1
-1-struct mpc83xx_spi_probe_info { +struct mpc8xxx_spi_probe_info {struct
fsl_spi_platform_datapdata;
int *gpios;
bool*alow_flags;
};drivers/spi/spi_mpc8xxx.c +1
-1-static struct mpc83xx_spi_probe_info * +static struct mpc8xxx_spi_probe_info *to_of_pinfo(struct
fsl_spi_platform_data*pdata)
{
- returncontainer_of(pdata, struct mpc83xx_spi_probe_info, pdata);
+ returncontainer_of(pdata, struct mpc8xxx_spi_probe_info, pdata); }drivers/spi/spi_mpc8xxx.c +1
-1-static void mpc83xx_spi_cs_control (struct spi_device *spi,bool on) +static void mpc8xxx_spi_cs_control (struct spi_device *spi,bool on){
struct device *dev =spi->dev.parent;
- structmpc83xx_spi_probe_info*pinfo =to_of_pinfo(dev->platform_data);
+ structmpc8xxx_spi_probe_info*pinfo =to_of_pinfo(dev->platform_data); u16 cs =spi->chip_select;
int gpio = pinfo->gpios[cs];
bool alow = pinfo->alow_flags[cs];drivers/spi/spi_mpc8xxx.c +9
-9@@ -684,11 +684,11 @@ static void mpc83xx_spi_cs_control(struct spi_device *spi, bool on) gpio_set_value(gpio, on ^ alow); } -static int of_mpc83xx_spi_get_chipselects (struct device *dev) +static int of_mpc8xxx_spi_get_chipselects (struct device *dev) { struct device_node *np = dev_archdata_get_node(&dev->archdata); struct fsl_spi_platform_data *pdata = dev->platform_data; - struct mpc83xx_spi_probe_info *pinfo = to_of_pinfo(pdata); + struct mpc8xxx_spi_probe_info *pinfo = to_of_pinfo(pdata); unsigned int ngpios; int i = 0; int ret;@@ -744,7 +744,7 @@ static int of_mpc83xx_spi_get_chipselects(struct device *dev) } pdata->max_chipselect = ngpios; - pdata->cs_control = mpc83xx_spi_cs_control; + pdata->cs_control = mpc8xxx_spi_cs_control; return 0;@@ -763,10 +763,10 @@ err_alloc_flags: return ret; } -static int of_mpc83xx_spi_free_chipselects (struct device *dev) +static int of_mpc8xxx_spi_free_chipselects (struct device *dev) { struct fsl_spi_platform_data *pdata = dev->platform_data; - struct mpc83xx_spi_probe_info *pinfo = to_of_pinfo(pdata); + struct mpc8xxx_spi_probe_info *pinfo = to_of_pinfo(pdata); int i; if (!pinfo->gpios)@@ -782,12 +782,12 @@ static int of_mpc83xx_spi_free_chipselects(struct device *dev) return 0; } -static int __devinit of_mpc83xx_spi_probe (struct of_device *ofdev, +static int __devinit of_mpc8xxx_spi_probe (struct of_device *ofdev, const struct of_device_id *ofid) { struct device *dev = &ofdev->dev; struct device_node *np = ofdev->node; - struct mpc83xx_spi_probe_info *pinfo; + struct mpc8xxx_spi_probe_info *pinfo; struct fsl_spi_platform_data *pdata; struct spi_master *master; struct resource mem;@@ -819,7 +819,7 @@ static int __devinit of_mpc83xx_spi_probe(struct of_device *ofdev, if (prop && !strcmp(prop, "cpu-qe")) pdata->qe_mode = 1; - ret = of_mpc83xx_spi_get_chipselects(dev); + ret = of_mpc8xxx_spi_get_chipselects(dev); if (ret) goto err;@@ -833,7 +833,7 @@ static int __devinit of_mpc83xx_spi_probe(struct of_device *ofdev, goto err; } - master = mpc83xx_spi_probe(dev, &mem, irq.start); + master = mpc8xxx_spi_probe(dev, &mem, irq.start); if (IS_ERR(master)) { ret = PTR_ERR(master); goto err;@@ -844,34 +844,34 @@ static int __devinit of_mpc83xx_spi_probe(struct of_device *ofdev, return 0;err:
-of_mpc83xx_spi_free_chipselects(dev);
+of_mpc8xxx_spi_free_chipselects(dev);
err_clk:
kfree(pinfo);
return ret;
}drivers/spi/spi_mpc8xxx.c +1
-1-static int __devexit of_mpc83xx_spi_remove(struct of_device *ofdev) +static int __devexit of_mpc8xxx_spi_remove(struct of_device *ofdev){
int ret;- ret =
mpc83xx_spi_remove(&ofdev->dev);
+ ret =mpc8xxx_spi_remove(&ofdev->dev); if (ret)
return ret;
-of_mpc83xx_spi_free_chipselects(&ofdev->dev);
+of_mpc8xxx_spi_free_chipselects(&ofdev->dev); return 0;
}drivers/spi/spi_mpc8xxx.c +1
-1-static const struct of_device_id of_mpc83xx_spi_match[] = { +static const struct of_device_id of_mpc8xxx_spi_match[] = {{ .compatible = "fsl,spi" },
{},
};drivers/spi/spi_mpc8xxx.c +6
-6-MODULE_DEVICE_TABLE (of, of_mpc83xx_spi_match); +MODULE_DEVICE_TABLE (of, of_mpc8xxx_spi_match); -static struct of_platform_driver of_mpc83xx_spi_driver = { - .name = "mpc83xx_spi", - .match_table = of_mpc83xx_spi_match, - .probe = of_mpc83xx_spi_probe, - .remove = __devexit_p(of_mpc83xx_spi_remove), +static struct of_platform_driver of_mpc8xxx_spi_driver = { + .name = "mpc8xxx_spi", + .match_table = of_mpc8xxx_spi_match, + .probe = of_mpc8xxx_spi_probe, + .remove = __devexit_p(of_mpc8xxx_spi_remove),};
#ifdef
CONFIG_MPC832x_RDBdrivers/spi/spi_mpc8xxx.c +16
-17@@ -882,7 +882,7 @@ static struct of_platform_driver of_mpc83xx_spi_driver = {* tree can work with OpenFirmware driver. But for now we support old trees * as well. */ -static int __devinit plat_mpc83xx_spi_probe (struct platform_device *pdev) +static int __devinit plat_mpc8xxx_spi_probe (struct platform_device *pdev) { struct resource *mem; unsigned int irq;@@ -899,21 +899,21 @@ static int __devinit plat_mpc83xx_spi_probe(struct platform_device *pdev) if (!irq) return -EINVAL; - master = mpc83xx_spi_probe(&pdev->dev, mem, irq); + master = mpc8xxx_spi_probe(&pdev->dev, mem, irq); if (IS_ERR(master)) return PTR_ERR(master); return 0; } -static int __devexit plat_mpc83xx_spi_remove(struct platform_device *pdev) +static int __devexit plat_mpc8xxx_spi_remove(struct platform_device *pdev) { - return mpc83xx_spi_remove(&pdev->dev); + return mpc8xxx_spi_remove(&pdev->dev); } MODULE_ALIAS("platform:mpc83xx_spi"); -static struct platform_driver mpc83xx_spi_driver = { - .probe = plat_mpc83xx_spi_probe, - .remove = __exit_p(plat_mpc83xx_spi_remove), +static struct platform_driver mpc8xxx_spi_driver = { + .probe = plat_mpc8xxx_spi_probe, + .remove = __exit_p(plat_mpc8xxx_spi_remove), .driver = { .name = "mpc83xx_spi", .owner = THIS_MODULE,@@ -924,35 +924,35 @@ static bool legacy_driver_failed; static void __init legacy_driver_register(void) { - legacy_driver_failed = platform_driver_register(&mpc83xx_spi_driver); + legacy_driver_failed = platform_driver_register(&mpc8xxx_spi_driver); } static void __exit legacy_driver_unregister(void) { if (legacy_driver_failed) return; - platform_driver_unregister(&mpc83xx_spi_driver); + platform_driver_unregister(&mpc8xxx_spi_driver); } #else static void __init legacy_driver_register(void) {} static void __exit legacy_driver_unregister(void) {} #endif /* CONFIG_MPC832x_RDB */ -static int __init mpc83xx_spi_init (void ) +static int __init mpc8xxx_spi_init (void ) { legacy_driver_register(); - return of_register_platform_driver(&of_mpc83xx_spi_driver); + return of_register_platform_driver(&of_mpc8xxx_spi_driver); } -static void __exit mpc83xx_spi_exit(void) +static void __exit mpc8xxx_spi_exit(void) { - of_unregister_platform_driver(&of_mpc83xx_spi_driver); + of_unregister_platform_driver(&of_mpc8xxx_spi_driver); legacy_driver_unregister(); } -module_init (mpc83xx_spi_init); -module_exit (mpc83xx_spi_exit); +module_init (mpc8xxx_spi_init); +module_exit (mpc8xxx_spi_exit); MODULE_AUTHOR("Kumar Gala"); -MODULE_DESCRIPTION ("Simple MPC83xx SPI Driver" ); +MODULE_DESCRIPTION ("Simple MPC8xxx SPI Driver" ); MODULE_LICENSE("GPL"); --1.6.2.2
------------------------------------------------------------------------------
Register Now & Save for Velocity, the Web Performance & Operations Conference from O'Reilly Media. Velocity features a full day of expert-led, hands-on workshops and two days of sessions from industry leaders in dedicated Performance & Operations tracks. Use code vel09scf and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf
_______________________________________________
spi-devel-general mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/spi-devel-general
Signature · 2 lines
Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd.
Re: [PATCH 9/9] spi_mpc8xxx: s/83xx/8xxx/g
In reply to Anton VorontsovQuoted 7 lines · On Fri, 1 May 2009 03:48:33 +0400 Anton Vorontsov…
Since we renamed the file, we might want to rename the file internals too.
Though we don't bother with changing platform driver name and platform module alias. The stuff is legacy and hopefully we'll remove it soon.
but but but
drivers/spi/spi_mpc8xxx.c static int __devinit of_mpc83xx_spi_probe(struct of_device *ofdev, · line 875
Quoted 12 lines
drivers/spi/spi_mpc8xxx.c +5
-5-static struct of_platform_driver of_mpc83xx_spi_driver = { - .name ="mpc83xx_spi" , - .match_table = of_mpc83xx_spi_match, - .probe = of_mpc83xx_spi_probe, - .remove =__devexit_p (of_mpc83xx_spi_remove), +static struct of_platform_driver of_mpc8xxx_spi_driver = { + .name ="mpc8xxx_spi" , + .match_table = of_mpc8xxx_spi_match, + .probe = of_mpc8xxx_spi_probe, + .remove =__devexit_p (of_mpc8xxx_spi_remove), };
It _did_ change the platform driver name, didn't it?
This patch series had quite a lot of conflicts with the already-pending
spi-move-common-spi_setup-functionality-into-core.patch spi-move-more-spi_setup-functionality-into-core.patch
which I beleive I successfully fixed up.
------------------------------------------------------------------------------
Register Now & Save for Velocity, the Web Performance & Operations Conference from O'Reilly Media. Velocity features a full day of expert-led, hands-on workshops and two days of sessions from industry leaders in dedicated Performance & Operations tracks. Use code vel09scf and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf
Re: [PATCH 9/9] spi_mpc8xxx: s/83xx/8xxx/g
Quoted 14 lines · Andrew Morton
Quoted 7 lines · On Fri, 1 May 2009 03:48:33 +0400 Anton Vorontsov <[email protected]>…
Since we renamed the file, we might want to rename the file internals too.
Though we don't bother with changing platform driver name and platform module alias. The stuff is legacy and hopefully we'll remove it soon.
but but but
Quoted 1 line
Quoted 13 lines
drivers/spi/spi_mpc8xxx.c static int __devinit of_mpc83xx_spi_probe(struct of_device *ofdev, · line 875
Quoted 11 lines
drivers/spi/spi_mpc8xxx.c +5
-5-static struct of_platform_driver of_mpc83xx_spi_driver = { - .name ="mpc83xx_spi" , - .match_table = of_mpc83xx_spi_match, - .probe = of_mpc83xx_spi_probe, - .remove =__devexit_p (of_mpc83xx_spi_remove), +static struct of_platform_driver of_mpc8xxx_spi_driver = { + .name ="mpc8xxx_spi" , + .match_table = of_mpc8xxx_spi_match, + .probe = of_mpc8xxx_spi_probe, + .remove =__devexit_p (of_mpc8xxx_spi_remove), };It _did_ change the platform driver name, didn't it?
This is an OF platform driver, here it is safe to change the name. But I didn't change the pure platform driver, here:
| -static struct platform_driver mpc83xx_spi_driver = {
| - .probe = plat_mpc83xx_spi_probe,
| - .remove = __exit_p(plat_mpc83xx_spi_remove),
| +static struct platform_driver mpc8xxx_spi_driver = {
| + .probe = plat_mpc8xxx_spi_probe,
| + .remove = __exit_p(plat_mpc8xxx_spi_remove),
| .driver = {
| .name = "mpc83xx_spi",------------------^
Quoted 6 lines
This patch series had quite a lot of conflicts with the already-pending
spi-move-common-spi_setup-functionality-into-core.patch spi-move-more-spi_setup-functionality-into-core.patch
which I beleive I successfully fixed up.
Thanks a lot, I'll test it soon.
Signature · 3 lines
Anton Vorontsov email: [email protected] irc://irc.freenode.net/bd2
Quoted 8 lines · On Fri, 1 May 2009 03:47:39 +0400 Anton Vorontsov <[email protected]>…
Here are few patches that are needed to support spi-mmc slot on MPC8610HPCD PowerPC boards:
[1/9]
spi_mpc83xx: Handles other Freescale processors
[2/9]spi_mpc83xx: Quieten down the "Requested speed is too low" message [3/9]spi_mpc83xx: Add small delay after asserting chip-select line [4/9] powerpc/86xx: Add MMC SPI support for MPC8610HPCD boards
Some or all of these seem appropriate to 2.6.30 and perhaps even -stable?
Quoted 6 lines · Andrew Morton
Quoted 3 lines · On Fri, 1 May 2009 03:47:39 +0400 Anton Vorontsov…
Here are few patches that are needed to support spi-mmc slot on MPC8610HPCD PowerPC boards:
Quoted 7 lines
Quoted 5 lines
[1/9]
spi_mpc83xx: Handles other Freescale processors
[2/9]spi_mpc83xx: Quieten down the "Requested speed is too low" message [3/9]spi_mpc83xx: Add small delay after asserting chip-select line [4/9] powerpc/86xx: Add MMC SPI support for MPC8610HPCD boardsSome or all of these seem appropriate to 2.6.30 and perhaps even -stable?
I'd say no, we don't need the fixes for MPC8323E-RDB boards (currently the only mainline user of that driver), and support for MPC8610HPCD boards is a new feature, so I think all these patches can wait for 2.6.31.
Thanks,
Signature · 10 lines
Anton Vorontsov email: [email protected] irc://irc.freenode.net/bd2 ------------------------------------------------------------------------------ Register Now & Save for Velocity, the Web Performance & Operations Conference from O'Reilly Media. Velocity features a full day of expert-led, hands-on workshops and two days of sessions from industry leaders in dedicated Performance & Operations tracks. Use code vel09scf and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf