On 01/11/2018 01:33 PM, Adam Ford wrote:
This converts the following to Kconfig:
CONFIG_SYS_DV_CLKMODE
CONFIG_SYS_DA850_PLL0_POSTDIV
CONFIG_SYS_DA850_PLL0_PLLDIV1
CONFIG_SYS_DA850_PLL0_PLLDIV2
CONFIG_SYS_DA850_PLL0_PLLDIV3
CONFIG_SYS_DA850_PLL0_PLLDIV4
CONFIG_SYS_DA850_PLL0_PLLDIV5
CONFIG_SYS_DA850_PLL0_PLLDIV7
CONFIG_SYS_DA850_PLL1_POSTDIV
CONFIG_SYS_DA850_PLL1_PLLDIV1
CONFIG_SYS_DA850_PLL1_PLLDIV2
CONFIG_SYS_DA850_PLL1_PLLDIV3
Signed-off-by: Adam Ford <aford...@gmail.com>
---
Changes in V2:
Expand Kconfig help definitions to give a small explanation of options
V1:
This patch is a continuation of Convert CONFIG_SOC_DA8XX et al
This also showed warnings when used with the legoev3_defconfig, however
it seems like the ev3 board was defining things in the header it didn't need
since it doesn't seem to be building da850_lowlevel.c. I don't have the
hardware to test that board.
arch/arm/mach-davinci/Kconfig | 85 ++++++++++++++++++++++++++++++++++++++++-
configs/omapl138_lcdk_defconfig | 1 +
include/configs/calimain.h | 13 -------
include/configs/da850evm.h | 13 -------
include/configs/ipam390.h | 13 -------
include/configs/legoev3.h | 13 -------
include/configs/omapl138_lcdk.h | 13 -------
scripts/config_whitelist.txt | 12 ------
8 files changed, 85 insertions(+), 78 deletions(-)
diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig
index ae9c0fd..a6818a8 100644
--- a/arch/arm/mach-davinci/Kconfig
+++ b/arch/arm/mach-davinci/Kconfig
@@ -24,7 +24,7 @@ config TARGET_EA20
config TARGET_OMAPL138_LCDK
bool "OMAPL138 LCDK"
- select SOC_DA8XX
+ select SOC_DA850
select SUPPORT_SPL
config TARGET_CALIMAIN
@@ -63,6 +63,89 @@ config SOC_DA8XX
config MACH_DAVINCI_DA850_EVM
bool
+if SYS_DA850_PLL_INIT
+comment "DA850 PLL Initialization Parameters"
+
+config SYS_DV_CLKMODE
+ int "SYS_DV_CLKMODE"
+ default 0 if SOC_DA850
+ help
+ Set PLLCTL Clock Mode bit as External Clock or On Chip oscillator
+
+config SYS_DA850_PLL0_POSTDIV
+ int "SYS_DA850_PLL0_POSTDIV"
+ default 1 if SOC_DA850
+ help
+ Value written to PLL1, POSTDIV register
help does not match config - PLL1 vs. PLL0.
+
+config SYS_DA850_PLL0_PLLDIV1
+ hex "SYS_DA850_PLL0_PLLDIV1"
+ default 0x8000 if SOC_DA850
+ help
+ Value written to PLL0, PLLDIV1 register
+
+config SYS_DA850_PLL0_PLLDIV2
+ hex "SYS_DA850_PLL0_PLLDIV2"
+ default 0x8001 if SOC_DA850
+ help
+ Value written to PLL0, PLLDIV2 register
+
+config SYS_DA850_PLL0_PLLDIV3
+ hex "SYS_DA850_PLL0_PLLDIV3"
+ default 0x8002 if SOC_DA850
+ help
+ Value written to PLL0, PLLDIV3 register
+
+config SYS_DA850_PLL0_PLLDIV4
+ hex "SYS_DA850_PLL0_PLLDIV4"
+ default 0x8003 if SOC_DA850
+ help
+ Value written to PLL0, PLLDIV4 register
+
+config SYS_DA850_PLL0_PLLDIV5
+ hex "SYS_DA850_PLL0_PLLDIV5"
+ default 0x8002 if SOC_DA850
+ help
+ Value written to PLL0, PLLDIV5 register
+
+config SYS_DA850_PLL0_PLLDIV7
+ hex "SYS_DA850_PLL0_PLLDIV7"
+ default 0x8005 if SOC_DA850
+ help
+ Value written to PLL0, PLLDIV7 register
+
+config SYS_DA850_PLL1_POSTDIV
+ hex "SYS_DA850_PLL1_POSTDIV"
+ default 1 if SOC_DA850
+ help
+ Value written to PLL1, POSTDIV register
+
+config SYS_DA850_PLL1_PLLDIV1
+ hex "SYS_DA850_PLL1_PLLDIV1"
+ default 0x8000 if SOC_DA850
+ help
+ Value written to PLL1, DIV1 register
In the TRM's (at least in AM1808/OMAP-L138) this register is
"PLLDIV1", not just "DIV1".
+
+config SYS_DA850_PLL1_PLLDIV2
+ hex "SYS_DA850_PLL1_PLLDIV2"
+ default 0x8001 if SOC_DA850
+ help
+ Value written to PLL1, DIV2 register
+
+config SYS_DA850_PLL1_PLLDIV3
+ hex "SYS_DA850_PLL1_PLLDIV3"
+ default 0x8002 if SOC_DA850
+ help
+ Value written to PLL1, DIV3 register
+
+config SYS_DA850_PLL1_PLLM
+ int "SYS_DA850_PLL1_PLLM"
+ default 21 if SOC_DA850
+ help
+ Value written to PLL1 multiplier
+
+endif
+
source "board/Barix/ipam390/Kconfig"
source "board/davinci/da8xxevm/Kconfig"
source "board/davinci/ea20/Kconfig"
diff --git a/configs/omapl138_lcdk_defconfig b/configs/omapl138_lcdk_defconfig
index 8d6b12f..2498126 100644
--- a/configs/omapl138_lcdk_defconfig
+++ b/configs/omapl138_lcdk_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_OMAPL138_LCDK=y
+CONFIG_SYS_DA850_PLL1_PLLDIV3=0x8003
CONFIG_TI_COMMON_CMD_OPTIONS=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
diff --git a/include/configs/calimain.h b/include/configs/calimain.h
index 7dfc1fa..8605487 100644
--- a/include/configs/calimain.h
+++ b/include/configs/calimain.h
@@ -39,20 +39,7 @@
/*
* PLL configuration
*/
-#define CONFIG_SYS_DV_CLKMODE 0
-#define CONFIG_SYS_DA850_PLL0_POSTDIV 1
-#define CONFIG_SYS_DA850_PLL0_PLLDIV1 0x8000
-#define CONFIG_SYS_DA850_PLL0_PLLDIV2 0x8001
-#define CONFIG_SYS_DA850_PLL0_PLLDIV3 0x8002
-#define CONFIG_SYS_DA850_PLL0_PLLDIV4 0x8003
-#define CONFIG_SYS_DA850_PLL0_PLLDIV5 0x8002
#define CONFIG_SYS_DA850_PLL0_PLLDIV6 CONFIG_SYS_DA850_PLL0_PLLDIV1
I suppose you are not adding CONFIG_SYS_DA850_PLL0_PLLDIV6 to
Kconfig because there is not a way to handle this relationship?
I think it would be just fine to move CONFIG_SYS_DA850_PLL0_PLLDIV6
to Kconfig and give it the default value 0x8000. I suspect that this
comes from the fact that these clocks are supposed to be "fixed ratio"
but there are other clocks that are also "fixed ratio" that are not
handled this way already (PLL0_SYSCLK2, PLL0_SYSCLK4).
-#define CONFIG_SYS_DA850_PLL0_PLLDIV7 0x8005
-
-#define CONFIG_SYS_DA850_PLL1_POSTDIV 1
-#define CONFIG_SYS_DA850_PLL1_PLLDIV1 0x8000
-#define CONFIG_SYS_DA850_PLL1_PLLDIV2 0x8001
-#define CONFIG_SYS_DA850_PLL1_PLLDIV3 0x8002
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
