projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'mips-fixes-for-2019.01' of git://git.denx.de/u-boot-mips
[oweals/u-boot.git]
/
arch
/
arm
/
mach-omap2
/
omap4
/
hw_data.c
diff --git
a/arch/arm/mach-omap2/omap4/hw_data.c
b/arch/arm/mach-omap2/omap4/hw_data.c
index 6a4b8b93c0db72a01e0dabbb5e2cec92f42c3175..d587a4d4def02fac763509faaab0ce40d84f977f 100644
(file)
--- a/
arch/arm/mach-omap2/omap4/hw_data.c
+++ b/
arch/arm/mach-omap2/omap4/hw_data.c
@@
-1,3
+1,4
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
*
* HW data initialization for OMAP4
/*
*
* HW data initialization for OMAP4
@@
-6,8
+7,6
@@
* Texas Instruments, <www.ti.com>
*
* Sricharan R <r.sricharan@ti.com>
* Texas Instruments, <www.ti.com>
*
* Sricharan R <r.sricharan@ti.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
#include <asm/arch/omap.h>
*/
#include <common.h>
#include <asm/arch/omap.h>
@@
-132,6
+131,7
@@
static const struct dpll_params iva_dpll_params_1862mhz[NUM_SYS_CLKS] = {
};
/* ABE M & N values with sys_clk as source */
};
/* ABE M & N values with sys_clk as source */
+#ifdef CONFIG_SYS_OMAP_ABE_SYSCK
static const struct dpll_params
abe_dpll_params_sysclk_196608khz[NUM_SYS_CLKS] = {
{49, 5, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1}, /* 12 MHz */
static const struct dpll_params
abe_dpll_params_sysclk_196608khz[NUM_SYS_CLKS] = {
{49, 5, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1}, /* 12 MHz */
@@
-142,11
+142,12
@@
static const struct dpll_params
{29, 7, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1}, /* 27 MHz */
{64, 24, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1} /* 38.4 MHz */
};
{29, 7, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1}, /* 27 MHz */
{64, 24, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1} /* 38.4 MHz */
};
-
+#else
/* ABE M & N values with 32K clock as source */
static const struct dpll_params abe_dpll_params_32k_196608khz = {
750, 0, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1
};
/* ABE M & N values with 32K clock as source */
static const struct dpll_params abe_dpll_params_32k_196608khz = {
750, 0, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1
};
+#endif
static const struct dpll_params usb_dpll_params_1920mhz[NUM_SYS_CLKS] = {
{80, 0, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1}, /* 12 MHz */
static const struct dpll_params usb_dpll_params_1920mhz[NUM_SYS_CLKS] = {
{80, 0, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1}, /* 12 MHz */