[POWERPC] modify PCI code for a merged kernel (eecba334) · Commits · e / devices / android_kernel_fairphone_FP4

arch/powerpc/kernel/pci_64.c

+30 −28

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@
		#include <asm/byteorder.h>
		#include <asm/machdep.h>
		#include <asm/ppc-pci.h>
		#include <asm/firmware.h>

		#ifdef DEBUG
		#include <asm/udbg.h>
		@@ -209,7 +210,6 @@ void pcibios_free_controller(struct pci_controller *phb)
		kfree(phb);
		}

		#ifndef CONFIG_PPC_ISERIES
		void __devinit pcibios_claim_one_bus(struct pci_bus *b)
		{
		struct pci_dev *dev;
		@@ -238,10 +238,12 @@ static void __init pcibios_claim_of_setup(void)
		{
		struct pci_bus *b;

		if (firmware_has_feature(FW_FEATURE_ISERIES))
		return;

		list_for_each_entry(b, &pci_root_buses, node)
		pcibios_claim_one_bus(b);
		}
		#endif

		#ifdef CONFIG_PPC_MULTIPLATFORM
		static u32 get_int_prop(struct device_node np, const char name, u32 def)
		@@ -554,9 +556,8 @@ static int __init pcibios_init(void)
		*/
		ppc_md.phys_mem_access_prot = pci_phys_mem_access_prot;

		#ifdef CONFIG_PPC_ISERIES
		if (firmware_has_feature(FW_FEATURE_ISERIES))
		iSeries_pcibios_init();
		#endif

		printk(KERN_DEBUG "PCI: Probing PCI hardware\n");

		@@ -566,7 +567,7 @@ static int __init pcibios_init(void)
		pci_bus_add_devices(hose->bus);
		}

		#ifndef CONFIG_PPC_ISERIES
		if (!firmware_has_feature(FW_FEATURE_ISERIES)) {
		if (pci_probe_only)
		pcibios_claim_of_setup();
		else
		@@ -574,7 +575,7 @@ static int __init pcibios_init(void)
		pci_assign_unassigned_resources() is able to work
		correctly with [partially] allocated PCI tree. */
		pci_assign_unassigned_resources();
		#endif /* !CONFIG_PPC_ISERIES */
		}

		/* Call machine dependent final fixup */
		if (ppc_md.pcibios_fixup)
		@@ -586,6 +587,7 @@ static int __init pcibios_init(void)
		printk(KERN_DEBUG "ISA bridge at %s\n", pci_name(ppc64_isabridge_dev));

		#ifdef CONFIG_PPC_MULTIPLATFORM
		if (!firmware_has_feature(FW_FEATURE_ISERIES))
		/* map in PCI I/O space */
		phbs_remap_io();
		#endif
		@@ -637,13 +639,13 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
		*/
		int pci_domain_nr(struct pci_bus *bus)
		{
		#ifdef CONFIG_PPC_ISERIES
		if (firmware_has_feature(FW_FEATURE_ISERIES))
		return 0;
		#else
		else {
		struct pci_controller *hose = pci_bus_to_host(bus);

		return hose->global_number;
		#endif
		}
		}

		EXPORT_SYMBOL(pci_domain_nr);
		@@ -651,12 +653,12 @@ EXPORT_SYMBOL(pci_domain_nr);
		/* Decide whether to display the domain number in /proc */
		int pci_proc_domain(struct pci_bus *bus)
		{
		#ifdef CONFIG_PPC_ISERIES
		if (firmware_has_feature(FW_FEATURE_ISERIES))
		return 0;
		#else
		else {
		struct pci_controller *hose = pci_bus_to_host(bus);
		return hose->buid;
		#endif
		}
		}

		/*

arch/powerpc/platforms/iseries/pci.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -262,10 +262,6 @@ void __init iSeries_pci_final_fixup(void)
		mf_display_src(0xC9000200);
		}

		void pcibios_fixup_bus(struct pci_bus *PciBus)
		{
		}

		void pcibios_fixup_resources(struct pci_dev *pdev)
		{
		}