Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-27 07:51:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

global: Migrate CONFIG_FM_PLAT_CLK_DIV to CFG

Browse source 
Perform a simple rename of CONFIG_FM_PLAT_CLK_DIV to CFG_FM_PLAT_CLK_DIV

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2022-12-04 10:03:56 -05:00
parent c20d7cc95c
commit 452e33efa8
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/powerpc/cpu/mpc85xx/speed.c
View file

@ -67,7 +67,7 @@ void get_sys_info(sys_info_t *sys_info)
[14] = 4, /* CC4 PPL / 4 */ [14] = 4, /* CC4 PPL / 4 */
}; };
uint i, freq_c_pll[CONFIG_SYS_FSL_NUM_CC_PLLS]; uint i, freq_c_pll[CONFIG_SYS_FSL_NUM_CC_PLLS];
#if !defined(CONFIG_FM_PLAT_CLK_DIV) || !defined(CONFIG_PME_PLAT_CLK_DIV) #if !defined(CFG_FM_PLAT_CLK_DIV) || !defined(CONFIG_PME_PLAT_CLK_DIV)
uint rcw_tmp; uint rcw_tmp;
#endif #endif
uint ratio[CONFIG_SYS_FSL_NUM_CC_PLLS]; uint ratio[CONFIG_SYS_FSL_NUM_CC_PLLS];
@ -206,7 +206,7 @@ void get_sys_info(sys_info_t *sys_info)
#define FM1_CLK_SEL 0x1c000000 #define FM1_CLK_SEL 0x1c000000
#define FM1_CLK_SHIFT 26 #define FM1_CLK_SHIFT 26
#endif #endif
#if !defined(CONFIG_FM_PLAT_CLK_DIV) || !defined(CONFIG_PME_PLAT_CLK_DIV) #if !defined(CFG_FM_PLAT_CLK_DIV) || !defined(CONFIG_PME_PLAT_CLK_DIV)
#if defined(CONFIG_ARCH_T1024) #if defined(CONFIG_ARCH_T1024)
rcw_tmp = in_be32(&gur->rcwsr[15]) - 4; rcw_tmp = in_be32(&gur->rcwsr[15]) - 4;
#else #else
@ -377,7 +377,7 @@ void get_sys_info(sys_info_t *sys_info)
#endif #endif
#ifdef CONFIG_SYS_DPAA_FMAN #ifdef CONFIG_SYS_DPAA_FMAN
#ifndef CONFIG_FM_PLAT_CLK_DIV #ifndef CFG_FM_PLAT_CLK_DIV
switch ((rcw_tmp & FM1_CLK_SEL) >> FM1_CLK_SHIFT) { switch ((rcw_tmp & FM1_CLK_SEL) >> FM1_CLK_SHIFT) {
case 1: case 1:
sys_info->freq_fman[0] = freq_c_pll[CFG_SYS_FM1_CLK]; sys_info->freq_fman[0] = freq_c_pll[CFG_SYS_FM1_CLK];

4
arch/powerpc/include/asm/config_mpc85xx.h
View file

@ -147,8 +147,8 @@
#define CONFIG_PME_PLAT_CLK_DIV 2 #define CONFIG_PME_PLAT_CLK_DIV 2
#define CFG_SYS_PME_CLK CONFIG_PME_PLAT_CLK_DIV #define CFG_SYS_PME_CLK CONFIG_PME_PLAT_CLK_DIV
#define CONFIG_SYS_FSL_IFC_BANK_COUNT 8 #define CONFIG_SYS_FSL_IFC_BANK_COUNT 8
#define CONFIG_FM_PLAT_CLK_DIV 1 #define CFG_FM_PLAT_CLK_DIV 1
#define CFG_SYS_FM1_CLK CONFIG_FM_PLAT_CLK_DIV #define CFG_SYS_FM1_CLK CFG_FM_PLAT_CLK_DIV
#define CFG_SYS_FM_MURAM_SIZE 0x30000 #define CFG_SYS_FM_MURAM_SIZE 0x30000
#define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE #define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE
#define QE_MURAM_SIZE 0x6000UL #define QE_MURAM_SIZE 0x6000UL