linux-sunxi/u-boot-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/u-boot-sunxi.git synced 2024-02-12 11:16:03 +08:00
Code Issues Projects Releases Wiki Activity

dm: rename device struct to udevice

Browse Source 
using UBI and DM together leads in compiler error, as
both define a "struct device", so rename "struct device"
in include/dm/device.h to "struct udevice", as we use
linux code (MTD/UBI/UBIFS some USB code,...) and cannot
change the linux "struct device"

Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Marek Vasut <marex@denx.de>
This commit is contained in:
Heiko Schocher
2014-05-22 12:43:05 +02:00
committed by Tom Rini
parent 9665fa8f9e
commit 54c5d08a09
30 changed files with 193 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/asm-generic/gpio.h
View File

@ -86,7 +86,7 @@ enum {
GPIOF_UNKNOWN,
};
struct device;
struct udevice;
/**
* struct struct dm_gpio_ops - Driver model GPIO operations
@ -116,15 +116,15 @@ struct device;
* all devices. Be careful not to confuse offset with gpio in the parameters.
*/
struct dm_gpio_ops {
int (*request)(struct device *dev, unsigned offset, const char *label);
int (*free)(struct device *dev, unsigned offset);
int (*direction_input)(struct device *dev, unsigned offset);
int (*direction_output)(struct device *dev, unsigned offset,
int (*request)(struct udevice *dev, unsigned offset, const char *label);
int (*free)(struct udevice *dev, unsigned offset);
int (*direction_input)(struct udevice *dev, unsigned offset);
int (*direction_output)(struct udevice *dev, unsigned offset,
int value);
int (*get_value)(struct device *dev, unsigned offset);
int (*set_value)(struct device *dev, unsigned offset, int value);
int (*get_function)(struct device *dev, unsigned offset);
int (*get_state)(struct device *dev, unsigned offset, char *state,
int (*get_value)(struct udevice *dev, unsigned offset);
int (*set_value)(struct udevice *dev, unsigned offset, int value);
int (*get_function)(struct udevice *dev, unsigned offset);
int (*get_state)(struct udevice *dev, unsigned offset, char *state,
int maxlen);
};
@ -166,7 +166,7 @@ struct gpio_dev_priv {
* @offset_count: Returns number of GPIOs within this bank
* @return bank name of this device
*/
const char *gpio_get_bank_info(struct device *dev, int *offset_count);
const char *gpio_get_bank_info(struct udevice *dev, int *offset_count);
/**
* gpio_lookup_name - Look up a GPIO name and return its details
@ -179,7 +179,7 @@ const char *gpio_get_bank_info(struct device *dev, int *offset_count);
* @offsetp: Returns the offset number within this device
* @gpiop: Returns the absolute GPIO number, numbered from 0
*/
int gpio_lookup_name(const char *name, struct device **devp,
int gpio_lookup_name(const char *name, struct udevice **devp,
unsigned int *offsetp, unsigned int *gpiop);
#endif /* _ASM_GENERIC_GPIO_H_ */