Skip to content

Commit 7b94af2

Browse files
jonrebmbroonie
authored andcommitted
spi: imx: pass struct spi_transfer to prepare_transfer()
In an upcoming patch, mx51_ecspi_prepare_transfer() needs access to the word_delay parameter. To enable controller-specific handling of such per-transfer parameters, extend the prepare_transfer() function of the spi_imx_devtype_data interface to take a struct spi_transfer argument, update all controller-specific implementations accordingly. Signed-off-by: Jonas Rebmann <jre@pengutronix.de> Reviewed-by: Frank Li <Frank.Li@nxp.com> Link: https://patch.msgid.link/20241113-imx-spi-word-delay-v2-1-2b65b737bf29@pengutronix.de Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent b1e7828 commit 7b94af2

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

drivers/spi/spi-imx.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ struct spi_imx_data;
7171
struct spi_imx_devtype_data {
7272
void (*intctrl)(struct spi_imx_data *spi_imx, int enable);
7373
int (*prepare_message)(struct spi_imx_data *spi_imx, struct spi_message *msg);
74-
int (*prepare_transfer)(struct spi_imx_data *spi_imx, struct spi_device *spi);
74+
int (*prepare_transfer)(struct spi_imx_data *spi_imx, struct spi_device *spi,
75+
struct spi_transfer *t);
7576
void (*trigger)(struct spi_imx_data *spi_imx);
7677
int (*rx_available)(struct spi_imx_data *spi_imx);
7778
void (*reset)(struct spi_imx_data *spi_imx);
@@ -648,7 +649,7 @@ static void mx51_configure_cpha(struct spi_imx_data *spi_imx,
648649
}
649650

650651
static int mx51_ecspi_prepare_transfer(struct spi_imx_data *spi_imx,
651-
struct spi_device *spi)
652+
struct spi_device *spi, struct spi_transfer *t)
652653
{
653654
u32 ctrl = readl(spi_imx->base + MX51_ECSPI_CTRL);
654655
u32 clk;
@@ -773,7 +774,7 @@ static int mx31_prepare_message(struct spi_imx_data *spi_imx,
773774
}
774775

775776
static int mx31_prepare_transfer(struct spi_imx_data *spi_imx,
776-
struct spi_device *spi)
777+
struct spi_device *spi, struct spi_transfer *t)
777778
{
778779
unsigned int reg = MX31_CSPICTRL_ENABLE | MX31_CSPICTRL_HOST;
779780
unsigned int clk;
@@ -877,7 +878,7 @@ static int mx21_prepare_message(struct spi_imx_data *spi_imx,
877878
}
878879

879880
static int mx21_prepare_transfer(struct spi_imx_data *spi_imx,
880-
struct spi_device *spi)
881+
struct spi_device *spi, struct spi_transfer *t)
881882
{
882883
unsigned int reg = MX21_CSPICTRL_ENABLE | MX21_CSPICTRL_HOST;
883884
unsigned int max = is_imx27_cspi(spi_imx) ? 16 : 18;
@@ -952,7 +953,7 @@ static int mx1_prepare_message(struct spi_imx_data *spi_imx,
952953
}
953954

954955
static int mx1_prepare_transfer(struct spi_imx_data *spi_imx,
955-
struct spi_device *spi)
956+
struct spi_device *spi, struct spi_transfer *t)
956957
{
957958
unsigned int reg = MX1_CSPICTRL_ENABLE | MX1_CSPICTRL_HOST;
958959
unsigned int clk;
@@ -1303,7 +1304,7 @@ static int spi_imx_setupxfer(struct spi_device *spi,
13031304
spi_imx->target_burst = t->len;
13041305
}
13051306

1306-
spi_imx->devtype_data->prepare_transfer(spi_imx, spi);
1307+
spi_imx->devtype_data->prepare_transfer(spi_imx, spi, t);
13071308

13081309
return 0;
13091310
}

0 commit comments

Comments
 (0)