|
@@ -22,7 +22,7 @@ struct gpio_state {
|
|
|
};
|
|
|
|
|
|
/* Access routines for GPIO state */
|
|
|
-static u8 *get_gpio_flags(struct device *dev, unsigned offset)
|
|
|
+static u8 *get_gpio_flags(struct udevice *dev, unsigned offset)
|
|
|
{
|
|
|
struct gpio_dev_priv *uc_priv = dev->uclass_priv;
|
|
|
struct gpio_state *state = dev_get_priv(dev);
|
|
@@ -36,12 +36,12 @@ static u8 *get_gpio_flags(struct device *dev, unsigned offset)
|
|
|
return &state[offset].flags;
|
|
|
}
|
|
|
|
|
|
-static int get_gpio_flag(struct device *dev, unsigned offset, int flag)
|
|
|
+static int get_gpio_flag(struct udevice *dev, unsigned offset, int flag)
|
|
|
{
|
|
|
return (*get_gpio_flags(dev, offset) & flag) != 0;
|
|
|
}
|
|
|
|
|
|
-static int set_gpio_flag(struct device *dev, unsigned offset, int flag,
|
|
|
+static int set_gpio_flag(struct udevice *dev, unsigned offset, int flag,
|
|
|
int value)
|
|
|
{
|
|
|
u8 *gpio = get_gpio_flags(dev, offset);
|
|
@@ -54,7 +54,7 @@ static int set_gpio_flag(struct device *dev, unsigned offset, int flag,
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static int check_reserved(struct device *dev, unsigned offset,
|
|
|
+static int check_reserved(struct udevice *dev, unsigned offset,
|
|
|
const char *func)
|
|
|
{
|
|
|
if (!get_gpio_flag(dev, offset, GPIOF_RESERVED)) {
|
|
@@ -70,24 +70,24 @@ static int check_reserved(struct device *dev, unsigned offset,
|
|
|
* Back-channel sandbox-internal-only access to GPIO state
|
|
|
*/
|
|
|
|
|
|
-int sandbox_gpio_get_value(struct device *dev, unsigned offset)
|
|
|
+int sandbox_gpio_get_value(struct udevice *dev, unsigned offset)
|
|
|
{
|
|
|
if (get_gpio_flag(dev, offset, GPIOF_OUTPUT))
|
|
|
debug("sandbox_gpio: get_value on output gpio %u\n", offset);
|
|
|
return get_gpio_flag(dev, offset, GPIOF_HIGH);
|
|
|
}
|
|
|
|
|
|
-int sandbox_gpio_set_value(struct device *dev, unsigned offset, int value)
|
|
|
+int sandbox_gpio_set_value(struct udevice *dev, unsigned offset, int value)
|
|
|
{
|
|
|
return set_gpio_flag(dev, offset, GPIOF_HIGH, value);
|
|
|
}
|
|
|
|
|
|
-int sandbox_gpio_get_direction(struct device *dev, unsigned offset)
|
|
|
+int sandbox_gpio_get_direction(struct udevice *dev, unsigned offset)
|
|
|
{
|
|
|
return get_gpio_flag(dev, offset, GPIOF_OUTPUT);
|
|
|
}
|
|
|
|
|
|
-int sandbox_gpio_set_direction(struct device *dev, unsigned offset, int output)
|
|
|
+int sandbox_gpio_set_direction(struct udevice *dev, unsigned offset, int output)
|
|
|
{
|
|
|
return set_gpio_flag(dev, offset, GPIOF_OUTPUT, output);
|
|
|
}
|
|
@@ -97,7 +97,7 @@ int sandbox_gpio_set_direction(struct device *dev, unsigned offset, int output)
|
|
|
*/
|
|
|
|
|
|
/* set GPIO port 'offset' as an input */
|
|
|
-static int sb_gpio_direction_input(struct device *dev, unsigned offset)
|
|
|
+static int sb_gpio_direction_input(struct udevice *dev, unsigned offset)
|
|
|
{
|
|
|
debug("%s: offset:%u\n", __func__, offset);
|
|
|
|
|
@@ -108,7 +108,7 @@ static int sb_gpio_direction_input(struct device *dev, unsigned offset)
|
|
|
}
|
|
|
|
|
|
/* set GPIO port 'offset' as an output, with polarity 'value' */
|
|
|
-static int sb_gpio_direction_output(struct device *dev, unsigned offset,
|
|
|
+static int sb_gpio_direction_output(struct udevice *dev, unsigned offset,
|
|
|
int value)
|
|
|
{
|
|
|
debug("%s: offset:%u, value = %d\n", __func__, offset, value);
|
|
@@ -121,7 +121,7 @@ static int sb_gpio_direction_output(struct device *dev, unsigned offset,
|
|
|
}
|
|
|
|
|
|
/* read GPIO IN value of port 'offset' */
|
|
|
-static int sb_gpio_get_value(struct device *dev, unsigned offset)
|
|
|
+static int sb_gpio_get_value(struct udevice *dev, unsigned offset)
|
|
|
{
|
|
|
debug("%s: offset:%u\n", __func__, offset);
|
|
|
|
|
@@ -132,7 +132,7 @@ static int sb_gpio_get_value(struct device *dev, unsigned offset)
|
|
|
}
|
|
|
|
|
|
/* write GPIO OUT value to port 'offset' */
|
|
|
-static int sb_gpio_set_value(struct device *dev, unsigned offset, int value)
|
|
|
+static int sb_gpio_set_value(struct udevice *dev, unsigned offset, int value)
|
|
|
{
|
|
|
debug("%s: offset:%u, value = %d\n", __func__, offset, value);
|
|
|
|
|
@@ -148,7 +148,7 @@ static int sb_gpio_set_value(struct device *dev, unsigned offset, int value)
|
|
|
return sandbox_gpio_set_value(dev, offset, value);
|
|
|
}
|
|
|
|
|
|
-static int sb_gpio_request(struct device *dev, unsigned offset,
|
|
|
+static int sb_gpio_request(struct udevice *dev, unsigned offset,
|
|
|
const char *label)
|
|
|
{
|
|
|
struct gpio_dev_priv *uc_priv = dev->uclass_priv;
|
|
@@ -171,7 +171,7 @@ static int sb_gpio_request(struct device *dev, unsigned offset,
|
|
|
return set_gpio_flag(dev, offset, GPIOF_RESERVED, 1);
|
|
|
}
|
|
|
|
|
|
-static int sb_gpio_free(struct device *dev, unsigned offset)
|
|
|
+static int sb_gpio_free(struct udevice *dev, unsigned offset)
|
|
|
{
|
|
|
struct gpio_state *state = dev_get_priv(dev);
|
|
|
|
|
@@ -184,7 +184,7 @@ static int sb_gpio_free(struct device *dev, unsigned offset)
|
|
|
return set_gpio_flag(dev, offset, GPIOF_RESERVED, 0);
|
|
|
}
|
|
|
|
|
|
-static int sb_gpio_get_state(struct device *dev, unsigned int offset,
|
|
|
+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;
|
|
@@ -213,7 +213,7 @@ static const struct dm_gpio_ops gpio_sandbox_ops = {
|
|
|
.get_state = sb_gpio_get_state,
|
|
|
};
|
|
|
|
|
|
-static int sandbox_gpio_ofdata_to_platdata(struct device *dev)
|
|
|
+static int sandbox_gpio_ofdata_to_platdata(struct udevice *dev)
|
|
|
{
|
|
|
struct gpio_dev_priv *uc_priv = dev->uclass_priv;
|
|
|
|
|
@@ -225,7 +225,7 @@ static int sandbox_gpio_ofdata_to_platdata(struct device *dev)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static int gpio_sandbox_probe(struct device *dev)
|
|
|
+static int gpio_sandbox_probe(struct udevice *dev)
|
|
|
{
|
|
|
struct gpio_dev_priv *uc_priv = dev->uclass_priv;
|
|
|
|