Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6
* 'merge' of git://git.secretlab.ca/git/linux-2.6: spi/mpc52xx-spi: fix annotation for remove()-pointer spi/fsl_espi: fix wrong setting of the address in the command buffer spi/fsl_espi: change the read behaviour of the SPIRF of/i2c: Fix request module by alias powerpc/mpc5200: include fs.h in mpc52xx_gpt.c
This commit is contained in:
commit
d3c7e1ab04
|
@ -63,6 +63,7 @@
|
|||
#include <linux/of_gpio.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/fs.h>
|
||||
#include <linux/watchdog.h>
|
||||
#include <linux/miscdevice.h>
|
||||
#include <linux/uaccess.h>
|
||||
|
|
|
@ -61,7 +61,7 @@ void of_i2c_register_devices(struct i2c_adapter *adap)
|
|||
info.of_node = of_node_get(node);
|
||||
info.archdata = &dev_ad;
|
||||
|
||||
request_module("%s", info.type);
|
||||
request_module("%s%s", I2C_MODULE_PREFIX, info.type);
|
||||
|
||||
result = i2c_new_device(adap, &info);
|
||||
if (result == NULL) {
|
||||
|
|
|
@ -563,7 +563,7 @@ static struct of_platform_driver mpc52xx_spi_of_driver = {
|
|||
.of_match_table = mpc52xx_spi_match,
|
||||
},
|
||||
.probe = mpc52xx_spi_probe,
|
||||
.remove = __exit_p(mpc52xx_spi_remove),
|
||||
.remove = __devexit_p(mpc52xx_spi_remove),
|
||||
};
|
||||
|
||||
static int __init mpc52xx_spi_init(void)
|
||||
|
|
|
@ -258,18 +258,18 @@ static int fsl_espi_bufs(struct spi_device *spi, struct spi_transfer *t)
|
|||
return mpc8xxx_spi->count;
|
||||
}
|
||||
|
||||
static void fsl_espi_addr2cmd(unsigned int addr, u8 *cmd)
|
||||
static inline void fsl_espi_addr2cmd(unsigned int addr, u8 *cmd)
|
||||
{
|
||||
if (cmd[1] && cmd[2] && cmd[3]) {
|
||||
if (cmd) {
|
||||
cmd[1] = (u8)(addr >> 16);
|
||||
cmd[2] = (u8)(addr >> 8);
|
||||
cmd[3] = (u8)(addr >> 0);
|
||||
}
|
||||
}
|
||||
|
||||
static unsigned int fsl_espi_cmd2addr(u8 *cmd)
|
||||
static inline unsigned int fsl_espi_cmd2addr(u8 *cmd)
|
||||
{
|
||||
if (cmd[1] && cmd[2] && cmd[3])
|
||||
if (cmd)
|
||||
return cmd[1] << 16 | cmd[2] << 8 | cmd[3] << 0;
|
||||
|
||||
return 0;
|
||||
|
@ -395,9 +395,11 @@ static void fsl_espi_rw_trans(struct spi_message *m,
|
|||
}
|
||||
}
|
||||
|
||||
addr = fsl_espi_cmd2addr(local_buf);
|
||||
addr += pos;
|
||||
fsl_espi_addr2cmd(addr, local_buf);
|
||||
if (pos > 0) {
|
||||
addr = fsl_espi_cmd2addr(local_buf);
|
||||
addr += pos;
|
||||
fsl_espi_addr2cmd(addr, local_buf);
|
||||
}
|
||||
|
||||
espi_trans->n_tx = n_tx;
|
||||
espi_trans->n_rx = trans_len;
|
||||
|
@ -507,16 +509,29 @@ void fsl_espi_cpu_irq(struct mpc8xxx_spi *mspi, u32 events)
|
|||
|
||||
/* We need handle RX first */
|
||||
if (events & SPIE_NE) {
|
||||
u32 rx_data;
|
||||
u32 rx_data, tmp;
|
||||
u8 rx_data_8;
|
||||
|
||||
/* Spin until RX is done */
|
||||
while (SPIE_RXCNT(events) < min(4, mspi->len)) {
|
||||
cpu_relax();
|
||||
events = mpc8xxx_spi_read_reg(®_base->event);
|
||||
}
|
||||
mspi->len -= 4;
|
||||
|
||||
rx_data = mpc8xxx_spi_read_reg(®_base->receive);
|
||||
if (mspi->len >= 4) {
|
||||
rx_data = mpc8xxx_spi_read_reg(®_base->receive);
|
||||
} else {
|
||||
tmp = mspi->len;
|
||||
rx_data = 0;
|
||||
while (tmp--) {
|
||||
rx_data_8 = in_8((u8 *)®_base->receive);
|
||||
rx_data |= (rx_data_8 << (tmp * 8));
|
||||
}
|
||||
|
||||
rx_data <<= (4 - mspi->len) * 8;
|
||||
}
|
||||
|
||||
mspi->len -= 4;
|
||||
|
||||
if (mspi->rx)
|
||||
mspi->get_rx(rx_data, mspi);
|
||||
|
|
Loading…
Reference in a new issue