V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

dm: gpio: sandbox: Drop request()/free() in the driver 

Now that the uclass supports gpio_request/free() there is no need for the
driver to implement it too. Drop this unnecessary code.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2014-10-04 11:29:47 -06:00
parent 62cb89d5eb
commit 5e0bbd61df
1 changed files with 0 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
drivers/gpio/sandbox.c
View File

@ -14,7 +14,6 @@ DECLARE_GLOBAL_DATA_PTR;
/* Flags for each GPIO */ /* Flags for each GPIO */
#define GPIOF_OUTPUT (1 << 0) /* Currently set as an output */ #define GPIOF_OUTPUT (1 << 0) /* Currently set as an output */
#define GPIOF_HIGH (1 << 1) /* Currently set high */ #define GPIOF_HIGH (1 << 1) /* Currently set high */
#define GPIOF_RESERVED (1 << 2) /* Is in use / requested */
struct gpio_state { struct gpio_state {
const char *label; /* label given by requester */ const char *label; /* label given by requester */
@ -54,18 +53,6 @@ static int set_gpio_flag(struct udevice *dev, unsigned offset, int flag,
return 0; return 0;
} }
static int check_reserved(struct udevice *dev, unsigned offset,
const char *func)
{
if (!get_gpio_flag(dev, offset, GPIOF_RESERVED)) {
printf("sandbox_gpio: %s: error: offset %u not reserved\n",
func, offset);
return -1;
}
return 0;
}
/* /*
* Back-channel sandbox-internal-only access to GPIO state * Back-channel sandbox-internal-only access to GPIO state
*/ */
@ -101,9 +88,6 @@ static int sb_gpio_direction_input(struct udevice *dev, unsigned offset)
{ {
debug("%s: offset:%u\n", __func__, offset); debug("%s: offset:%u\n", __func__, offset);
if (check_reserved(dev, offset, __func__))
return -1;
return sandbox_gpio_set_direction(dev, offset, 0); return sandbox_gpio_set_direction(dev, offset, 0);
} }
@ -113,9 +97,6 @@ static int sb_gpio_direction_output(struct udevice *dev, unsigned offset,
{ {
debug("%s: offset:%u, value = %d\n", __func__, offset, value); debug("%s: offset:%u, value = %d\n", __func__, offset, value);
if (check_reserved(dev, offset, __func__))
return -1;
return sandbox_gpio_set_direction(dev, offset, 1) | return sandbox_gpio_set_direction(dev, offset, 1) |
sandbox_gpio_set_value(dev, offset, value); sandbox_gpio_set_value(dev, offset, value);
} }
@ -125,9 +106,6 @@ static int sb_gpio_get_value(struct udevice *dev, unsigned offset)
{ {
debug("%s: offset:%u\n", __func__, offset); debug("%s: offset:%u\n", __func__, offset);
if (check_reserved(dev, offset, __func__))
return -1;
return sandbox_gpio_get_value(dev, offset); return sandbox_gpio_get_value(dev, offset);
} }
@ -136,9 +114,6 @@ static int sb_gpio_set_value(struct udevice *dev, unsigned offset, int value)
{ {
debug("%s: offset:%u, value = %d\n", __func__, offset, value); debug("%s: offset:%u, value = %d\n", __func__, offset, value);
if (check_reserved(dev, offset, __func__))
return -1;
if (!sandbox_gpio_get_direction(dev, offset)) { if (!sandbox_gpio_get_direction(dev, offset)) {
printf("sandbox_gpio: error: set_value on input gpio %u\n", printf("sandbox_gpio: error: set_value on input gpio %u\n",
offset); offset);
@ -148,61 +123,6 @@ static int sb_gpio_set_value(struct udevice *dev, unsigned offset, int value)
return sandbox_gpio_set_value(dev, offset, value); return sandbox_gpio_set_value(dev, offset, value);
} }
static int sb_gpio_request(struct udevice *dev, unsigned offset,
const char *label)
{
struct gpio_dev_priv *uc_priv = dev->uclass_priv;
struct gpio_state *state = dev_get_priv(dev);
debug("%s: offset:%u, label:%s\n", __func__, offset, label);
if (offset >= uc_priv->gpio_count) {
printf("sandbox_gpio: error: invalid gpio %u\n", offset);
return -1;
}
if (get_gpio_flag(dev, offset, GPIOF_RESERVED)) {
printf("sandbox_gpio: error: gpio %u already reserved\n",
offset);
return -1;
}
state[offset].label = label;
return set_gpio_flag(dev, offset, GPIOF_RESERVED, 1);
}
static int sb_gpio_free(struct udevice *dev, unsigned offset)
{
struct gpio_state *state = dev_get_priv(dev);
debug("%s: offset:%u\n", __func__, offset);
if (check_reserved(dev, offset, __func__))
return -1;
state[offset].label = NULL;
return set_gpio_flag(dev, offset, GPIOF_RESERVED, 0);
}
static int sb_gpio_get_state(struct udevice *dev, unsigned int offset,
char *buf, int bufsize)
{
struct gpio_dev_priv *uc_priv = dev->uclass_priv;
struct gpio_state *state = dev_get_priv(dev);
const char *label;
label = state[offset].label;
snprintf(buf, bufsize, "%s%d: %s: %d [%c]%s%s",
uc_priv->bank_name ? uc_priv->bank_name : "", offset,
sandbox_gpio_get_direction(dev, offset) ? "out" : " in",
sandbox_gpio_get_value(dev, offset),
get_gpio_flag(dev, offset, GPIOF_RESERVED) ? 'x' : ' ',
label ? " " : "",
label ? label : "");
return 0;
}
static int sb_gpio_get_function(struct udevice *dev, unsigned offset) static int sb_gpio_get_function(struct udevice *dev, unsigned offset)
{ {
if (get_gpio_flag(dev, offset, GPIOF_OUTPUT)) if (get_gpio_flag(dev, offset, GPIOF_OUTPUT))
@ -211,8 +131,6 @@ static int sb_gpio_get_function(struct udevice *dev, unsigned offset)
} }
static const struct dm_gpio_ops gpio_sandbox_ops = { static const struct dm_gpio_ops gpio_sandbox_ops = {
.request = sb_gpio_request,
.free = sb_gpio_free,
.direction_input = sb_gpio_direction_input, .direction_input = sb_gpio_direction_input,
.direction_output = sb_gpio_direction_output, .direction_output = sb_gpio_direction_output,
.get_value = sb_gpio_get_value, .get_value = sb_gpio_get_value,