Commit 364fdbc0 authored by Anton Vorontsov's avatar Anton Vorontsov Committed by Linus Torvalds

spi_mpc83xx: rework chip selects handling

The main purpose of this patch is to pass 'struct spi_device' to the chip
select handling routines.  This is needed so that we could implement
full-fledged OpenFirmware support for this driver.

While at it, also:
- Replace two {de,activate}_cs routines by single cs_contol().
- Don't duplicate platform data callbacks in mpc83xx_spi struct.
Signed-off-by: default avatarAnton Vorontsov <avorontsov@ru.mvista.com>
Cc: David Brownell <david-b@pacbell.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Kumar Gala <galak@gate.crashing.org>
Cc: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 34c8a20c
...@@ -39,16 +39,10 @@ ...@@ -39,16 +39,10 @@
#endif #endif
#ifdef CONFIG_QUICC_ENGINE #ifdef CONFIG_QUICC_ENGINE
static void mpc83xx_spi_activate_cs(u8 cs, u8 polarity) static void mpc83xx_spi_cs_control(struct spi_device *spi, bool on)
{ {
pr_debug("%s %d %d\n", __func__, cs, polarity); pr_debug("%s %d %d\n", __func__, spi->chip_select, on);
par_io_data_set(3, 13, polarity); par_io_data_set(3, 13, on);
}
static void mpc83xx_spi_deactivate_cs(u8 cs, u8 polarity)
{
pr_debug("%s %d %d\n", __func__, cs, polarity);
par_io_data_set(3, 13, !polarity);
} }
static struct mmc_spi_platform_data mpc832x_mmc_pdata = { static struct mmc_spi_platform_data mpc832x_mmc_pdata = {
...@@ -74,9 +68,7 @@ static int __init mpc832x_spi_init(void) ...@@ -74,9 +68,7 @@ static int __init mpc832x_spi_init(void)
par_io_config_pin(3, 14, 2, 0, 0, 0); /* SD_INSERT, I */ par_io_config_pin(3, 14, 2, 0, 0, 0); /* SD_INSERT, I */
par_io_config_pin(3, 15, 2, 0, 0, 0); /* SD_PROTECT,I */ par_io_config_pin(3, 15, 2, 0, 0, 0); /* SD_PROTECT,I */
return fsl_spi_init(&mpc832x_spi_boardinfo, 1, return fsl_spi_init(&mpc832x_spi_boardinfo, 1, mpc83xx_spi_cs_control);
mpc83xx_spi_activate_cs,
mpc83xx_spi_deactivate_cs);
} }
machine_device_initcall(mpc832x_rdb, mpc832x_spi_init); machine_device_initcall(mpc832x_rdb, mpc832x_spi_init);
#endif /* CONFIG_QUICC_ENGINE */ #endif /* CONFIG_QUICC_ENGINE */
......
...@@ -420,8 +420,8 @@ arch_initcall(fsl_usb_of_init); ...@@ -420,8 +420,8 @@ arch_initcall(fsl_usb_of_init);
static int __init of_fsl_spi_probe(char *type, char *compatible, u32 sysclk, static int __init of_fsl_spi_probe(char *type, char *compatible, u32 sysclk,
struct spi_board_info *board_infos, struct spi_board_info *board_infos,
unsigned int num_board_infos, unsigned int num_board_infos,
void (*activate_cs)(u8 cs, u8 polarity), void (*cs_control)(struct spi_device *dev,
void (*deactivate_cs)(u8 cs, u8 polarity)) bool on))
{ {
struct device_node *np; struct device_node *np;
unsigned int i = 0; unsigned int i = 0;
...@@ -433,8 +433,7 @@ static int __init of_fsl_spi_probe(char *type, char *compatible, u32 sysclk, ...@@ -433,8 +433,7 @@ static int __init of_fsl_spi_probe(char *type, char *compatible, u32 sysclk,
struct resource res[2]; struct resource res[2];
struct platform_device *pdev; struct platform_device *pdev;
struct fsl_spi_platform_data pdata = { struct fsl_spi_platform_data pdata = {
.activate_cs = activate_cs, .cs_control = cs_control,
.deactivate_cs = deactivate_cs,
}; };
memset(res, 0, sizeof(res)); memset(res, 0, sizeof(res));
...@@ -501,8 +500,7 @@ static int __init of_fsl_spi_probe(char *type, char *compatible, u32 sysclk, ...@@ -501,8 +500,7 @@ static int __init of_fsl_spi_probe(char *type, char *compatible, u32 sysclk,
int __init fsl_spi_init(struct spi_board_info *board_infos, int __init fsl_spi_init(struct spi_board_info *board_infos,
unsigned int num_board_infos, unsigned int num_board_infos,
void (*activate_cs)(u8 cs, u8 polarity), void (*cs_control)(struct spi_device *spi, bool on))
void (*deactivate_cs)(u8 cs, u8 polarity))
{ {
u32 sysclk = -1; u32 sysclk = -1;
int ret; int ret;
...@@ -518,10 +516,10 @@ int __init fsl_spi_init(struct spi_board_info *board_infos, ...@@ -518,10 +516,10 @@ int __init fsl_spi_init(struct spi_board_info *board_infos,
} }
ret = of_fsl_spi_probe(NULL, "fsl,spi", sysclk, board_infos, ret = of_fsl_spi_probe(NULL, "fsl,spi", sysclk, board_infos,
num_board_infos, activate_cs, deactivate_cs); num_board_infos, cs_control);
if (!ret) if (!ret)
of_fsl_spi_probe("spi", "fsl_spi", sysclk, board_infos, of_fsl_spi_probe("spi", "fsl_spi", sysclk, board_infos,
num_board_infos, activate_cs, deactivate_cs); num_board_infos, cs_control);
return spi_register_board_info(board_infos, num_board_infos); return spi_register_board_info(board_infos, num_board_infos);
} }
......
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
#include <asm/mmu.h> #include <asm/mmu.h>
struct spi_device;
extern phys_addr_t get_immrbase(void); extern phys_addr_t get_immrbase(void);
#if defined(CONFIG_CPM2) || defined(CONFIG_QUICC_ENGINE) || defined(CONFIG_8xx) #if defined(CONFIG_CPM2) || defined(CONFIG_QUICC_ENGINE) || defined(CONFIG_8xx)
extern u32 get_brgfreq(void); extern u32 get_brgfreq(void);
...@@ -19,8 +21,7 @@ struct device_node; ...@@ -19,8 +21,7 @@ struct device_node;
extern int fsl_spi_init(struct spi_board_info *board_infos, extern int fsl_spi_init(struct spi_board_info *board_infos,
unsigned int num_board_infos, unsigned int num_board_infos,
void (*activate_cs)(u8 cs, u8 polarity), void (*cs_control)(struct spi_device *spi, bool on));
void (*deactivate_cs)(u8 cs, u8 polarity));
extern void fsl_rstcr_restart(char *cmd); extern void fsl_rstcr_restart(char *cmd);
......
...@@ -89,9 +89,6 @@ struct mpc83xx_spi { ...@@ -89,9 +89,6 @@ struct mpc83xx_spi {
bool qe_mode; bool qe_mode;
void (*activate_cs) (u8 cs, u8 polarity);
void (*deactivate_cs) (u8 cs, u8 polarity);
u8 busy; u8 busy;
struct workqueue_struct *workqueue; struct workqueue_struct *workqueue;
...@@ -153,15 +150,14 @@ MPC83XX_SPI_TX_BUF(u32) ...@@ -153,15 +150,14 @@ MPC83XX_SPI_TX_BUF(u32)
static void mpc83xx_spi_chipselect(struct spi_device *spi, int value) static void mpc83xx_spi_chipselect(struct spi_device *spi, int value)
{ {
struct mpc83xx_spi *mpc83xx_spi; struct mpc83xx_spi *mpc83xx_spi = spi_master_get_devdata(spi->master);
u8 pol = spi->mode & SPI_CS_HIGH ? 1 : 0; 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_mpc83xx_cs *cs = spi->controller_state;
mpc83xx_spi = spi_master_get_devdata(spi->master);
if (value == BITBANG_CS_INACTIVE) { if (value == BITBANG_CS_INACTIVE) {
if (mpc83xx_spi->deactivate_cs) if (pdata->cs_control)
mpc83xx_spi->deactivate_cs(spi->chip_select, pol); pdata->cs_control(spi, !pol);
} }
if (value == BITBANG_CS_ACTIVE) { if (value == BITBANG_CS_ACTIVE) {
...@@ -186,8 +182,8 @@ static void mpc83xx_spi_chipselect(struct spi_device *spi, int value) ...@@ -186,8 +182,8 @@ static void mpc83xx_spi_chipselect(struct spi_device *spi, int value)
mpc83xx_spi_write_reg(mode, regval); mpc83xx_spi_write_reg(mode, regval);
local_irq_restore(flags); local_irq_restore(flags);
} }
if (mpc83xx_spi->activate_cs) if (pdata->cs_control)
mpc83xx_spi->activate_cs(spi->chip_select, pol); pdata->cs_control(spi, pol);
} }
} }
...@@ -582,8 +578,6 @@ static int __init mpc83xx_spi_probe(struct platform_device *dev) ...@@ -582,8 +578,6 @@ static int __init mpc83xx_spi_probe(struct platform_device *dev)
master->cleanup = mpc83xx_spi_cleanup; master->cleanup = mpc83xx_spi_cleanup;
mpc83xx_spi = spi_master_get_devdata(master); mpc83xx_spi = spi_master_get_devdata(master);
mpc83xx_spi->activate_cs = pdata->activate_cs;
mpc83xx_spi->deactivate_cs = pdata->deactivate_cs;
mpc83xx_spi->qe_mode = pdata->qe_mode; mpc83xx_spi->qe_mode = pdata->qe_mode;
mpc83xx_spi->get_rx = mpc83xx_spi_rx_buf_u8; mpc83xx_spi->get_rx = mpc83xx_spi_rx_buf_u8;
mpc83xx_spi->get_tx = mpc83xx_spi_tx_buf_u8; mpc83xx_spi->get_tx = mpc83xx_spi_tx_buf_u8;
......
...@@ -95,14 +95,15 @@ struct fsl_usb2_platform_data { ...@@ -95,14 +95,15 @@ struct fsl_usb2_platform_data {
#define FSL_USB2_PORT0_ENABLED 0x00000001 #define FSL_USB2_PORT0_ENABLED 0x00000001
#define FSL_USB2_PORT1_ENABLED 0x00000002 #define FSL_USB2_PORT1_ENABLED 0x00000002
struct spi_device;
struct fsl_spi_platform_data { struct fsl_spi_platform_data {
u32 initial_spmode; /* initial SPMODE value */ u32 initial_spmode; /* initial SPMODE value */
u16 bus_num; u16 bus_num;
bool qe_mode; bool qe_mode;
/* board specific information */ /* board specific information */
u16 max_chipselect; u16 max_chipselect;
void (*activate_cs)(u8 cs, u8 polarity); void (*cs_control)(struct spi_device *spi, bool on);
void (*deactivate_cs)(u8 cs, u8 polarity);
u32 sysclk; u32 sysclk;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment