diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2006-06-23 04:44:10 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-06-24 02:15:43 -0400 |
commit | a2bd4fd17926d715a470fbe0ebe05128ba410984 (patch) | |
tree | 3e39a2f6aaf3a628b955067ef3668cae3456de03 /include/asm-sparc64/isa.h | |
parent | 8cd24ed4f8031636fb5dacb04adee9e02556ecd5 (diff) |
[SPARC64]: Add of_device layer and make ebus/isa use it.
Sparcspkr and power drivers are converted, to make sure it works.
Eventually the SBUS device layer will use this as a sub-class.
I really cannot cut loose on that bit until sparc32 is given the
same infrastructure.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/asm-sparc64/isa.h')
-rw-r--r-- | include/asm-sparc64/isa.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/asm-sparc64/isa.h b/include/asm-sparc64/isa.h index 2e7fb18ec1be..d9728b9031fc 100644 --- a/include/asm-sparc64/isa.h +++ b/include/asm-sparc64/isa.h | |||
@@ -10,10 +10,12 @@ | |||
10 | #include <asm/pbm.h> | 10 | #include <asm/pbm.h> |
11 | #include <asm/oplib.h> | 11 | #include <asm/oplib.h> |
12 | #include <asm/prom.h> | 12 | #include <asm/prom.h> |
13 | #include <asm/of_device.h> | ||
13 | 14 | ||
14 | struct sparc_isa_bridge; | 15 | struct sparc_isa_bridge; |
15 | 16 | ||
16 | struct sparc_isa_device { | 17 | struct sparc_isa_device { |
18 | struct of_device ofdev; | ||
17 | struct sparc_isa_device *next; | 19 | struct sparc_isa_device *next; |
18 | struct sparc_isa_device *child; | 20 | struct sparc_isa_device *child; |
19 | struct sparc_isa_bridge *bus; | 21 | struct sparc_isa_bridge *bus; |
@@ -21,8 +23,10 @@ struct sparc_isa_device { | |||
21 | struct resource resource; | 23 | struct resource resource; |
22 | unsigned int irq; | 24 | unsigned int irq; |
23 | }; | 25 | }; |
26 | #define to_isa_device(d) container_of(d, struct sparc_isa_device, ofdev.dev) | ||
24 | 27 | ||
25 | struct sparc_isa_bridge { | 28 | struct sparc_isa_bridge { |
29 | struct of_device ofdev; | ||
26 | struct sparc_isa_bridge *next; | 30 | struct sparc_isa_bridge *next; |
27 | struct sparc_isa_device *devices; | 31 | struct sparc_isa_device *devices; |
28 | struct pci_pbm_info *parent; | 32 | struct pci_pbm_info *parent; |
@@ -30,6 +34,7 @@ struct sparc_isa_bridge { | |||
30 | int index; | 34 | int index; |
31 | struct device_node *prom_node; | 35 | struct device_node *prom_node; |
32 | }; | 36 | }; |
37 | #define to_isa_bridge(d) container_of(d, struct sparc_isa_bridge, ofdev.dev) | ||
33 | 38 | ||
34 | extern struct sparc_isa_bridge *isa_chain; | 39 | extern struct sparc_isa_bridge *isa_chain; |
35 | 40 | ||