colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-sh

Browse Source
This commit is contained in:
Tom Rini
2018-10-10 13:35:14 -04:00
parent 606f3a74e6 ae400fde75
commit 98068b3be5
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/dts/ulcb.dtsi
View File

@@ -24,6 +24,15 @@
stdout-path = "serial0:115200n8"; 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 { audio_clkout: audio-clkout {
/* /*
* This is same as <&rcar_sound 0> * This is same as <&rcar_sound 0>

12
drivers/mmc/tmio-common.c
View File

@@ -372,11 +372,19 @@ static int tmio_sd_dma_xfer(struct udevice *dev, struct mmc_data *data)
} }
/* check if the address is DMA'able */ /* 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)) if (!IS_ALIGNED(addr, TMIO_SD_DMA_MINALIGN))
return false; 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) && \ #if defined(CONFIG_ARCH_UNIPHIER) && !defined(CONFIG_ARM64) && \
defined(CONFIG_SPL_BUILD) defined(CONFIG_SPL_BUILD)
/* /*
@@ -486,7 +494,7 @@ int tmio_sd_send_cmd(struct udevice *dev, struct mmc_cmd *cmd,
if (data) { if (data) {
/* use DMA if the HW supports it and the buffer is aligned */ /* use DMA if the HW supports it and the buffer is aligned */
if (priv->caps & TMIO_SD_CAP_DMA_INTERNAL && 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); ret = tmio_sd_dma_xfer(dev, data);
else else
ret = tmio_sd_pio_xfer(dev, data); ret = tmio_sd_pio_xfer(dev, data);