diff options
author | Kumar Gala <galak@freescale.com> | 2005-10-20 12:44:03 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-10-26 01:52:56 -0400 |
commit | 60dda2565bbf31bbe662fd143a41c861b7a190cf (patch) | |
tree | 26821704b421cbfc50f50dc2cb7f028960b7294d | |
parent | d2e615125762459fd2bb9f0c91881509a0b9c31b (diff) |
[PATCH] powerpc: some prom.c cleanups
On !CONFIG_PPC_MULTIPLATFORM _machine is defined as 0. This is ok, but
we can't assign a value to _machine then.
We may not have CONFIG_PCI available, so only build in support for
find_parent_pci_resource(), request_OF_resource(), release_OF_resource()
if PCI is enabled. This is probably not the long term fix but works out
for now.
Make reg_property64 contain 64-bit elements on a 32-bit machine.
Mark the deprecated prom.c functions as __deprecated.
Signed-off-by: Kumar K. Gala <kumar.gala@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r-- | arch/powerpc/kernel/prom.c | 4 | ||||
-rw-r--r-- | include/asm-powerpc/prom.h | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index 69f69c38fd27..8d0c78cbc0bc 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c | |||
@@ -1167,8 +1167,10 @@ static int __init early_init_dt_scan_chosen(unsigned long node, | |||
1167 | #ifdef CONFIG_PPC64 | 1167 | #ifdef CONFIG_PPC64 |
1168 | systemcfg->platform = *prop; | 1168 | systemcfg->platform = *prop; |
1169 | #else | 1169 | #else |
1170 | #ifdef CONFIG_PPC_MULTIPLATFORM | ||
1170 | _machine = *prop; | 1171 | _machine = *prop; |
1171 | #endif | 1172 | #endif |
1173 | #endif | ||
1172 | 1174 | ||
1173 | #ifdef CONFIG_PPC64 | 1175 | #ifdef CONFIG_PPC64 |
1174 | /* check if iommu is forced on or off */ | 1176 | /* check if iommu is forced on or off */ |
@@ -2005,6 +2007,7 @@ bus_space_to_resource_flags(unsigned int bus_space) | |||
2005 | } | 2007 | } |
2006 | } | 2008 | } |
2007 | 2009 | ||
2010 | #ifdef CONFIG_PCI | ||
2008 | static struct resource *find_parent_pci_resource(struct pci_dev* pdev, | 2011 | static struct resource *find_parent_pci_resource(struct pci_dev* pdev, |
2009 | struct address_range *range) | 2012 | struct address_range *range) |
2010 | { | 2013 | { |
@@ -2157,3 +2160,4 @@ int release_OF_resource(struct device_node *node, int index) | |||
2157 | return 0; | 2160 | return 0; |
2158 | } | 2161 | } |
2159 | EXPORT_SYMBOL(release_OF_resource); | 2162 | EXPORT_SYMBOL(release_OF_resource); |
2163 | #endif /* CONFIG_PCI */ | ||
diff --git a/include/asm-powerpc/prom.h b/include/asm-powerpc/prom.h index 8a21791c7cae..49d2c7455f8e 100644 --- a/include/asm-powerpc/prom.h +++ b/include/asm-powerpc/prom.h | |||
@@ -104,8 +104,8 @@ struct reg_property32 { | |||
104 | }; | 104 | }; |
105 | 105 | ||
106 | struct reg_property64 { | 106 | struct reg_property64 { |
107 | unsigned long address; | 107 | u64 address; |
108 | unsigned long size; | 108 | u64 size; |
109 | }; | 109 | }; |
110 | 110 | ||
111 | struct property { | 111 | struct property { |
@@ -155,12 +155,12 @@ static inline void set_node_proc_entry(struct device_node *dn, struct proc_dir_e | |||
155 | 155 | ||
156 | 156 | ||
157 | /* OBSOLETE: Old style node lookup */ | 157 | /* OBSOLETE: Old style node lookup */ |
158 | extern struct device_node *find_devices(const char *name); | 158 | extern __deprecated struct device_node *find_devices(const char *name); |
159 | extern struct device_node *find_type_devices(const char *type); | 159 | extern __deprecated struct device_node *find_type_devices(const char *type); |
160 | extern struct device_node *find_path_device(const char *path); | 160 | extern __deprecated struct device_node *find_path_device(const char *path); |
161 | extern struct device_node *find_compatible_devices(const char *type, | 161 | extern __deprecated struct device_node *find_compatible_devices(const char *type, |
162 | const char *compat); | 162 | const char *compat); |
163 | extern struct device_node *find_all_nodes(void); | 163 | extern __deprecated struct device_node *find_all_nodes(void); |
164 | 164 | ||
165 | /* New style node lookup */ | 165 | /* New style node lookup */ |
166 | extern struct device_node *of_find_node_by_name(struct device_node *from, | 166 | extern struct device_node *of_find_node_by_name(struct device_node *from, |