diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2005-11-23 01:56:06 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-01-08 22:49:50 -0500 |
commit | 463ce0e103f419f51b1769111e73fe8bb305d0ec (patch) | |
tree | b4ffced87b886d81b518790fcaf841dd006e8068 /include | |
parent | d1405b869850982f05c7ec0d3f137ca27588192f (diff) |
[PATCH] powerpc: serial port discovery (#2)
This moves the discovery of legacy serial ports to a separate file,
makes it common to ppc32 and ppc64, and reworks it to use the new OF
address translators to get to the ports early. This new version can also
detect some PCI serial cards using legacy chips and will probably match
those discovered port with the default console choice.
Only ppc64 gets udbg still yet, unifying udbg isn't finished yet.
It also adds some speed-probing code to udbg so that the default console
can come up at the same speed it was set to by the firmware.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-powerpc/pci-bridge.h | 3 | ||||
-rw-r--r-- | include/asm-powerpc/serial.h | 2 | ||||
-rw-r--r-- | include/asm-powerpc/udbg.h | 5 |
3 files changed, 9 insertions, 1 deletions
diff --git a/include/asm-powerpc/pci-bridge.h b/include/asm-powerpc/pci-bridge.h index 223ec7bd81da..89e73fcd58bb 100644 --- a/include/asm-powerpc/pci-bridge.h +++ b/include/asm-powerpc/pci-bridge.h | |||
@@ -140,6 +140,9 @@ static inline struct pci_controller *pci_bus_to_host(struct pci_bus *bus) | |||
140 | return PCI_DN(busdn)->phb; | 140 | return PCI_DN(busdn)->phb; |
141 | } | 141 | } |
142 | 142 | ||
143 | extern struct pci_controller* | ||
144 | pci_find_hose_for_OF_device(struct device_node* node); | ||
145 | |||
143 | extern struct pci_controller * | 146 | extern struct pci_controller * |
144 | pcibios_alloc_controller(struct device_node *dev); | 147 | pcibios_alloc_controller(struct device_node *dev); |
145 | extern void pcibios_free_controller(struct pci_controller *phb); | 148 | extern void pcibios_free_controller(struct pci_controller *phb); |
diff --git a/include/asm-powerpc/serial.h b/include/asm-powerpc/serial.h index b273d630b32f..6dc9546d6908 100644 --- a/include/asm-powerpc/serial.h +++ b/include/asm-powerpc/serial.h | |||
@@ -15,4 +15,6 @@ | |||
15 | /* Default baud base if not found in device-tree */ | 15 | /* Default baud base if not found in device-tree */ |
16 | #define BASE_BAUD ( 1843200 / 16 ) | 16 | #define BASE_BAUD ( 1843200 / 16 ) |
17 | 17 | ||
18 | extern void find_legacy_serial_ports(void); | ||
19 | |||
18 | #endif /* _PPC64_SERIAL_H */ | 20 | #endif /* _PPC64_SERIAL_H */ |
diff --git a/include/asm-powerpc/udbg.h b/include/asm-powerpc/udbg.h index a383383bc4d4..4049a96dc43d 100644 --- a/include/asm-powerpc/udbg.h +++ b/include/asm-powerpc/udbg.h | |||
@@ -24,7 +24,10 @@ extern int udbg_read(char *buf, int buflen); | |||
24 | extern void register_early_udbg_console(void); | 24 | extern void register_early_udbg_console(void); |
25 | extern void udbg_printf(const char *fmt, ...); | 25 | extern void udbg_printf(const char *fmt, ...); |
26 | 26 | ||
27 | extern void udbg_init_uart(void __iomem *comport, unsigned int speed); | 27 | extern void udbg_init_uart(void __iomem *comport, unsigned int speed, |
28 | unsigned int clock); | ||
29 | extern unsigned int udbg_probe_uart_speed(void __iomem *comport, | ||
30 | unsigned int clock); | ||
28 | 31 | ||
29 | struct device_node; | 32 | struct device_node; |
30 | extern void udbg_init_scc(struct device_node *np); | 33 | extern void udbg_init_scc(struct device_node *np); |