[spi-devel-general] [PATCH] Adapt spi_mpc83xx SPI driver for 832x
David Brownell
david-b at pacbell.net
Sat Dec 23 12:09:31 EST 2006
On Thursday 14 December 2006 2:02 am, Joakim Tjernlund wrote:
> Adjusted patch(lets hope I didn't mangle this one:):
Assuming this is correct, I don't have a problem with this one.
Feel free to wrap it up with a signed-off-by and I'll forward it.
I have a question for someone who knows about this controller though...
When issuing an RX-only transfer, the SPI framework currently specifies
that spi_transfer.tx_buf will be null, and that the data shifted out
on the MOSI pin is "undefined". Looking at the spi_mpc83xx driver in
the current tree, it looked to me as if it wouldn't actually accept
a null tx_buf ... did I miss something, or would the tx_buf##type macros
expand to a null pointer exception? If I did miss something, what data
would be shifted out in that case? (IRQ vectors from page zero?)
There's a proposal afoot to change how that's specified: rather than
shifting out "undefined" data, define it as all zeroes. It was easy
to see the impact of that on all the other SPI controller drivers now
upstream; all but one send zeroes already. But not this one...
- Dave
> diff --git a/drivers/spi/spi_mpc83xx.c b/drivers/spi/spi_mpc83xx.c
> index ff0b048..0c31878 100644
> --- a/drivers/spi/spi_mpc83xx.c
> +++ b/drivers/spi/spi_mpc83xx.c
> @@ -47,6 +47,7 @@ struct mpc83xx_spi_reg {
> #define SPMODE_ENABLE (1 << 24)
> #define SPMODE_LEN(x) ((x) << 20)
> #define SPMODE_PM(x) ((x) << 16)
> +#define SPMODE_OP (1 << 14)
>
> /*
> * Default for SPI Mode:
> @@ -85,6 +86,11 @@ struct mpc83xx_spi {
> unsigned nsecs; /* (clock cycle time)/2 */
>
> u32 sysclk;
> + u32 rx_shift; /* amount to adjust RX data regs if in qe mode */
> + u32 tx_shift; /* amount to adjust TX data regs if in qe mode */
> +
> + bool qe_mode;
> +
> void (*activate_cs) (u8 cs, u8 polarity);
> void (*deactivate_cs) (u8 cs, u8 polarity);
> };
> @@ -103,7 +109,7 @@ static inline u32 mpc83xx_spi_read_reg(_
> void mpc83xx_spi_rx_buf_##type(u32 data, struct mpc83xx_spi *mpc83xx_spi) \
> { \
> type * rx = mpc83xx_spi->rx; \
> - *rx++ = (type)data; \
> + *rx++ = (type)(data >> mpc83xx_spi->rx_shift); \
> mpc83xx_spi->rx = rx; \
> }
>
> @@ -112,7 +118,7 @@ u32 mpc83xx_spi_tx_buf_##type(struct mpc
> { \
> u32 data; \
> const type * tx = mpc83xx_spi->tx; \
> - data = *tx++; \
> + data = *tx++ << mpc83xx_spi->tx_shift; \
> mpc83xx_spi->tx = tx; \
> return data; \
> }
> @@ -195,12 +201,22 @@ int mpc83xx_spi_setup_transfer(struct sp
> || ((bits_per_word > 16) && (bits_per_word != 32)))
> return -EINVAL;
>
> + mpc83xx_spi->rx_shift = 0;
> + mpc83xx_spi->tx_shift = 0;
> if (bits_per_word <= 8) {
> 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->rx_shift = 16;
> + mpc83xx_spi->tx_shift = 24;
> + }
> } else if (bits_per_word <= 16) {
> mpc83xx_spi->get_rx = mpc83xx_spi_rx_buf_u16;
> mpc83xx_spi->get_tx = mpc83xx_spi_tx_buf_u16;
> + if (mpc83xx_spi->qe_mode) {
> + mpc83xx_spi->rx_shift = 16;
> + mpc83xx_spi->tx_shift = 16;
> + }
> } else if (bits_per_word <= 32) {
> mpc83xx_spi->get_rx = mpc83xx_spi_rx_buf_u32;
> mpc83xx_spi->get_tx = mpc83xx_spi_tx_buf_u32;
> @@ -369,8 +385,8 @@ static int __init mpc83xx_spi_probe(stru
> ret = -ENODEV;
> goto free_master;
> }
> -
> mpc83xx_spi = spi_master_get_devdata(master);
> + pdata->qe_mode = 1; // temp hack to force 832x mode
> mpc83xx_spi->bitbang.master = spi_master_get(master);
> mpc83xx_spi->bitbang.chipselect = mpc83xx_spi_chipselect;
> mpc83xx_spi->bitbang.setup_transfer = mpc83xx_spi_setup_transfer;
> @@ -378,9 +394,17 @@ static int __init mpc83xx_spi_probe(stru
> 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;
>
> + 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;
> + }
> +
> mpc83xx_spi->bitbang.master->setup = mpc83xx_spi_setup;
> init_completion(&mpc83xx_spi->done);
>
> @@ -415,6 +439,9 @@ static int __init mpc83xx_spi_probe(stru
>
> /* 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);
>
> ret = spi_bitbang_start(&mpc83xx_spi->bitbang);
>
>
>
More information about the Linuxppc-dev
mailing list