diff options
author | David S. Miller <davem@davemloft.net> | 2008-08-27 06:38:42 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-08-29 05:15:11 -0400 |
commit | 104364810ff5b0844a2183fbca989f70e86d486b (patch) | |
tree | e7aa24484aefae8ad6ba00d9e0f52ee5bfb384f3 /arch/sparc/include | |
parent | 33c4655c00e6af3ec4023f2cafd63dd4a42de49b (diff) |
sparc: Remove SBUS layer resource and irq handling.
All the drivers use OF device objects now for this
information.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/include')
-rw-r--r-- | arch/sparc/include/asm/sbus_32.h | 15 | ||||
-rw-r--r-- | arch/sparc/include/asm/sbus_64.h | 16 |
2 files changed, 0 insertions, 31 deletions
diff --git a/arch/sparc/include/asm/sbus_32.h b/arch/sparc/include/asm/sbus_32.h index 81ea0f687b18..8f5900baca32 100644 --- a/arch/sparc/include/asm/sbus_32.h +++ b/arch/sparc/include/asm/sbus_32.h | |||
@@ -51,17 +51,6 @@ struct sbus_dev { | |||
51 | int prom_node; | 51 | int prom_node; |
52 | char prom_name[64]; | 52 | char prom_name[64]; |
53 | int slot; | 53 | int slot; |
54 | |||
55 | struct resource resource[PROMREG_MAX]; | ||
56 | |||
57 | struct linux_prom_registers reg_addrs[PROMREG_MAX]; | ||
58 | int num_registers; | ||
59 | |||
60 | struct linux_prom_ranges device_ranges[PROMREG_MAX]; | ||
61 | int num_device_ranges; | ||
62 | |||
63 | unsigned int irqs[4]; | ||
64 | int num_irqs; | ||
65 | }; | 54 | }; |
66 | #define to_sbus_device(d) container_of(d, struct sbus_dev, ofdev.dev) | 55 | #define to_sbus_device(d) container_of(d, struct sbus_dev, ofdev.dev) |
67 | 56 | ||
@@ -73,9 +62,6 @@ struct sbus_bus { | |||
73 | int prom_node; /* PROM device tree node for this SBus */ | 62 | int prom_node; /* PROM device tree node for this SBus */ |
74 | char prom_name[64]; /* Usually "sbus" or "sbi" */ | 63 | char prom_name[64]; /* Usually "sbus" or "sbi" */ |
75 | int clock_freq; | 64 | int clock_freq; |
76 | |||
77 | struct linux_prom_ranges sbus_ranges[PROMREG_MAX]; | ||
78 | int num_sbus_ranges; | ||
79 | }; | 65 | }; |
80 | #define to_sbus(d) container_of(d, struct sbus_bus, ofdev.dev) | 66 | #define to_sbus(d) container_of(d, struct sbus_bus, ofdev.dev) |
81 | 67 | ||
@@ -103,7 +89,6 @@ sbus_is_slave(struct sbus_dev *dev) | |||
103 | void prom_adjust_ranges(struct linux_prom_ranges *, int, | 89 | void prom_adjust_ranges(struct linux_prom_ranges *, int, |
104 | struct linux_prom_ranges *, int); | 90 | struct linux_prom_ranges *, int); |
105 | 91 | ||
106 | extern void sbus_arch_bus_ranges_init(struct device_node *, struct sbus_bus *); | ||
107 | extern void sbus_setup_iommu(struct sbus_bus *, struct device_node *); | 92 | extern void sbus_setup_iommu(struct sbus_bus *, struct device_node *); |
108 | extern int sbus_arch_preinit(void); | 93 | extern int sbus_arch_preinit(void); |
109 | extern void sbus_arch_postinit(void); | 94 | extern void sbus_arch_postinit(void); |
diff --git a/arch/sparc/include/asm/sbus_64.h b/arch/sparc/include/asm/sbus_64.h index 2b2562e0e5c1..75f95ff6d01c 100644 --- a/arch/sparc/include/asm/sbus_64.h +++ b/arch/sparc/include/asm/sbus_64.h | |||
@@ -51,17 +51,6 @@ struct sbus_dev { | |||
51 | int prom_node; | 51 | int prom_node; |
52 | char prom_name[64]; | 52 | char prom_name[64]; |
53 | int slot; | 53 | int slot; |
54 | |||
55 | struct resource resource[PROMREG_MAX]; | ||
56 | |||
57 | struct linux_prom_registers reg_addrs[PROMREG_MAX]; | ||
58 | int num_registers; | ||
59 | |||
60 | struct linux_prom_ranges device_ranges[PROMREG_MAX]; | ||
61 | int num_device_ranges; | ||
62 | |||
63 | unsigned int irqs[4]; | ||
64 | int num_irqs; | ||
65 | }; | 54 | }; |
66 | #define to_sbus_device(d) container_of(d, struct sbus_dev, ofdev.dev) | 55 | #define to_sbus_device(d) container_of(d, struct sbus_dev, ofdev.dev) |
67 | 56 | ||
@@ -73,10 +62,6 @@ struct sbus_bus { | |||
73 | int prom_node; /* OBP node of SBUS */ | 62 | int prom_node; /* OBP node of SBUS */ |
74 | char prom_name[64]; /* Usually "sbus" or "sbi" */ | 63 | char prom_name[64]; /* Usually "sbus" or "sbi" */ |
75 | int clock_freq; | 64 | int clock_freq; |
76 | |||
77 | struct linux_prom_ranges sbus_ranges[PROMREG_MAX]; | ||
78 | int num_sbus_ranges; | ||
79 | |||
80 | int portid; | 65 | int portid; |
81 | }; | 66 | }; |
82 | #define to_sbus(d) container_of(d, struct sbus_bus, ofdev.dev) | 67 | #define to_sbus(d) container_of(d, struct sbus_bus, ofdev.dev) |
@@ -94,7 +79,6 @@ extern struct sbus_bus *sbus_root; | |||
94 | for ((bus) = sbus_root; (bus); (bus) = (bus)->next) \ | 79 | for ((bus) = sbus_root; (bus); (bus) = (bus)->next) \ |
95 | for ((device) = (bus)->devices; (device); (device) = (device)->next) | 80 | for ((device) = (bus)->devices; (device); (device) = (device)->next) |
96 | 81 | ||
97 | extern void sbus_arch_bus_ranges_init(struct device_node *, struct sbus_bus *); | ||
98 | extern void sbus_setup_iommu(struct sbus_bus *, struct device_node *); | 82 | extern void sbus_setup_iommu(struct sbus_bus *, struct device_node *); |
99 | extern int sbus_arch_preinit(void); | 83 | extern int sbus_arch_preinit(void); |
100 | extern void sbus_arch_postinit(void); | 84 | extern void sbus_arch_postinit(void); |