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
This commit is contained in:
Tom Rini
2020-07-29 21:16:08 -04:00
116 changed files with 974 additions and 365 deletions

View File

@@ -52,15 +52,9 @@ struct mxsmmc_priv {
#include <dm/read.h>
#include <dt-structs.h>
#ifdef CONFIG_MX28
#define dtd_fsl_imx_mmc dtd_fsl_imx28_mmc
#else /* CONFIG_MX23 */
#define dtd_fsl_imx_mmc dtd_fsl_imx23_mmc
#endif
struct mxsmmc_platdata {
#if CONFIG_IS_ENABLED(OF_PLATDATA)
struct dtd_fsl_imx_mmc dtplat;
struct dtd_fsl_imx23_mmc dtplat;
#endif
struct mmc_config cfg;
struct mmc mmc;
@@ -582,7 +576,7 @@ static int mxsmmc_probe(struct udevice *dev)
debug("%s: probe\n", __func__);
#if CONFIG_IS_ENABLED(OF_PLATDATA)
struct dtd_fsl_imx_mmc *dtplat = &plat->dtplat;
struct dtd_fsl_imx23_mmc *dtplat = &plat->dtplat;
struct phandle_1_arg *p1a = &dtplat->clocks[0];
priv->buswidth = dtplat->bus_width;