From patchwork Fri Jan 12 13:26:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 859919 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="sxajtEat"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zJ3Rq2KKmz9ryQ for ; Sat, 13 Jan 2018 00:26:29 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 6AA9EC221F8; Fri, 12 Jan 2018 13:26:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 41612C22122; Fri, 12 Jan 2018 13:26:20 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7942CC22122; Fri, 12 Jan 2018 13:26:18 +0000 (UTC) Received: from mail-it0-f68.google.com (mail-it0-f68.google.com [209.85.214.68]) by lists.denx.de (Postfix) with ESMTPS id D20F1C21E16 for ; Fri, 12 Jan 2018 13:26:17 +0000 (UTC) Received: by mail-it0-f68.google.com with SMTP id x42so9053693ita.4 for ; Fri, 12 Jan 2018 05:26:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=gryH65f7Zi142fyoAi70pr4HtKA4eQ2GbBrYw9Rkt18=; b=sxajtEatPhF3IO+3M1e98LMY15hAgFeAXMcdOjRHFhpKgO9SboXQr5chlpKYg6UckG 1XpsoSJaWrF/UHpMxu4m0XYePzULzIapFpXE7LF3+1wbK/YKVnWHf+hL9xa2MIfZWPMU uzPNXkODYkZhlPOPqptoCDZAEWx482En/es2y2r6GepiH5dHcScNarhWUk14IdIMts1u F/LE/iSatU/Xnoa66ubn+KzYdQG+f8udezqgkX4umdy/x7wTVqMKhy2/59QL2NBKS56o 6jC5VZVt2ZviJsDCk5kbb9LKq2rsQAvp0g3wMwFfahvEKEhV2V1oXVEzADXOrGpT6d3c oewQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=gryH65f7Zi142fyoAi70pr4HtKA4eQ2GbBrYw9Rkt18=; b=SGU14DkhIIjQ2F8VzAin/xPWy+NzjPYP6vi+w9gbge53CPG+sWY1XMls6tVtX4JcPB M+E8lP3H+jADMKKXmCSTU0/WVm+GVG/7+hfkkPuQK6CZ+N5HxLMo/jo17lF8L+PlypmG /OLQMpNq2kcmW9KjZy4ZxWI8DuRfT9bg1fCXDgyLB6XFaxPAuJu8zQVWxQb32EAiLO3Z JhISw9wDXAwZOowzDAId10JXkLrgzRK4zTc5SfU9FZhAQdlXI1+MUVcXUtNhG38roFeA T9EcIvWqb0eEgqyLQSwn0DBYhee20+XVwbgcSiDaGKwyYzoh4EL0e/fFn4KG3w57BVO1 bKng== X-Gm-Message-State: AKwxytdJASZKZO0KUOK7uiWW8Vb07RstvSeh9lf2KseeBMRXZ3M1/zOZ mUyB+b3ev/fogKEFp59aV5I= X-Google-Smtp-Source: ACJfBovKVbqpIjYHTTNnauyAn6AQjjXTogbRgh3+qAHVlOqsxoUxWjcbvs13zyhU57sKqcAWq2nI0A== X-Received: by 10.36.253.204 with SMTP id m195mr5393402ith.66.1515763576289; Fri, 12 Jan 2018 05:26:16 -0800 (PST) Received: from ubuntu16.lan (c-73-65-120-235.hsd1.mn.comcast.net. [73.65.120.235]) by smtp.gmail.com with ESMTPSA id d3sm2130010itj.34.2018.01.12.05.26.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 12 Jan 2018 05:26:15 -0800 (PST) From: Adam Ford To: adam.ford@logicpd.com Date: Fri, 12 Jan 2018 07:26:06 -0600 Message-Id: <1515763566-7325-1-git-send-email-aford173@gmail.com> X-Mailer: git-send-email 2.7.4 Cc: David Lechner , =?utf-8?q?Christoph_R=C3=BCdisse?= =?utf-8?q?r?= , Manfred Rudigier , u-boot@lists.denx.de, Peter Howard Subject: [U-Boot] [PATCH V3] Convert CONFIG_SYS_DV_CLKMODE et al to Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" 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 Reviewed-by: David Lechner --- 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(-) 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