| Message ID | 1515763566-7325-1-git-send-email-aford173@gmail.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot,V3] Convert CONFIG_SYS_DV_CLKMODE et al to Kconfig | expand |
On 01/12/2018 07:26 AM, 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 <aford173@gmail.com> > --- Reviewed-by: David Lechner <david@lechnology.com>
On Fri, Jan 12, 2018 at 07:26:06AM -0600, 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 <aford173@gmail.com> > Reviewed-by: David Lechner <david@lechnology.com> > --- > Changes in V3: > Using the L138 Technical Reference manual, I changed the names to match > the descriptions of the registers as listed in Table 8-2 and 8-3 of the > PLL Control 0 and PLL Control 1 Registers. > 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(-) [patchwork link is https://patchwork.ozlabs.org/patch/859919/] First, this should also cover CONFIG_SYS_DA850_PLL0_PLLM which shouldn't be too bad. Second, this needs to deal with calimain, which has both CONFIG_SYS_DA850_PLL1_PLLM and CONFIG_SYS_DA850_PLL0_PLLM as dynamic. Ideas? Thanks!
On Mon, Jan 22, 2018 at 3:30 PM, Tom Rini <trini@konsulko.com> wrote: > On Fri, Jan 12, 2018 at 07:26:06AM -0600, 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 <aford173@gmail.com> >> Reviewed-by: David Lechner <david@lechnology.com> >> --- >> Changes in V3: >> Using the L138 Technical Reference manual, I changed the names to match >> the descriptions of the registers as listed in Table 8-2 and 8-3 of the >> PLL Control 0 and PLL Control 1 Registers. >> 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(-) > > [patchwork link is https://patchwork.ozlabs.org/patch/859919/] > > First, this should also cover CONFIG_SYS_DA850_PLL0_PLLM which shouldn't > be too bad. > > Second, this needs to deal with calimain, which has both > CONFIG_SYS_DA850_PLL1_PLLM and CONFIG_SYS_DA850_PLL0_PLLM as dynamic. > Ideas? Thanks! > Can we push the low-hanging fruit and come back and revisit the rest at a later date? My goal was just try and clean up a bunch of config files. adam > -- > Tom
On Mon, Jan 22, 2018 at 04:07:44PM -0600, Adam Ford wrote: > On Mon, Jan 22, 2018 at 3:30 PM, Tom Rini <trini@konsulko.com> wrote: > > On Fri, Jan 12, 2018 at 07:26:06AM -0600, 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 <aford173@gmail.com> > >> Reviewed-by: David Lechner <david@lechnology.com> > >> --- > >> Changes in V3: > >> Using the L138 Technical Reference manual, I changed the names to match > >> the descriptions of the registers as listed in Table 8-2 and 8-3 of the > >> PLL Control 0 and PLL Control 1 Registers. > >> 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(-) > > > > [patchwork link is https://patchwork.ozlabs.org/patch/859919/] > > > > First, this should also cover CONFIG_SYS_DA850_PLL0_PLLM which shouldn't > > be too bad. > > > > Second, this needs to deal with calimain, which has both > > CONFIG_SYS_DA850_PLL1_PLLM and CONFIG_SYS_DA850_PLL0_PLLM as dynamic. > > Ideas? Thanks! > > > Can we push the low-hanging fruit and come back and revisit the rest > at a later date? My goal was just try and clean up a bunch of config > files. Yeah, please respin a v4 that drops out CONFIG_SYS_DA850_PLL1_PLLM for now, thanks!
On Mon, Jan 22, 2018 at 4:12 PM, Tom Rini <trini@konsulko.com> wrote: > On Mon, Jan 22, 2018 at 04:07:44PM -0600, Adam Ford wrote: >> On Mon, Jan 22, 2018 at 3:30 PM, Tom Rini <trini@konsulko.com> wrote: >> > On Fri, Jan 12, 2018 at 07:26:06AM -0600, 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 <aford173@gmail.com> >> >> Reviewed-by: David Lechner <david@lechnology.com> >> >> --- >> >> Changes in V3: >> >> Using the L138 Technical Reference manual, I changed the names to match >> >> the descriptions of the registers as listed in Table 8-2 and 8-3 of the >> >> PLL Control 0 and PLL Control 1 Registers. >> >> 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(-) >> > >> > [patchwork link is https://patchwork.ozlabs.org/patch/859919/] >> > >> > First, this should also cover CONFIG_SYS_DA850_PLL0_PLLM which shouldn't >> > be too bad. >> > >> > Second, this needs to deal with calimain, which has both >> > CONFIG_SYS_DA850_PLL1_PLLM and CONFIG_SYS_DA850_PLL0_PLLM as dynamic. >> > Ideas? Thanks! >> > >> Can we push the low-hanging fruit and come back and revisit the rest >> at a later date? My goal was just try and clean up a bunch of config >> files. > > Yeah, please respin a v4 that drops out CONFIG_SYS_DA850_PLL1_PLLM for > now, thanks! Since it was a continuation of Convert CONFIG_SOC_DA8XX et al have you had a chance to review that patch? If not, I'd like to wait until it's ready so I can rebuild this off any changes from the Convert CONFIG_SOC_DA8XX et al patch. thanks adam > > -- > Tom
On Mon, Jan 22, 2018 at 04:27:32PM -0600, Adam Ford wrote: > On Mon, Jan 22, 2018 at 4:12 PM, Tom Rini <trini@konsulko.com> wrote: > > On Mon, Jan 22, 2018 at 04:07:44PM -0600, Adam Ford wrote: > >> On Mon, Jan 22, 2018 at 3:30 PM, Tom Rini <trini@konsulko.com> wrote: > >> > On Fri, Jan 12, 2018 at 07:26:06AM -0600, 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 <aford173@gmail.com> > >> >> Reviewed-by: David Lechner <david@lechnology.com> > >> >> --- > >> >> Changes in V3: > >> >> Using the L138 Technical Reference manual, I changed the names to match > >> >> the descriptions of the registers as listed in Table 8-2 and 8-3 of the > >> >> PLL Control 0 and PLL Control 1 Registers. > >> >> 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(-) > >> > > >> > [patchwork link is https://patchwork.ozlabs.org/patch/859919/] > >> > > >> > First, this should also cover CONFIG_SYS_DA850_PLL0_PLLM which shouldn't > >> > be too bad. > >> > > >> > Second, this needs to deal with calimain, which has both > >> > CONFIG_SYS_DA850_PLL1_PLLM and CONFIG_SYS_DA850_PLL0_PLLM as dynamic. > >> > Ideas? Thanks! > >> > > >> Can we push the low-hanging fruit and come back and revisit the rest > >> at a later date? My goal was just try and clean up a bunch of config > >> files. > > > > Yeah, please respin a v4 that drops out CONFIG_SYS_DA850_PLL1_PLLM for > > now, thanks! > > Since it was a continuation of Convert CONFIG_SOC_DA8XX et al have you > had a chance to review that patch? If not, I'd like to wait until > it's ready so I can rebuild this off any changes from the Convert > CONFIG_SOC_DA8XX et al patch. In build-tests now, thanks!
diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig index ae9c0fd..72e208f 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 "PLLCTL Clock Mode" + default 0 if SOC_DA850 + help + Set PLLCTL Clock Mode bit as External Clock or On Chip oscillator + +config SYS_DA850_PLL0_POSTDIV + int "PLLC0 PLL Post-Divider" + default 1 if SOC_DA850 + help + Value written to PLLC0 PLL Post-Divider Control Register + +config SYS_DA850_PLL0_PLLDIV1 + hex "PLLC0 Divider 1" + default 0x8000 if SOC_DA850 + help + Value written to PLLC0 Divider 1 register + +config SYS_DA850_PLL0_PLLDIV2 + hex "PLLC0 Divider 2" + default 0x8001 if SOC_DA850 + help + Value written to PLLC0 Divider 2 register + +config SYS_DA850_PLL0_PLLDIV3 + hex "PLLC0 Divider 3" + default 0x8002 if SOC_DA850 + help + Value written to PLLC0 Divider 3 register + +config SYS_DA850_PLL0_PLLDIV4 + hex "PLLC0 Divider 4" + default 0x8003 if SOC_DA850 + help + Value written to PLLC0 Divider 4 register + +config SYS_DA850_PLL0_PLLDIV5 + hex "PLLC0 Divider 5" + default 0x8002 if SOC_DA850 + help + Value written to PLLC0 Divider 5 register + +config SYS_DA850_PLL0_PLLDIV7 + hex "PLLC0 Divider 7" + default 0x8005 if SOC_DA850 + help + Value written to PLLC0 Divider 7 register + +config SYS_DA850_PLL1_POSTDIV + hex "PLLC1 PLL Post-Divider" + default 1 if SOC_DA850 + help + Value written to PLLC1 PLL Post-Divider Control Register + +config SYS_DA850_PLL1_PLLDIV1 + hex "PLLC1 Divider 2" + default 0x8000 if SOC_DA850 + help + Value written to PLLC1 Divider 1 register + +config SYS_DA850_PLL1_PLLDIV2 + hex "PLLC1 Divider 2" + default 0x8001 if SOC_DA850 + help + Value written to PLLC1 Divider 2 register + +config SYS_DA850_PLL1_PLLDIV3 + hex "PLLC1 Divider 3" + default 0x8002 if SOC_DA850 + help + Value written to PLLC1 Divider 3 register + +config SYS_DA850_PLL1_PLLM + int "PLLC1 PLL Multiplier" + default 21 if SOC_DA850 + help + Value written to PLLC1 PLL Multiplier Control Register + +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 -#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 #define CONFIG_SYS_DA850_PLL0_PLLM \ ((calimain_get_osc_freq() == 25000000) ? 23 : 24) diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 5159a6f..a356871 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -74,20 +74,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 -#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 #define CONFIG_SYS_DA850_PLL0_PLLM 24 #define CONFIG_SYS_DA850_PLL1_PLLM 21 diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index 618bf72..e66c008 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -56,20 +56,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 -#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 #define CONFIG_SYS_DA850_PLL0_PLLM 24 #define CONFIG_SYS_DA850_PLL1_PLLM 24 diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index 105429b..26376a8 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -52,20 +52,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 -#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 #define CONFIG_SYS_DA850_PLL0_PLLM 24 #define CONFIG_SYS_DA850_PLL1_PLLM 21 diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 570322e..1ad176e 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -58,20 +58,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 -#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 0x8003 #define CONFIG_SYS_DA850_PLL0_PLLM 37 #define CONFIG_SYS_DA850_PLL1_PLLM 21 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 7e99a7a..c9955a3 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -2478,21 +2478,10 @@ CONFIG_SYS_DA850_DDR2_SDBCR2 CONFIG_SYS_DA850_DDR2_SDRCR CONFIG_SYS_DA850_DDR2_SDTIMR CONFIG_SYS_DA850_DDR2_SDTIMR2 -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_PLLDIV6 -CONFIG_SYS_DA850_PLL0_PLLDIV7 CONFIG_SYS_DA850_PLL0_PLLM -CONFIG_SYS_DA850_PLL0_POSTDIV CONFIG_SYS_DA850_PLL0_PREDIV -CONFIG_SYS_DA850_PLL1_PLLDIV1 -CONFIG_SYS_DA850_PLL1_PLLDIV2 -CONFIG_SYS_DA850_PLL1_PLLDIV3 CONFIG_SYS_DA850_PLL1_PLLM -CONFIG_SYS_DA850_PLL1_POSTDIV CONFIG_SYS_DA850_SYSCFG_SUSPSRC CONFIG_SYS_DAVINCI_EMAC_PHY_COUNT CONFIG_SYS_DAVINCI_I2C_SLAVE @@ -2735,7 +2724,6 @@ CONFIG_SYS_DSPI_CTAR4 CONFIG_SYS_DSPI_CTAR5 CONFIG_SYS_DSPI_CTAR6 CONFIG_SYS_DSPI_CTAR7 -CONFIG_SYS_DV_CLKMODE CONFIG_SYS_DV_NOR_BOOT_CFG CONFIG_SYS_EBI_CFGR_VAL CONFIG_SYS_EBI_CSA_VAL
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 <aford173@gmail.com> --- Changes in V3: Using the L138 Technical Reference manual, I changed the names to match the descriptions of the registers as listed in Table 8-2 and 8-3 of the PLL Control 0 and PLL Control 1 Registers. 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(-)