diff options
author | Tom Rini | 2020-07-29 21:16:08 -0400 |
---|---|---|
committer | Tom Rini | 2020-07-29 21:16:08 -0400 |
commit | 719f42190d5f0238cb01ef2ffba8af2285f7bc7a (patch) | |
tree | c789716a82ab552e0d0c1a9242fda7c41b04c238 /drivers/spi/mxs_spi.c | |
parent | 7cb2060b4e63a89c50739dc8a9fcd5d73f86f0be (diff) | |
parent | b9390ce51cb46f4b4acda320e7ea8e0bd120e4b8 (diff) |
Merge tag 'dm-pull-28jul20' of git://git.denx.de/u-boot-dm
Use binman instead of one of the Rockchip build scripts
Refactor to allow any arch to create SPI-flash images
New button uclass
Diffstat (limited to 'drivers/spi/mxs_spi.c')
-rw-r--r-- | drivers/spi/mxs_spi.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c index 3c1af839c07..fb0af02be08 100644 --- a/drivers/spi/mxs_spi.c +++ b/drivers/spi/mxs_spi.c @@ -41,15 +41,9 @@ #define MXS_SSP_IMX23_CLKID_SSP0 33 #define MXS_SSP_IMX28_CLKID_SSP0 46 -#ifdef CONFIG_MX28 -#define dtd_fsl_imx_spi dtd_fsl_imx28_spi -#else /* CONFIG_MX23 */ -#define dtd_fsl_imx_spi dtd_fsl_imx23_spi -#endif - struct mxs_spi_platdata { #if CONFIG_IS_ENABLED(OF_PLATDATA) - struct dtd_fsl_imx_spi dtplat; + struct dtd_fsl_imx23_spi dtplat; #endif s32 frequency; /* Default clock frequency, -1 for none */ fdt_addr_t base; /* SPI IP block base address */ @@ -324,7 +318,7 @@ static int mxs_spi_probe(struct udevice *bus) debug("%s: probe\n", __func__); #if CONFIG_IS_ENABLED(OF_PLATDATA) - struct dtd_fsl_imx_spi *dtplat = &plat->dtplat; + struct dtd_fsl_imx23_spi *dtplat = &plat->dtplat; struct phandle_1_arg *p1a = &dtplat->clocks[0]; priv->regs = (struct mxs_ssp_regs *)dtplat->reg[0]; |