diff options
| author | Tom Rini <trini@konsulko.com> | 2017-06-27 13:32:37 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-06-27 13:32:37 (GMT) |
| commit | 821560fd8e43eecc208c1c52ad24faadb6b52703 (patch) | |
| tree | efb56bc170674d3a6680ca4d343888e9e84403c7 /arch/arm/include | |
| parent | b8a238f1376f16c387765107b9d7f62e4358dd48 (diff) | |
| parent | 65496a34835cb4c9547bd02dd15b018c333add9d (diff) | |
| download | u-boot-821560fd8e43eecc208c1c52ad24faadb6b52703.tar.xz | |
Merge git://www.denx.de/git/u-boot-imx
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
include/configs/imx6qdl_icore_rqs.h
include/configs/imx6ul_geam.h
include/configs/imx6ul_isiot.h
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/arch-mx25/clock.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-mx25/clock.h b/arch/arm/include/asm/arch-mx25/clock.h index 9fdaa9d..7753caf 100644 --- a/arch/arm/include/asm/arch-mx25/clock.h +++ b/arch/arm/include/asm/arch-mx25/clock.h @@ -51,6 +51,7 @@ enum mxc_clock { MXC_CLK_NUM }; +int imx_set_perclk(enum mxc_clock clk, bool from_upll, unsigned int freq); unsigned int mxc_get_clock(enum mxc_clock clk); #define imx_get_uartclk() mxc_get_clock(MXC_UART_CLK) |