Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-24 21:54:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

ppc: Move lbc_clk and cpu to arch_global_data

Browse source 
Move these fields into arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
[trini: Update for bsc9132qds.c, b4860qds.c]
Signed-off-by: Tom Rini <trini@ti.com>
This commit is contained in:
Simon Glass 2012-12-13 20:48:48 +00:00 committed by Tom Rini
parent c6731fe22a
commit 67ac13b1b9
19 changed files with 34 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/powerpc/cpu/mpc85xx/cpu.c
View file

@ -104,7 +104,7 @@ int checkcpu (void)
puts("CPU: "); puts("CPU: ");
} }
cpu = gd->cpu; cpu = gd->arch.cpu;
puts(cpu->name); puts(cpu->name);
if (IS_E_PROCESSOR(svr)) if (IS_E_PROCESSOR(svr))

4
arch/powerpc/cpu/mpc85xx/fdt.c
View file

@ -637,9 +637,9 @@ void ft_cpu_setup(void *blob, bd_t *bd)
"bus-frequency", bd->bi_busfreq, 1); "bus-frequency", bd->bi_busfreq, 1);
do_fixup_by_compat_u32(blob, "fsl,pq3-localbus", do_fixup_by_compat_u32(blob, "fsl,pq3-localbus",
"bus-frequency", gd->lbc_clk, 1); "bus-frequency", gd->arch.lbc_clk, 1);
do_fixup_by_compat_u32(blob, "fsl,elbc", do_fixup_by_compat_u32(blob, "fsl,elbc",
"bus-frequency", gd->lbc_clk, 1); "bus-frequency", gd->arch.lbc_clk, 1);
#ifdef CONFIG_QE #ifdef CONFIG_QE
ft_qe_setup(blob); ft_qe_setup(blob);
ft_fixup_qe_snum(blob); ft_fixup_qe_snum(blob);

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

@ -391,7 +391,7 @@ int get_clocks (void)
gd->cpu_clk = sys_info.freqProcessor[0]; gd->cpu_clk = sys_info.freqProcessor[0];
gd->bus_clk = sys_info.freqSystemBus; gd->bus_clk = sys_info.freqSystemBus;
gd->mem_clk = sys_info.freqDDRBus; gd->mem_clk = sys_info.freqDDRBus;
gd->lbc_clk = sys_info.freqLocalBus; gd->arch.lbc_clk = sys_info.freqLocalBus;
#ifdef CONFIG_QE #ifdef CONFIG_QE
gd->qe_clk = sys_info.freqQE; gd->qe_clk = sys_info.freqQE;

2
arch/powerpc/cpu/mpc86xx/cpu.c
View file

@ -67,7 +67,7 @@ checkcpu(void)
} }
puts("CPU: "); puts("CPU: ");
cpu = gd->cpu; cpu = gd->arch.cpu;
puts(cpu->name); puts(cpu->name);

4
arch/powerpc/cpu/mpc86xx/fdt.c
View file

@ -34,10 +34,10 @@ void ft_cpu_setup(void *blob, bd_t *bd)
#if defined(CONFIG_MPC8641) #if defined(CONFIG_MPC8641)
do_fixup_by_compat_u32(blob, "fsl,mpc8641-localbus", do_fixup_by_compat_u32(blob, "fsl,mpc8641-localbus",
"bus-frequency", gd->lbc_clk, 1); "bus-frequency", gd->arch.lbc_clk, 1);
#endif #endif
do_fixup_by_compat_u32(blob, "fsl,elbc", do_fixup_by_compat_u32(blob, "fsl,elbc",
"bus-frequency", gd->lbc_clk, 1); "bus-frequency", gd->arch.lbc_clk, 1);
fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize); fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize);

2
arch/powerpc/cpu/mpc86xx/speed.c
View file

@ -120,7 +120,7 @@ int get_clocks(void)
get_sys_info(&sys_info); get_sys_info(&sys_info);
gd->cpu_clk = sys_info.freqProcessor; gd->cpu_clk = sys_info.freqProcessor;
gd->bus_clk = sys_info.freqSystemBus; gd->bus_clk = sys_info.freqSystemBus;
gd->lbc_clk = sys_info.freqLocalBus; gd->arch.lbc_clk = sys_info.freqLocalBus;
/* /*
* The base clock for I2C depends on the actual SOC. Unfortunately, * The base clock for I2C depends on the actual SOC. Unfortunately,

8
arch/powerpc/cpu/mpc8xxx/cpu.c
View file

@ -148,7 +148,7 @@ struct cpu_type *identify_cpu(u32 ver)
u32 cpu_mask(void) u32 cpu_mask(void)
{ {
ccsr_pic_t __iomem *pic = (void *)CONFIG_SYS_MPC8xxx_PIC_ADDR; ccsr_pic_t __iomem *pic = (void *)CONFIG_SYS_MPC8xxx_PIC_ADDR;
struct cpu_type *cpu = gd->cpu; struct cpu_type *cpu = gd->arch.cpu;
/* better to query feature reporting register than just assume 1 */ /* better to query feature reporting register than just assume 1 */
if (cpu == &cpu_type_unknown) if (cpu == &cpu_type_unknown)
@ -166,7 +166,7 @@ u32 cpu_mask(void)
*/ */
int cpu_numcores(void) int cpu_numcores(void)
{ {
struct cpu_type *cpu = gd->cpu; struct cpu_type *cpu = gd->arch.cpu;
/* /*
* Report # of cores in terms of the cpu_mask if we haven't * Report # of cores in terms of the cpu_mask if we haven't
@ -196,7 +196,7 @@ int probecpu (void)
svr = get_svr(); svr = get_svr();
ver = SVR_SOC_VER(svr); ver = SVR_SOC_VER(svr);
gd->cpu = identify_cpu(ver); gd->arch.cpu = identify_cpu(ver);
return 0; return 0;
} }
@ -204,7 +204,7 @@ int probecpu (void)
/* Once in memory, compute mask & # cores once and save them off */ /* Once in memory, compute mask & # cores once and save them off */
int fixup_cpu(void) int fixup_cpu(void)
{ {
struct cpu_type *cpu = gd->cpu; struct cpu_type *cpu = gd->arch.cpu;
if (cpu->num_cores == 0) { if (cpu->num_cores == 0) {
cpu->mask = cpu_mask(); cpu->mask = cpu_mask();

8
arch/powerpc/include/asm/global_data.h
View file

@ -76,6 +76,10 @@ struct arch_global_data {
u32 mem_sec_clk; u32 mem_sec_clk;
# endif /* CONFIG_MPC8360 */ # endif /* CONFIG_MPC8360 */
#endif #endif
#if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)
u32 lbc_clk;
void *cpu;
#endif /* CONFIG_MPC85xx || CONFIG_MPC86xx */
}; };
/* /*
@ -98,10 +102,6 @@ typedef struct global_data {
#if defined(CONFIG_FSL_ESDHC) #if defined(CONFIG_FSL_ESDHC)
u32 sdhc_clk; u32 sdhc_clk;
#endif #endif
#if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)
u32 lbc_clk;
void *cpu;
#endif /* CONFIG_MPC85xx || CONFIG_MPC86xx */
#if defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) #if defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)
u32 i2c1_clk; u32 i2c1_clk;
u32 i2c2_clk; u32 i2c2_clk;

7
arch/powerpc/lib/board.c
View file

@ -649,10 +649,11 @@ void board_init_r(gd_t *id, ulong dest_addr)
#if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) #if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)
/* /*
* The gd->cpu pointer is set to an address in flash before relocation. * The gd->arch.cpu pointer is set to an address in flash before
* We need to update it to point to the same CPU entry in RAM. * relocation. We need to update it to point to the same CPU entry
* in RAM.
*/ */
gd->cpu += dest_addr - CONFIG_SYS_MONITOR_BASE; gd->arch.cpu += dest_addr - CONFIG_SYS_MONITOR_BASE;
/* /*
* If we didn't know the cpu mask & # cores, we can save them of * If we didn't know the cpu mask & # cores, we can save them of

2
board/freescale/b4860qds/b4860qds.c
View file

@ -50,7 +50,7 @@ int checkboard(void)
{ {
char buf[64]; char buf[64];
u8 sw; u8 sw;
struct cpu_type *cpu = gd->cpu; struct cpu_type *cpu = gd->arch.cpu;
ccsr_gur_t *gur = (void *)CONFIG_SYS_MPC85xx_GUTS_ADDR; ccsr_gur_t *gur = (void *)CONFIG_SYS_MPC85xx_GUTS_ADDR;
unsigned int i; unsigned int i;
static const char *const freq[] = {"100", "125", "156.25", "161.13", static const char *const freq[] = {"100", "125", "156.25", "161.13",

2
board/freescale/bsc9131rdb/bsc9131rdb.c
View file

@ -59,7 +59,7 @@ int checkboard(void)
{ {
struct cpu_type *cpu; struct cpu_type *cpu;
cpu = gd->cpu; cpu = gd->arch.cpu;
printf("Board: %sRDB\n", cpu->name); printf("Board: %sRDB\n", cpu->name);
return 0; return 0;

2
board/freescale/bsc9132qds/bsc9132qds.c
View file

@ -184,7 +184,7 @@ int checkboard(void)
struct cpu_type *cpu; struct cpu_type *cpu;
u8 sw; u8 sw;
cpu = gd->cpu; cpu = gd->arch.cpu;
printf("Board: %sQDS\n", cpu->name); printf("Board: %sQDS\n", cpu->name);
printf("Sys ID: 0x%02x, Sys Ver: 0x%02x, FPGA Ver: 0x%02x,\n", printf("Sys ID: 0x%02x, Sys Ver: 0x%02x, FPGA Ver: 0x%02x,\n",

2
board/freescale/corenet_ds/corenet_ds.c
View file

@ -42,7 +42,7 @@ DECLARE_GLOBAL_DATA_PTR;
int checkboard (void) int checkboard (void)
{ {
u8 sw; u8 sw;
struct cpu_type *cpu = gd->cpu; struct cpu_type *cpu = gd->arch.cpu;
ccsr_gur_t *gur = (void *)CONFIG_SYS_MPC85xx_GUTS_ADDR; ccsr_gur_t *gur = (void *)CONFIG_SYS_MPC85xx_GUTS_ADDR;
unsigned int i; unsigned int i;
static const char * const freq[] = {"100", "125", "156.25", "212.5" }; static const char * const freq[] = {"100", "125", "156.25", "212.5" };

6
board/freescale/p1010rdb/ddr.c
View file

@ -99,7 +99,7 @@ unsigned long get_sdram_size(void)
struct cpu_type *cpu; struct cpu_type *cpu;
phys_size_t ddr_size; phys_size_t ddr_size;
cpu = gd->cpu; cpu = gd->arch.cpu;
/* P1014 and it's derivatives support max 16it DDR width */ /* P1014 and it's derivatives support max 16it DDR width */
if (cpu->soc_ver == SVR_P1014) if (cpu->soc_ver == SVR_P1014)
ddr_size = (CONFIG_SYS_DRAM_SIZE / 2); ddr_size = (CONFIG_SYS_DRAM_SIZE / 2);
@ -144,7 +144,7 @@ phys_size_t fixed_sdram(void)
panic("Unsupported DDR data rate %s MT/s data rate\n", panic("Unsupported DDR data rate %s MT/s data rate\n",
strmhz(buf, ddr_freq)); strmhz(buf, ddr_freq));
cpu = gd->cpu; cpu = gd->arch.cpu;
/* P1014 and it's derivatives support max 16bit DDR width */ /* P1014 and it's derivatives support max 16bit DDR width */
if (cpu->soc_ver == SVR_P1014) { if (cpu->soc_ver == SVR_P1014) {
ddr_cfg_regs.ddr_sdram_cfg &= ~SDRAM_CFG_DBW_MASK; ddr_cfg_regs.ddr_sdram_cfg &= ~SDRAM_CFG_DBW_MASK;
@ -237,7 +237,7 @@ void fsl_ddr_board_options(memctl_options_t *popts,
popts->trwt_override = 1; popts->trwt_override = 1;
popts->trwt = 0; popts->trwt = 0;
cpu = gd->cpu; cpu = gd->arch.cpu;
/* P1014 and it's derivatives support max 16it DDR width */ /* P1014 and it's derivatives support max 16it DDR width */
if (cpu->soc_ver == SVR_P1014) if (cpu->soc_ver == SVR_P1014)
popts->data_bus_width = DDR_DATA_BUS_WIDTH_16; popts->data_bus_width = DDR_DATA_BUS_WIDTH_16;

6
board/freescale/p1010rdb/p1010rdb.c
View file

@ -164,7 +164,7 @@ int checkboard(void)
{ {
struct cpu_type *cpu; struct cpu_type *cpu;
cpu = gd->cpu; cpu = gd->arch.cpu;
printf("Board: %sRDB\n", cpu->name); printf("Board: %sRDB\n", cpu->name);
return 0; return 0;
@ -178,7 +178,7 @@ int board_eth_init(bd_t *bis)
struct cpu_type *cpu; struct cpu_type *cpu;
int num = 0; int num = 0;
cpu = gd->cpu; cpu = gd->arch.cpu;
#ifdef CONFIG_TSEC1 #ifdef CONFIG_TSEC1
SET_STD_TSEC_INFO(tsec_info[num], 1); SET_STD_TSEC_INFO(tsec_info[num], 1);
@ -283,7 +283,7 @@ void ft_board_setup(void *blob, bd_t *bd)
phys_size_t size; phys_size_t size;
struct cpu_type *cpu; struct cpu_type *cpu;
cpu = gd->cpu; cpu = gd->arch.cpu;
ft_cpu_setup(blob, bd); ft_cpu_setup(blob, bd);

2
board/freescale/p1_p2_rdb/ddr.c
View file

@ -202,7 +202,7 @@ phys_size_t fixed_sdram (void)
struct cpu_type *cpu; struct cpu_type *cpu;
ulong ddr_freq, ddr_freq_mhz; ulong ddr_freq, ddr_freq_mhz;
cpu = gd->cpu; cpu = gd->arch.cpu;
/* P1020 and it's derivatives support max 32bit DDR width */ /* P1020 and it's derivatives support max 32bit DDR width */
if (cpu->soc_ver == SVR_P1020 || cpu->soc_ver == SVR_P1011) { if (cpu->soc_ver == SVR_P1020 || cpu->soc_ver == SVR_P1011) {
ddr_size = (CONFIG_SYS_SDRAM_SIZE * 1024 * 1024 / 2); ddr_size = (CONFIG_SYS_SDRAM_SIZE * 1024 * 1024 / 2);

2
board/freescale/p1_p2_rdb/p1_p2_rdb.c
View file

@ -108,7 +108,7 @@ int checkboard (void)
else else
panic ("Unexpected Board REV %x detected!!\n", board_rev_gpio); panic ("Unexpected Board REV %x detected!!\n", board_rev_gpio);
cpu = gd->cpu; cpu = gd->arch.cpu;
printf ("Board: %sRDB Rev%c\n", cpu->name, board_rev); printf ("Board: %sRDB Rev%c\n", cpu->name, board_rev);
setbits_be32(&pgpio->gpdir, GPIO_DIR); setbits_be32(&pgpio->gpdir, GPIO_DIR);

2
board/freescale/p2041rdb/p2041rdb.c
View file

@ -43,7 +43,7 @@ DECLARE_GLOBAL_DATA_PTR;
int checkboard(void) int checkboard(void)
{ {
u8 sw; u8 sw;
struct cpu_type *cpu = gd->cpu; struct cpu_type *cpu = gd->arch.cpu;
ccsr_gur_t *gur = (void *)CONFIG_SYS_MPC85xx_GUTS_ADDR; ccsr_gur_t *gur = (void *)CONFIG_SYS_MPC85xx_GUTS_ADDR;
unsigned int i; unsigned int i;

2
board/freescale/t4qds/t4qds.c
View file

@ -58,7 +58,7 @@ int checkboard(void)
{ {
char buf[64]; char buf[64];
u8 sw; u8 sw;
struct cpu_type *cpu = gd->cpu; struct cpu_type *cpu = gd->arch.cpu;
ccsr_gur_t *gur = (void *)CONFIG_SYS_MPC85xx_GUTS_ADDR; ccsr_gur_t *gur = (void *)CONFIG_SYS_MPC85xx_GUTS_ADDR;
unsigned int i; unsigned int i;