Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0dd394c authored by Jonas Bonn's avatar Jonas Bonn Committed by Grant Likely
Browse files

of: remove of_default_bus_ids 



This list used was by only two platforms with all other platforms defining an
own list of valid bus id's to pass to of_platform_bus_probe.  This patch:

i)   copies the default list to the two platforms that depended on it (powerpc)
ii)  remove the usage of of_default_bus_ids in of_platform_bus_probe
iii) removes the definition of the list from all architectures that defined it

Passing a NULL 'matches' parameter to of_platform_bus_probe is still valid; the
function returns no error in that case as the NULL value is equivalent to an
empty list.

Signed-off-by: default avatarJonas Bonn <jonas@southpole.se>
[grant.likely@secretlab.ca: added __initdata annotations, warn on and return error on missing match table, and fix whitespace errors]
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent c6085584

arch/microblaze/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ extra-y := head.o vmlinux.lds 


obj-y += dma.o exceptions.o \

	hw_exception_handler.o init_task.o intc.o irq.o \

	of_platform.o process.o prom.o prom_parse.o ptrace.o \

	process.o prom.o prom_parse.o ptrace.o \

	setup.o signal.o sys_microblaze.o timer.o traps.o reset.o



obj-y += cpu/

arch/microblaze/kernel/of_platform.c

deleted100644 → 0
+0 −49
Original line number Diff line number Diff line 
/*

 *    Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corp.

 *			 <benh@kernel.crashing.org>

 *    and		 Arnd Bergmann, IBM Corp.

 *

 *  This program is free software; you can redistribute it and/or

 *  modify it under the terms of the GNU General Public License

 *  as published by the Free Software Foundation; either version

 *  2 of the License, or (at your option) any later version.

 *

 */



#undef DEBUG



#include <linux/string.h>

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/module.h>

#include <linux/mod_devicetable.h>

#include <linux/pci.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/of_platform.h>



#include <linux/errno.h>

#include <linux/topology.h>

#include <asm/atomic.h>



/*

 * The list of OF IDs below is used for matching bus types in the

 * system whose devices are to be exposed as of_platform_devices.

 *

 * This is the default list valid for most platforms. This file provides

 * functions who can take an explicit list if necessary though

 *

 * The search is always performed recursively looking for children of

 * the provided device_node and recursively if such a children matches

 * a bus type in the list

 */



const struct of_device_id of_default_bus_ids[] = {

	{ .type = "soc", },

	{ .compatible = "soc", },

	{ .type = "plb5", },

	{ .type = "plb4", },

	{ .type = "opb", },

	{ .type = "simple", },

	{},

};

arch/powerpc/kernel/of_platform.c

+0 −24
Original line number Diff line number Diff line
@@ -28,30 +28,6 @@ 
#include <asm/ppc-pci.h>

#include <asm/atomic.h>



/*

 * The list of OF IDs below is used for matching bus types in the

 * system whose devices are to be exposed as of_platform_devices.

 *

 * This is the default list valid for most platforms. This file provides

 * functions who can take an explicit list if necessary though

 *

 * The search is always performed recursively looking for children of

 * the provided device_node and recursively if such a children matches

 * a bus type in the list

 */



const struct of_device_id of_default_bus_ids[] = {

	{ .type = "soc", },

	{ .compatible = "soc", },

	{ .type = "spider", },

	{ .type = "axon", },

	{ .type = "plb5", },

	{ .type = "plb4", },

	{ .type = "opb", },

	{ .type = "ebc", },

	{},

};



#ifdef CONFIG_PPC_OF_PLATFORM_PCI



/* The probing of PCI controllers from of_platform is currently

arch/powerpc/platforms/cell/qpace_setup.c

+13 −1
Original line number Diff line number Diff line
@@ -61,12 +61,24 @@ static void qpace_progress(char *s, unsigned short hex) 
	printk("*** %04x : %s\n", hex, s ? s : "");

}



static const struct of_device_id qpace_bus_ids[] __initdata = {

	{ .type = "soc", },

	{ .compatible = "soc", },

	{ .type = "spider", },

	{ .type = "axon", },

	{ .type = "plb5", },

	{ .type = "plb4", },

	{ .type = "opb", },

	{ .type = "ebc", },

	{},

};



static int __init qpace_publish_devices(void)

{

	int node;



	/* Publish OF platform devices for southbridge IOs */

	of_platform_bus_probe(NULL, NULL, NULL);

	of_platform_bus_probe(NULL, qpace_bus_ids, NULL);



	/* There is no device for the MIC memory controller, thus we create

	 * a platform device for it to attach the EDAC driver to.

arch/powerpc/platforms/cell/setup.c

+13 −1
Original line number Diff line number Diff line
@@ -141,6 +141,18 @@ static int __devinit cell_setup_phb(struct pci_controller *phb) 
	return 0;

}



static const struct of_device_id cell_bus_ids[] __initdata = {

	{ .type = "soc", },

	{ .compatible = "soc", },

	{ .type = "spider", },

	{ .type = "axon", },

	{ .type = "plb5", },

	{ .type = "plb4", },

	{ .type = "opb", },

	{ .type = "ebc", },

	{},

};



static int __init cell_publish_devices(void)

{

	struct device_node *root = of_find_node_by_path("/");
@@ -148,7 +160,7 @@ static int __init cell_publish_devices(void) 
	int node;



	/* Publish OF platform devices for southbridge IOs */

	of_platform_bus_probe(NULL, NULL, NULL);

	of_platform_bus_probe(NULL, cell_bus_ids, NULL);



	/* On spider based blades, we need to manually create the OF

	 * platform devices for the PCI host bridges