Commit a4cc5ea4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mips-fixes_5.16_3' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux 

Pull MIPS fix from Thomas Bogendoerfer:

 - only enable pci_remap_iospace() for Ralink devices

* tag 'mips-fixes_5.16_3' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: Only define pci_remap_iospace() for Ralink
parents 713ab911 09d97da6

arch/mips/include/asm/mach-ralink/spaces.h

+2 −0
Original line number Diff line number Diff line
@@ -6,5 +6,7 @@ 
#define PCI_IOSIZE	SZ_64K

#define IO_SPACE_LIMIT	(PCI_IOSIZE - 1)



#define pci_remap_iospace pci_remap_iospace



#include <asm/mach-generic/spaces.h>

#endif

arch/mips/include/asm/pci.h

+0 −4
Original line number Diff line number Diff line
@@ -20,10 +20,6 @@ 
#include <linux/list.h>

#include <linux/of.h>



#ifdef CONFIG_PCI_DRIVERS_GENERIC

#define pci_remap_iospace pci_remap_iospace

#endif



#ifdef CONFIG_PCI_DRIVERS_LEGACY



/*

arch/mips/pci/pci-generic.c

+2 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ void pcibios_fixup_bus(struct pci_bus *bus) 
	pci_read_bridge_bases(bus);

}



#ifdef pci_remap_iospace

int pci_remap_iospace(const struct resource *res, phys_addr_t phys_addr)

{

	unsigned long vaddr;
@@ -60,3 +61,4 @@ int pci_remap_iospace(const struct resource *res, phys_addr_t phys_addr) 
	set_io_port_base(vaddr);

	return 0;

}

#endif