--- zzzz-none-000/linux-3.10.107/arch/mips/include/asm/prom.h 2017-06-27 09:49:32.000000000 +0000 +++ scorpion-7490-727/linux-3.10.107/arch/mips/include/asm/prom.h 2021-02-04 17:41:59.000000000 +0000 @@ -11,38 +11,18 @@ #ifndef __ASM_PROM_H #define __ASM_PROM_H -#ifdef CONFIG_OF +#ifdef CONFIG_USE_OF #include #include #include #include -extern int early_init_dt_scan_memory_arch(unsigned long node, - const char *uname, int depth, void *data); - extern void device_tree_init(void); -static inline unsigned long pci_address_to_pio(phys_addr_t address) -{ - /* - * The ioport address can be directly used by inX() / outX() - */ - BUG_ON(address > IO_SPACE_LIMIT); - - return (unsigned long) address; -} -#define pci_address_to_pio pci_address_to_pio - struct boot_param_header; -extern void __dt_setup_arch(struct boot_param_header *bph); - -#define dt_setup_arch(sym) \ -({ \ - extern struct boot_param_header __dtb_##sym##_begin; \ - \ - __dt_setup_arch(&__dtb_##sym##_begin); \ -}) +extern void __dt_setup_arch(void *bph); +extern int __dt_register_buses(const char *bus0, const char *bus1); #else /* CONFIG_OF */ static inline void device_tree_init(void) { }