Commit 9ade1217 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: pci: Drop asm-generic/pci.h, so we can use our own fixups. 



The new PCI code wants its own bus<->resource mappings instead of the
generic equivalents, so drop the asm-generic include in preparation.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 62c7ae87

arch/sh/drivers/pci/pci.c

+14 −0
Original line number Diff line number Diff line
@@ -72,6 +72,20 @@ void __devinit __weak pcibios_fixup_bus(struct pci_bus *bus) 
	pci_read_bridge_bases(bus);

}



void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,

			     struct resource *res)

{

	region->start = res->start;

	region->end = res->end;

}



void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,

			     struct pci_bus_region *region)

{

	res->start = region->start;

	res->end = region->end;

}



void pcibios_align_resource(void *data, struct resource *res,

			    resource_size_t size, resource_size_t align)

			    __attribute__ ((weak));

arch/sh/include/asm/pci.h

+24 −3
Original line number Diff line number Diff line
@@ -146,13 +146,34 @@ int pcibios_map_platform_irq(struct pci_dev *dev, u8 slot, u8 pin); 
int pciauto_assign_resources(int busno, struct pci_channel *hose);

#endif



#endif /* __KERNEL__ */

extern void pcibios_resource_to_bus(struct pci_dev *dev,

	struct pci_bus_region *region, struct resource *res);



extern void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,

				    struct pci_bus_region *region);



static inline struct resource *

pcibios_select_root(struct pci_dev *pdev, struct resource *res)

{

	struct resource *root = NULL;



	if (res->flags & IORESOURCE_IO)

		root = &ioport_resource;

	if (res->flags & IORESOURCE_MEM)

		root = &iomem_resource;



/* generic pci stuff */

#include <asm-generic/pci.h>

	return root;

}



/* Chances are this interrupt is wired PC-style ...  */

static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)

{

	return channel ? 15 : 14;

}



/* generic DMA-mapping stuff */

#include <asm-generic/pci-dma-compat.h>



#endif /* __KERNEL__ */

#endif /* __ASM_SH_PCI_H */