diff options
| author | Simon Glass <sjg@chromium.org> | 2012-12-13 20:48:45 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-02-01 15:42:45 -0500 |
| commit | 9fb23624a644d9a09f85fc1230b34829005c0021 (patch) | |
| tree | 0cb64fe8aed0bf8e3af7c79c216d749990203b45 /arch/powerpc/include/asm/global_data.h | |
| parent | 1206c18403ff25814673a4dbfa071ae06bbefaef (diff) | |
| download | blackbird-obmc-uboot-9fb23624a644d9a09f85fc1230b34829005c0021.tar.gz blackbird-obmc-uboot-9fb23624a644d9a09f85fc1230b34829005c0021.zip | |
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>
Diffstat (limited to 'arch/powerpc/include/asm/global_data.h')
| -rw-r--r-- | arch/powerpc/include/asm/global_data.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/powerpc/include/asm/global_data.h b/arch/powerpc/include/asm/global_data.h index ac348c6f19..8e3a726120 100644 --- a/arch/powerpc/include/asm/global_data.h +++ b/arch/powerpc/include/asm/global_data.h @@ -54,14 +54,13 @@ typedef struct global_data { unsigned int baudrate; unsigned long cpu_clk; /* CPU clock in Hz! */ unsigned long bus_clk; + /* We cannot bracket this with CONFIG_PCI due to mpc5xxx */ + unsigned long pci_clk; #if defined(CONFIG_CPM2) /* There are many clocks on the MPC8260 - see page 9-5 */ unsigned long vco_out; unsigned long cpm_clk; unsigned long scc_clk; -#ifdef CONFIG_PCI - unsigned long pci_clk; -#endif #endif unsigned long mem_clk; #if defined(CONFIG_MPC83xx) @@ -85,7 +84,6 @@ typedef struct global_data { u32 enc_clk; u32 lbiu_clk; u32 lclk_clk; - u32 pci_clk; #if defined(CONFIG_MPC8308) || defined(CONFIG_MPC831x) || \ defined(CONFIG_MPC837x) u32 pciexp1_clk; @@ -122,17 +120,14 @@ typedef struct global_data { #endif #if defined(CONFIG_MPC5xxx) unsigned long ipb_clk; - unsigned long pci_clk; #endif #if defined(CONFIG_MPC512X) u32 ips_clk; u32 csb_clk; - u32 pci_clk; #endif /* CONFIG_MPC512X */ #if defined(CONFIG_MPC8220) unsigned long bExtUart; unsigned long inp_clk; - unsigned long pci_clk; unsigned long vco_clk; unsigned long pev_clk; unsigned long flb_clk; |
