Commit b41912ca authored by Stephen Rothwell's avatar Stephen Rothwell
Browse files

Create linux/of_platorm.h 



Move common stuff from asm-powerpc/of_platform.h to here and
move the common bits from asm-sparc*/of_device.h here as well.

Create asm-sparc*/of_platform.h and move appropriate parts of
of_device.h to them.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Acked-by: default avatarPaul Mackerras <paulus@samba.org>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 37b7754a

include/asm-powerpc/of_platform.h

+6 −32
Original line number Diff line number Diff line 
#ifndef _ASM_POWERPC_OF_PLATFORM_H

#define _ASM_POWERPC_OF_PLATFORM_H

/*

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

 *			 <benh@kernel.crashing.org>
@@ -9,37 +11,8 @@ 
 *

 */



#include <asm/of_device.h>



/*

 * The of_platform_bus_type is a bus type used by drivers that do not

 * attach to a macio or similar bus but still use OF probing

 * mechanism

 */

extern struct bus_type of_platform_bus_type;



/*

 * An of_platform_driver driver is attached to a basic of_device on

 * the "platform bus" (of_platform_bus_type)

 */

struct of_platform_driver

{

	char			*name;

	struct of_device_id	*match_table;

	struct module		*owner;



	int	(*probe)(struct of_device* dev,

			 const struct of_device_id *match);

	int	(*remove)(struct of_device* dev);



	int	(*suspend)(struct of_device* dev, pm_message_t state);

	int	(*resume)(struct of_device* dev);

	int	(*shutdown)(struct of_device* dev);



	struct device_driver	driver;

};

#define	to_of_platform_driver(drv) \

	container_of(drv,struct of_platform_driver, driver)

/* This is just here during the transition */

#include <linux/of_platform.h>



/* Platform drivers register/unregister */

extern int of_register_platform_driver(struct of_platform_driver *drv);
@@ -56,5 +29,6 @@ extern int of_platform_bus_probe(struct device_node *root, 
				 struct of_device_id *matches,

				 struct device *parent);



extern struct of_device *of_find_device_by_node(struct device_node *np);

extern struct of_device *of_find_device_by_phandle(phandle ph);



#endif	/* _ASM_POWERPC_OF_PLATFORM_H */

include/asm-sparc/of_device.h

+2 −37
Original line number Diff line number Diff line
@@ -7,11 +7,6 @@ 
#include <linux/mod_devicetable.h>

#include <asm/openprom.h>



extern struct bus_type ebus_bus_type;

extern struct bus_type sbus_bus_type;

extern struct bus_type of_platform_bus_type;

#define of_bus_type	of_platform_bus_type	/* for compatibility */



/*

 * The of_device is a kind of "base class" that is a superset of

 * struct device for use by devices attached to an OF node and
@@ -35,39 +30,9 @@ struct of_device 
extern void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name);

extern void of_iounmap(struct resource *res, void __iomem *base, unsigned long size);



extern struct of_device *of_find_device_by_node(struct device_node *);



/*

 * An of_platform_driver driver is attached to a basic of_device on

 * the ISA, EBUS, and SBUS busses on sparc64.

 */

struct of_platform_driver

{

	char			*name;

	struct of_device_id	*match_table;

	struct module		*owner;



	int	(*probe)(struct of_device* dev, const struct of_device_id *match);

	int	(*remove)(struct of_device* dev);



	int	(*suspend)(struct of_device* dev, pm_message_t state);

	int	(*resume)(struct of_device* dev);

	int	(*shutdown)(struct of_device* dev);



	struct device_driver	driver;

};

#define	to_of_platform_driver(drv) container_of(drv,struct of_platform_driver, driver)



extern int of_register_driver(struct of_platform_driver *drv,

			      struct bus_type *bus);

extern void of_unregister_driver(struct of_platform_driver *drv);

extern struct of_device *of_platform_device_create(struct device_node *np,

						   const char *bus_id,

						   struct device *parent,

						   struct bus_type *bus);



/* This is just here during the transition */

/* These are just here during the transition */

#include <linux/of_device.h>

#include <linux/of_platform.h>



#endif /* __KERNEL__ */

#endif /* _ASM_SPARC_OF_DEVICE_H */

include/asm-sparc/of_platform.h

0 → 100644
+32 −0
Original line number Diff line number Diff line 
#ifndef _ASM_SPARC_OF_PLATFORM_H

#define _ASM_SPARC_OF_PLATFORM_H

/*

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

 *			 <benh@kernel.crashing.org>

 *    Modified for Sparc by merging parts of asm-sparc/of_device.h

 *		by Stephen Rothwell

 *

 *  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.

 *

 */



/* This is just here during the transition */

#include <linux/of_platform.h>



extern struct bus_type ebus_bus_type;

extern struct bus_type sbus_bus_type;

extern struct bus_type of_platform_bus_type;

#define of_bus_type	of_platform_bus_type	/* for compatibility */



extern int of_register_driver(struct of_platform_driver *drv,

			      struct bus_type *bus);

extern void of_unregister_driver(struct of_platform_driver *drv);

extern struct of_device *of_platform_device_create(struct device_node *np,

						   const char *bus_id,

						   struct device *parent,

						   struct bus_type *bus);



#endif	/* _ASM_SPARC_OF_PLATFORM_H */

include/asm-sparc64/of_device.h

+2 −38
Original line number Diff line number Diff line
@@ -7,12 +7,6 @@ 
#include <linux/mod_devicetable.h>

#include <asm/openprom.h>



extern struct bus_type isa_bus_type;

extern struct bus_type ebus_bus_type;

extern struct bus_type sbus_bus_type;

extern struct bus_type of_platform_bus_type;

#define of_bus_type	of_platform_bus_type	/* for compatibility */



/*

 * The of_device is a kind of "base class" that is a superset of

 * struct device for use by devices attached to an OF node and
@@ -36,39 +30,9 @@ struct of_device 
extern void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name);

extern void of_iounmap(struct resource *res, void __iomem *base, unsigned long size);



extern struct of_device *of_find_device_by_node(struct device_node *);



/*

 * An of_platform_driver driver is attached to a basic of_device on

 * the ISA, EBUS, and SBUS busses on sparc64.

 */

struct of_platform_driver

{

	char			*name;

	struct of_device_id	*match_table;

	struct module		*owner;



	int	(*probe)(struct of_device* dev, const struct of_device_id *match);

	int	(*remove)(struct of_device* dev);



	int	(*suspend)(struct of_device* dev, pm_message_t state);

	int	(*resume)(struct of_device* dev);

	int	(*shutdown)(struct of_device* dev);



	struct device_driver	driver;

};

#define	to_of_platform_driver(drv) container_of(drv,struct of_platform_driver, driver)



extern int of_register_driver(struct of_platform_driver *drv,

			      struct bus_type *bus);

extern void of_unregister_driver(struct of_platform_driver *drv);

extern struct of_device *of_platform_device_create(struct device_node *np,

						   const char *bus_id,

						   struct device *parent,

						   struct bus_type *bus);



/* This is just here during the transition */

/* These are just here during the transition */

#include <linux/of_device.h>

#include <linux/of_platform.h>



#endif /* __KERNEL__ */

#endif /* _ASM_SPARC64_OF_DEVICE_H */

include/asm-sparc64/of_platform.h

0 → 100644
+33 −0
Original line number Diff line number Diff line 
#ifndef _ASM_SPARC64_OF_PLATFORM_H

#define _ASM_SPARC64_OF_PLATFORM_H

/*

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

 *			 <benh@kernel.crashing.org>

 *    Modified for Sparc by merging parts of asm-sparc/of_device.h

 *		by Stephen Rothwell

 *

 *  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.

 *

 */



/* This is just here during the transition */

#include <linux/of_platform.h>



extern struct bus_type isa_bus_type;

extern struct bus_type ebus_bus_type;

extern struct bus_type sbus_bus_type;

extern struct bus_type of_platform_bus_type;

#define of_bus_type	of_platform_bus_type	/* for compatibility */



extern int of_register_driver(struct of_platform_driver *drv,

			      struct bus_type *bus);

extern void of_unregister_driver(struct of_platform_driver *drv);

extern struct of_device *of_platform_device_create(struct device_node *np,

						   const char *bus_id,

						   struct device *parent,

						   struct bus_type *bus);



#endif	/* _ASM_SPARC64_OF_PLATFORM_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE