Merge branch 'ib-gpio-aggregator' into devel
This commit is contained in:
@@ -20,8 +20,11 @@ enum gpio_lookup_flags {
|
||||
|
||||
/**
|
||||
* struct gpiod_lookup - lookup table
|
||||
* @chip_label: name of the chip the GPIO belongs to
|
||||
* @chip_hwnum: hardware number (i.e. relative to the chip) of the GPIO
|
||||
* @key: either the name of the chip the GPIO belongs to, or the GPIO line name
|
||||
* Note that GPIO line names are not guaranteed to be globally unique,
|
||||
* so this will use the first match found!
|
||||
* @chip_hwnum: hardware number (i.e. relative to the chip) of the GPIO, or
|
||||
* U16_MAX to indicate that @key is a GPIO line name
|
||||
* @con_id: name of the GPIO from the device's point of view
|
||||
* @idx: index of the GPIO in case several GPIOs share the same name
|
||||
* @flags: bitmask of gpio_lookup_flags GPIO_* values
|
||||
@@ -30,7 +33,7 @@ enum gpio_lookup_flags {
|
||||
* functions using platform data.
|
||||
*/
|
||||
struct gpiod_lookup {
|
||||
const char *chip_label;
|
||||
const char *key;
|
||||
u16 chip_hwnum;
|
||||
const char *con_id;
|
||||
unsigned int idx;
|
||||
@@ -63,17 +66,17 @@ struct gpiod_hog {
|
||||
/*
|
||||
* Simple definition of a single GPIO under a con_id
|
||||
*/
|
||||
#define GPIO_LOOKUP(_chip_label, _chip_hwnum, _con_id, _flags) \
|
||||
GPIO_LOOKUP_IDX(_chip_label, _chip_hwnum, _con_id, 0, _flags)
|
||||
#define GPIO_LOOKUP(_key, _chip_hwnum, _con_id, _flags) \
|
||||
GPIO_LOOKUP_IDX(_key, _chip_hwnum, _con_id, 0, _flags)
|
||||
|
||||
/*
|
||||
* Use this macro if you need to have several GPIOs under the same con_id.
|
||||
* Each GPIO needs to use a different index and can be accessed using
|
||||
* gpiod_get_index()
|
||||
*/
|
||||
#define GPIO_LOOKUP_IDX(_chip_label, _chip_hwnum, _con_id, _idx, _flags) \
|
||||
#define GPIO_LOOKUP_IDX(_key, _chip_hwnum, _con_id, _idx, _flags) \
|
||||
{ \
|
||||
.chip_label = _chip_label, \
|
||||
.key = _key, \
|
||||
.chip_hwnum = _chip_hwnum, \
|
||||
.con_id = _con_id, \
|
||||
.idx = _idx, \
|
||||
|
Reference in New Issue
Block a user