diff options
| author | Tom Rini <trini@konsulko.com> | 2018-04-06 08:30:10 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-04-06 08:30:10 -0400 |
| commit | 6074c3879c69a28cd8ace6ae03df5f9d4d2ef17f (patch) | |
| tree | 60b9a6a5709f219f8ca3a4c9792145357863cb4a /arch | |
| parent | e294ba0678359bc32085c1714329af37e33e8f16 (diff) | |
| parent | 91e1bc53c4b61cd7b871d485f4c136084245e9a2 (diff) | |
| download | u-boot-6074c3879c69a28cd8ace6ae03df5f9d4d2ef17f.zip u-boot-6074c3879c69a28cd8ace6ae03df5f9d4d2ef17f.tar.gz u-boot-6074c3879c69a28cd8ace6ae03df5f9d4d2ef17f.tar.bz2 | |
Merge tag 'signed-rpi-next' of git://github.com/agraf/u-boot
Patch queue for rpi - 2018-04-06
Highlights this time around:
- Support for new RPi3 B+ model
- Fix for some SD cards on newer RPi firmware
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-bcm283x/include/mach/msg.h | 3 | ||||
| -rw-r--r-- | arch/arm/mach-bcm283x/msg.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-bcm283x/include/mach/msg.h b/arch/arm/mach-bcm283x/include/mach/msg.h index 478b1f1..d055480 100644 --- a/arch/arm/mach-bcm283x/include/mach/msg.h +++ b/arch/arm/mach-bcm283x/include/mach/msg.h @@ -18,9 +18,10 @@ int bcm2835_power_on_module(u32 module); /** * bcm2835_get_mmc_clock() - get the frequency of the MMC clock * + * @clock_id: ID of clock to get frequency for * @return clock frequency, or -ve on error */ -int bcm2835_get_mmc_clock(void); +int bcm2835_get_mmc_clock(u32 clock_id); /** * bcm2835_get_video_size() - get the current display size diff --git a/arch/arm/mach-bcm283x/msg.c b/arch/arm/mach-bcm283x/msg.c index 92e93ad..ad29f3b 100644 --- a/arch/arm/mach-bcm283x/msg.c +++ b/arch/arm/mach-bcm283x/msg.c @@ -65,7 +65,7 @@ int bcm2835_power_on_module(u32 module) return 0; } -int bcm2835_get_mmc_clock(void) +int bcm2835_get_mmc_clock(u32 clock_id) { ALLOC_CACHE_ALIGN_BUFFER(struct msg_get_clock_rate, msg_clk, 1); int ret; @@ -76,7 +76,7 @@ int bcm2835_get_mmc_clock(void) BCM2835_MBOX_INIT_HDR(msg_clk); BCM2835_MBOX_INIT_TAG(&msg_clk->get_clock_rate, GET_CLOCK_RATE); - msg_clk->get_clock_rate.body.req.clock_id = BCM2835_MBOX_CLOCK_ID_EMMC; + msg_clk->get_clock_rate.body.req.clock_id = clock_id; ret = bcm2835_mbox_call_prop(BCM2835_MBOX_PROP_CHAN, &msg_clk->hdr); if (ret) { |