V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

ppc: Remove extra pci_clk fields from global_data 

PPC has several of these fields, selected by chip type, although only one
is ever compiled in.

Instead, use a single field. It would be nice if this could be selected
by CONFIG_PCI, but some chips (e.g. mpc5xxx) use pci_clk even when
CONFIG_PCI is not enabled.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2012-12-13 20:48:45 +00:00 committed by Tom Rini
parent 1206c18403
commit 9fb23624a6
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/powerpc/include/asm/global_data.h
View File

@ -54,14 +54,13 @@ typedef struct global_data {
unsigned int baudrate; unsigned int baudrate;
unsigned long cpu_clk; /* CPU clock in Hz! */ unsigned long cpu_clk; /* CPU clock in Hz! */
unsigned long bus_clk; unsigned long bus_clk;
/* We cannot bracket this with CONFIG_PCI due to mpc5xxx */
unsigned long pci_clk;
#if defined(CONFIG_CPM2) #if defined(CONFIG_CPM2)
/* There are many clocks on the MPC8260 - see page 9-5 */ /* There are many clocks on the MPC8260 - see page 9-5 */
unsigned long vco_out; unsigned long vco_out;
unsigned long cpm_clk; unsigned long cpm_clk;
unsigned long scc_clk; unsigned long scc_clk;
#ifdef CONFIG_PCI
unsigned long pci_clk;
#endif
#endif #endif
unsigned long mem_clk; unsigned long mem_clk;
#if defined(CONFIG_MPC83xx) #if defined(CONFIG_MPC83xx)
@ -85,7 +84,6 @@ typedef struct global_data {
u32 enc_clk; u32 enc_clk;
u32 lbiu_clk; u32 lbiu_clk;
u32 lclk_clk; u32 lclk_clk;
u32 pci_clk;
#if defined(CONFIG_MPC8308) || defined(CONFIG_MPC831x) || \ #if defined(CONFIG_MPC8308) || defined(CONFIG_MPC831x) || \
defined(CONFIG_MPC837x) defined(CONFIG_MPC837x)
u32 pciexp1_clk; u32 pciexp1_clk;
@ -122,17 +120,14 @@ typedef struct global_data {
#endif #endif
#if defined(CONFIG_MPC5xxx) #if defined(CONFIG_MPC5xxx)
unsigned long ipb_clk; unsigned long ipb_clk;
unsigned long pci_clk;
#endif #endif
#if defined(CONFIG_MPC512X) #if defined(CONFIG_MPC512X)
u32 ips_clk; u32 ips_clk;
u32 csb_clk; u32 csb_clk;
u32 pci_clk;
#endif /* CONFIG_MPC512X */ #endif /* CONFIG_MPC512X */
#if defined(CONFIG_MPC8220) #if defined(CONFIG_MPC8220)
unsigned long bExtUart; unsigned long bExtUart;
unsigned long inp_clk; unsigned long inp_clk;
unsigned long pci_clk;
unsigned long vco_clk; unsigned long vco_clk;
unsigned long pev_clk; unsigned long pev_clk;
unsigned long flb_clk; unsigned long flb_clk;