Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 62187
b: refs/heads/master
c: b41912c
h: refs/heads/master
i:
  62185: b93ea7a
  62183: b751302
v: v3
  • Loading branch information
Stephen Rothwell committed Jul 20, 2007
1 parent 63a8cea commit a4cea75
Show file tree
Hide file tree
Showing 7 changed files with 131 additions and 108 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 37b7754aab9a6ad7ecbba45c87f8d8a1f81b3bcc
refs/heads/master: b41912ca345e6de8ec8469d57cd585881271e2b9
38 changes: 6 additions & 32 deletions trunk/include/asm-powerpc/of_platform.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#ifndef _ASM_POWERPC_OF_PLATFORM_H
#define _ASM_POWERPC_OF_PLATFORM_H
/*
* Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corp.
* <benh@kernel.crashing.org>
Expand All @@ -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);
Expand All @@ -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 */
39 changes: 2 additions & 37 deletions trunk/include/asm-sparc/of_device.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 */
32 changes: 32 additions & 0 deletions trunk/include/asm-sparc/of_platform.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#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 */
40 changes: 2 additions & 38 deletions trunk/include/asm-sparc64/of_device.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 */
33 changes: 33 additions & 0 deletions trunk/include/asm-sparc64/of_platform.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#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 */
55 changes: 55 additions & 0 deletions trunk/include/linux/of_platform.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
#ifndef _LINUX_OF_PLATFORM_H
#define _LINUX_OF_PLATFORM_H
/*
* Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corp.
* <benh@kernel.crashing.org>
*
* 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.
*
*/

#include <linux/module.h>
#include <linux/device.h>
#include <linux/mod_devicetable.h>
#include <linux/pm.h>
#include <linux/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) (or ISA, EBUS and SBUS
* busses on sparc).
*/
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)

#include <asm/of_platform.h>

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

#endif /* _LINUX_OF_PLATFORM_H */

0 comments on commit a4cea75

Please sign in to comment.