Commit 94c09319 authored by Grant Likely's avatar Grant Likely
Browse files

of: Merge of_device_alloc() and of_device_make_bus_id() 



This patch merges the common routines of_device_alloc() and
of_device_make_bus_id() from powerpc and microblaze.

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
CC: Michal Simek <monstr@monstr.eu>
CC: Grant Likely <grant.likely@secretlab.ca>
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: Stephen Rothwell <sfr@canb.auug.org.au>
CC: microblaze-uclinux@itee.uq.edu.au
CC: linuxppc-dev@ozlabs.org
CC: devicetree-discuss@lists.ozlabs.org
parent 5fd200f3

arch/microblaze/include/asm/of_device.h

+0 −15
Original line number Diff line number Diff line
@@ -10,19 +10,4 @@ 


#ifndef _ASM_MICROBLAZE_OF_DEVICE_H

#define _ASM_MICROBLAZE_OF_DEVICE_H

#ifdef __KERNEL__



#include <linux/device.h>

#include <linux/of.h>



extern struct of_device *of_device_alloc(struct device_node *np,

					 const char *bus_id,

					 struct device *parent);



extern void of_device_make_bus_id(struct of_device *dev);



/* This is just here during the transition */

#include <linux/of_device.h>



#endif /* __KERNEL__ */

#endif /* _ASM_MICROBLAZE_OF_DEVICE_H */

arch/microblaze/kernel/Makefile

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



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

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

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

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

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

arch/microblaze/kernel/of_device.c

deleted100644 → 0
+0 −64
Original line number Diff line number Diff line 
#include <linux/string.h>

#include <linux/kernel.h>

#include <linux/of.h>

#include <linux/init.h>

#include <linux/module.h>

#include <linux/mod_devicetable.h>

#include <linux/slab.h>

#include <linux/of_device.h>



#include <linux/errno.h>



void of_device_make_bus_id(struct of_device *dev)

{

	static atomic_t bus_no_reg_magic;

	struct device_node *node = dev->dev.of_node;

	const u32 *reg;

	u64 addr;

	int magic;



	/*

	 * For MMIO, get the physical address

	 */

	reg = of_get_property(node, "reg", NULL);

	if (reg) {

		addr = of_translate_address(node, reg);

		if (addr != OF_BAD_ADDR) {

			dev_set_name(&dev->dev, "%llx.%s",

				     (unsigned long long)addr, node->name);

			return;

		}

	}



	/*

	 * No BusID, use the node name and add a globally incremented

	 * counter (and pray...)

	 */

	magic = atomic_add_return(1, &bus_no_reg_magic);

	dev_set_name(&dev->dev, "%s.%d", node->name, magic - 1);

}

EXPORT_SYMBOL(of_device_make_bus_id);



struct of_device *of_device_alloc(struct device_node *np,

				  const char *bus_id,

				  struct device *parent)

{

	struct of_device *dev;



	dev = kzalloc(sizeof(*dev), GFP_KERNEL);

	if (!dev)

		return NULL;



	dev->dev.of_node = of_node_get(np);

	dev->dev.dma_mask = &dev->archdata.dma_mask;

	dev->dev.parent = parent;

	dev->dev.release = of_release_dev;



	if (bus_id)

		dev_set_name(&dev->dev, bus_id);

	else

		of_device_make_bus_id(dev);



	return dev;

}

EXPORT_SYMBOL(of_device_alloc);

arch/powerpc/include/asm/of_device.h

+0 −10
Original line number Diff line number Diff line 
#ifndef _ASM_POWERPC_OF_DEVICE_H

#define _ASM_POWERPC_OF_DEVICE_H

#ifdef __KERNEL__



#include <linux/device.h>

#include <linux/of.h>



extern struct of_device *of_device_alloc(struct device_node *np,

					 const char *bus_id,

					 struct device *parent);



#endif /* __KERNEL__ */

#endif /* _ASM_POWERPC_OF_DEVICE_H */

arch/powerpc/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ obj-$(CONFIG_PPC_BOOK3E_64) += exceptions-64e.o 
obj-$(CONFIG_PPC64)		+= vdso64/

obj-$(CONFIG_ALTIVEC)		+= vecemu.o

obj-$(CONFIG_PPC_970_NAP)	+= idle_power4.o

obj-$(CONFIG_PPC_OF)		+= of_device.o of_platform.o prom_parse.o

obj-$(CONFIG_PPC_OF)		+= of_platform.o prom_parse.o

obj-$(CONFIG_PPC_CLOCK)		+= clock.o

procfs-y			:= proc_powerpc.o

obj-$(CONFIG_PROC_FS)		+= $(procfs-y)

CRA Git | Maintained and supported by SUSTech CRA and CCSE