diff options
| author | Tom Rini <trini@konsulko.com> | 2018-10-10 13:35:14 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-10-10 13:35:14 -0400 |
| commit | 98068b3be51a77d8b931a2f5097b5c22c57bcea5 (patch) | |
| tree | 76a1531846033f4ceece9e79c7d0f9ad0a8cc063 | |
| parent | 606f3a74e62db197bda104d1c472be9614957ee2 (diff) | |
| parent | ae400fde75703f2c0744fd60a5314a0d7857a67f (diff) | |
| download | u-boot-98068b3be51a77d8b931a2f5097b5c22c57bcea5.tar.gz u-boot-98068b3be51a77d8b931a2f5097b5c22c57bcea5.tar.bz2 u-boot-98068b3be51a77d8b931a2f5097b5c22c57bcea5.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-sh
| -rw-r--r-- | arch/arm/dts/ulcb.dtsi | 9 | ||||
| -rw-r--r-- | drivers/mmc/tmio-common.c | 12 |
2 files changed, 19 insertions, 2 deletions
diff --git a/arch/arm/dts/ulcb.dtsi b/arch/arm/dts/ulcb.dtsi index f66727ca8e..ab886650cd 100644 --- a/arch/arm/dts/ulcb.dtsi +++ b/arch/arm/dts/ulcb.dtsi @@ -24,6 +24,15 @@ stdout-path = "serial0:115200n8"; }; + cpld { + compatible = "renesas,ulcb-cpld"; + status = "okay"; + gpio-sck = <&gpio6 8 0>; + gpio-mosi = <&gpio6 7 0>; + gpio-miso = <&gpio6 10 0>; + gpio-sstbz = <&gpio2 3 0>; + }; + audio_clkout: audio-clkout { /* * This is same as <&rcar_sound 0> diff --git a/drivers/mmc/tmio-common.c b/drivers/mmc/tmio-common.c index b311b80be8..138de59470 100644 --- a/drivers/mmc/tmio-common.c +++ b/drivers/mmc/tmio-common.c @@ -372,11 +372,19 @@ static int tmio_sd_dma_xfer(struct udevice *dev, struct mmc_data *data) } /* check if the address is DMA'able */ -static bool tmio_sd_addr_is_dmaable(unsigned long addr) +static bool tmio_sd_addr_is_dmaable(const char *src) { + uintptr_t addr = (uintptr_t)src; + if (!IS_ALIGNED(addr, TMIO_SD_DMA_MINALIGN)) return false; +#if defined(CONFIG_RCAR_GEN3) + /* Gen3 DMA has 32bit limit */ + if (addr >> 32) + return false; +#endif + #if defined(CONFIG_ARCH_UNIPHIER) && !defined(CONFIG_ARM64) && \ defined(CONFIG_SPL_BUILD) /* @@ -486,7 +494,7 @@ int tmio_sd_send_cmd(struct udevice *dev, struct mmc_cmd *cmd, if (data) { /* use DMA if the HW supports it and the buffer is aligned */ if (priv->caps & TMIO_SD_CAP_DMA_INTERNAL && - tmio_sd_addr_is_dmaable((long)data->src)) + tmio_sd_addr_is_dmaable(data->src)) ret = tmio_sd_dma_xfer(dev, data); else ret = tmio_sd_pio_xfer(dev, data); |