summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-03-29 10:53:28 -0400
committerTom Rini <trini@konsulko.com>2019-03-29 10:53:28 -0400
commitc3aef9339ce0592b06c8d44cf2eaf9e6f3713e4f (patch)
treeee04147c6f17f12c95b1cd7a9a53a93c2c8513e2
parentb357ae5ed697da038d0ee6807f308f9177fcb3a7 (diff)
parentf00c26284ec0aa3e9b01ebe4996aa8fc01526d03 (diff)
Merge branch '2019-03-29-master-imports'
- Bugfixes: - mmc: correct the HS400 initialization process - configs: ti: Move FIT image load address to avoid overwrite - lib: time: update module enable MACRO - Add mbrugger as RPi board maintainer, correct agraf's email address.
-rw-r--r--board/raspberrypi/rpi/MAINTAINERS2
-rw-r--r--doc/git-mailrc2
-rw-r--r--drivers/mmc/mmc.c3
-rw-r--r--include/configs/ti_armv7_common.h2
-rw-r--r--lib/time.c2
5 files changed, 5 insertions, 6 deletions
diff --git a/board/raspberrypi/rpi/MAINTAINERS b/board/raspberrypi/rpi/MAINTAINERS
index cce1a7ad76..4f1b23efc8 100644
--- a/board/raspberrypi/rpi/MAINTAINERS
+++ b/board/raspberrypi/rpi/MAINTAINERS
@@ -1,5 +1,5 @@
RPI BOARD
-M: Alexander Graf <agraf@suse.de>
+M: Matthias Brugger <mbrugger@suse.com>
S: Maintained
F: board/raspberrypi/rpi/
F: include/configs/rpi.h
diff --git a/doc/git-mailrc b/doc/git-mailrc
index c2eee8c7d8..b75ebab02b 100644
--- a/doc/git-mailrc
+++ b/doc/git-mailrc
@@ -15,7 +15,7 @@ alias abiessmann Andreas Bießmann <andreas@biessmann.org>
alias abrodkin Alexey Brodkin <alexey.brodkin@synopsys.com>
alias afleming Andy Fleming <afleming@gmail.com>
alias ag Anatolij Gustschin <agust@denx.de>
-alias agraf Alexander Graf <agraf@suse.de>
+alias agraf Alexander Graf <agraf@csgraf.de>
alias alisonwang Alison Wang <alison.wang@nxp.com>
alias angelo_ts Angelo Dureghello <angelo@sysam.it>
alias bmeng Bin Meng <bmeng.cn@gmail.com>
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 89b255daf4..456c1b4cc9 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -1892,8 +1892,7 @@ static int mmc_select_hs400(struct mmc *mmc)
}
/* Set back to HS */
- mmc_set_card_speed(mmc, MMC_HS, false);
- mmc_set_clock(mmc, mmc_mode2freq(mmc, MMC_HS), false);
+ mmc_set_card_speed(mmc, MMC_HS, true);
err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_BUS_WIDTH,
EXT_CSD_BUS_WIDTH_8 | EXT_CSD_DDR_FLAG);
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index 1e2a62dd6f..828fb1b2a5 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -52,7 +52,7 @@
#define DEFAULT_FIT_TI_ARGS \
"boot_fit=0\0" \
- "fit_loadaddr=0x87000000\0" \
+ "fit_loadaddr=0x90000000\0" \
"fit_bootfile=fitImage\0" \
"update_to_fit=setenv loadaddr ${fit_loadaddr}; setenv bootfile ${fit_bootfile}\0" \
"loadfit=run args_mmc; bootm ${loadaddr}#${fdtfile};\0" \
diff --git a/lib/time.c b/lib/time.c
index 3bf678a232..9c55da6f1b 100644
--- a/lib/time.c
+++ b/lib/time.c
@@ -56,7 +56,7 @@ ulong timer_get_boot_us(void)
extern unsigned long __weak timer_read_counter(void);
#endif
-#ifdef CONFIG_TIMER
+#if CONFIG_IS_ENABLED(TIMER)
ulong notrace get_tbclk(void)
{
if (!gd->timer) {