diff options
| author | Tom Rini <trini@konsulko.com> | 2021-07-17 10:52:21 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-07-17 10:52:21 -0400 |
| commit | d5dbc661c3041e910e161a95fca9e615d85730ac (patch) | |
| tree | aff587483c785b8384de496d6670e9824eb3e703 /drivers/spi | |
| parent | c39946a2e2d062025c9fc8b34587dfdd45fd8703 (diff) | |
| parent | edf95bdeddeab8f0fd7b88d4865fbc6e99071c73 (diff) | |
| download | u-boot-d5dbc661c3041e910e161a95fca9e615d85730ac.zip u-boot-d5dbc661c3041e910e161a95fca9e615d85730ac.tar.gz u-boot-d5dbc661c3041e910e161a95fca9e615d85730ac.tar.bz2 | |
Merge tag 'u-boot-imx-20210717' of https://gitlab.denx.de/u-boot/custodians/u-boot-imxWIP/17Jul2021
i.MX
----
- mx7ulp : fix WDOG
- imx8 : Phytec
- USB3 support for i.MX8
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/8277
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/Makefile | 2 | ||||
| -rw-r--r-- | drivers/spi/mxc_spi.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index f70851e..216e72c 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -11,6 +11,7 @@ obj-$(CONFIG_SANDBOX) += spi-emul-uclass.o obj-$(CONFIG_SOFT_SPI) += soft_spi.o obj-$(CONFIG_SPI_MEM) += spi-mem.o obj-$(CONFIG_TI_QSPI) += ti_qspi.o +obj-$(CONFIG_FSL_QSPI) += fsl_qspi.o else obj-y += spi.o obj-$(CONFIG_SPI_MEM) += spi-mem-nodm.o @@ -30,7 +31,6 @@ obj-$(CONFIG_DESIGNWARE_SPI) += designware_spi.o obj-$(CONFIG_EXYNOS_SPI) += exynos_spi.o obj-$(CONFIG_FSL_DSPI) += fsl_dspi.o obj-$(CONFIG_FSL_ESPI) += fsl_espi.o -obj-$(CONFIG_FSL_QSPI) += fsl_qspi.o obj-$(CONFIG_SYNQUACER_SPI) += spi-synquacer.o obj-$(CONFIG_ICH_SPI) += ich.o obj-$(CONFIG_KIRKWOOD_SPI) += kirkwood_spi.o diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c index f3dddbd..a80c3e7 100644 --- a/drivers/spi/mxc_spi.c +++ b/drivers/spi/mxc_spi.c @@ -591,8 +591,6 @@ void spi_release_bus(struct spi_slave *slave) static int mxc_spi_probe(struct udevice *bus) { struct mxc_spi_slave *mxcs = dev_get_plat(bus); - int node = dev_of_offset(bus); - const void *blob = gd->fdt_blob; int ret; int i; @@ -629,6 +627,8 @@ static int mxc_spi_probe(struct udevice *bus) mxcs->max_hz = clk_get_rate(&clk); #else + int node = dev_of_offset(bus); + const void *blob = gd->fdt_blob; mxcs->max_hz = fdtdec_get_int(blob, node, "spi-max-frequency", 20000000); #endif |