diff options
| author | Tom Rini <trini@konsulko.com> | 2019-09-06 19:49:51 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-09-06 19:49:51 -0400 |
| commit | ba83753289f5ad99f64e72fd0ee141c647aeda0f (patch) | |
| tree | d1758ddd69cf9c754494d63f2f9e9b98ce61842f /arch/arm/mach-bcm283x/include/mach/sdhci.h | |
| parent | 9562b20dba65e33fc4afc27d83641463f017221b (diff) | |
| parent | e0351b242a9bf60dd6abdfd44104bb702e7000a0 (diff) | |
Merge tag 'rpi-next-2019.10' of https://github.com/mbgg/u-boot
- fix mailbox status register used for polling
- fix bcm2835_sdhost to wait long enough for a transfer to complete
- increase kernel image size from 8 MB to 64 MB on arm64
- add support for RPi4
- add prefixes for raspberry pi related stuff to git-mailrc
Diffstat (limited to 'arch/arm/mach-bcm283x/include/mach/sdhci.h')
| -rw-r--r-- | arch/arm/mach-bcm283x/include/mach/sdhci.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-bcm283x/include/mach/sdhci.h b/arch/arm/mach-bcm283x/include/mach/sdhci.h index 5cb6ec3340..b443c379d8 100644 --- a/arch/arm/mach-bcm283x/include/mach/sdhci.h +++ b/arch/arm/mach-bcm283x/include/mach/sdhci.h @@ -6,11 +6,7 @@ #ifndef _BCM2835_SDHCI_H_ #define _BCM2835_SDHCI_H_ -#ifndef CONFIG_BCM2835 -#define BCM2835_SDHCI_BASE 0x3f300000 -#else -#define BCM2835_SDHCI_BASE 0x20300000 -#endif +#define BCM2835_SDHCI_BASE (CONFIG_BCM283x_BASE + 0x00300000) int bcm2835_sdhci_init(u32 regbase, u32 emmc_freq); |