gpiolib: acpi: Split ACPI stuff to gpiolib-acpi.h
This is a follow up to the commit
f626d6dfb7
("gpio: of: Break out OF-only code")
which broke down OF parts of GPIO library. Here we do the similar to ACPI.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20190730104337.21235-2-andriy.shevchenko@linux.intel.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
parent
fce04b1ce8
commit
77cb907abe
7 changed files with 109 additions and 93 deletions
|
@ -27,6 +27,7 @@
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
|
|
||||||
#include "gpiolib.h"
|
#include "gpiolib.h"
|
||||||
|
#include "gpiolib-acpi.h"
|
||||||
|
|
||||||
#define GPIO_SWPORTA_DR 0x00
|
#define GPIO_SWPORTA_DR 0x00
|
||||||
#define GPIO_SWPORTA_DDR 0x04
|
#define GPIO_SWPORTA_DDR 0x04
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
|
|
||||||
#include "gpiolib.h"
|
#include "gpiolib.h"
|
||||||
|
#include "gpiolib-acpi.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Only first 8bits of a register correspond to each pin,
|
* Only first 8bits of a register correspond to each pin,
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
#include <linux/acpi.h>
|
#include <linux/acpi.h>
|
||||||
|
|
||||||
#include "gpiolib.h"
|
#include "gpiolib.h"
|
||||||
|
#include "gpiolib-acpi.h"
|
||||||
|
|
||||||
/* Common property names */
|
/* Common property names */
|
||||||
#define XGENE_NIRQ_PROPERTY "apm,nr-irqs"
|
#define XGENE_NIRQ_PROPERTY "apm,nr-irqs"
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
#include <linux/pinctrl/pinctrl.h>
|
#include <linux/pinctrl/pinctrl.h>
|
||||||
|
|
||||||
#include "gpiolib.h"
|
#include "gpiolib.h"
|
||||||
|
#include "gpiolib-acpi.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* struct acpi_gpio_event - ACPI GPIO event handler data
|
* struct acpi_gpio_event - ACPI GPIO event handler data
|
||||||
|
|
104
drivers/gpio/gpiolib-acpi.h
Normal file
104
drivers/gpio/gpiolib-acpi.h
Normal file
|
@ -0,0 +1,104 @@
|
||||||
|
/* SPDX-License-Identifier: GPL-2.0 */
|
||||||
|
/*
|
||||||
|
* ACPI helpers for GPIO API
|
||||||
|
*
|
||||||
|
* Copyright (C) 2012,2019 Intel Corporation
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef GPIOLIB_ACPI_H
|
||||||
|
#define GPIOLIB_ACPI_H
|
||||||
|
|
||||||
|
struct acpi_device;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* struct acpi_gpio_info - ACPI GPIO specific information
|
||||||
|
* @adev: reference to ACPI device which consumes GPIO resource
|
||||||
|
* @flags: GPIO initialization flags
|
||||||
|
* @gpioint: if %true this GPIO is of type GpioInt otherwise type is GpioIo
|
||||||
|
* @pin_config: pin bias as provided by ACPI
|
||||||
|
* @polarity: interrupt polarity as provided by ACPI
|
||||||
|
* @triggering: triggering type as provided by ACPI
|
||||||
|
* @quirks: Linux specific quirks as provided by struct acpi_gpio_mapping
|
||||||
|
*/
|
||||||
|
struct acpi_gpio_info {
|
||||||
|
struct acpi_device *adev;
|
||||||
|
enum gpiod_flags flags;
|
||||||
|
bool gpioint;
|
||||||
|
int pin_config;
|
||||||
|
int polarity;
|
||||||
|
int triggering;
|
||||||
|
unsigned int quirks;
|
||||||
|
};
|
||||||
|
|
||||||
|
#ifdef CONFIG_ACPI
|
||||||
|
void acpi_gpiochip_add(struct gpio_chip *chip);
|
||||||
|
void acpi_gpiochip_remove(struct gpio_chip *chip);
|
||||||
|
|
||||||
|
void acpi_gpiochip_request_interrupts(struct gpio_chip *chip);
|
||||||
|
void acpi_gpiochip_free_interrupts(struct gpio_chip *chip);
|
||||||
|
|
||||||
|
int acpi_gpio_update_gpiod_flags(enum gpiod_flags *flags,
|
||||||
|
struct acpi_gpio_info *info);
|
||||||
|
int acpi_gpio_update_gpiod_lookup_flags(unsigned long *lookupflags,
|
||||||
|
struct acpi_gpio_info *info);
|
||||||
|
|
||||||
|
struct gpio_desc *acpi_find_gpio(struct device *dev,
|
||||||
|
const char *con_id,
|
||||||
|
unsigned int idx,
|
||||||
|
enum gpiod_flags *dflags,
|
||||||
|
unsigned long *lookupflags);
|
||||||
|
struct gpio_desc *acpi_node_get_gpiod(struct fwnode_handle *fwnode,
|
||||||
|
const char *propname, int index,
|
||||||
|
struct acpi_gpio_info *info);
|
||||||
|
|
||||||
|
int acpi_gpio_count(struct device *dev, const char *con_id);
|
||||||
|
|
||||||
|
bool acpi_can_fallback_to_crs(struct acpi_device *adev, const char *con_id);
|
||||||
|
#else
|
||||||
|
static inline void acpi_gpiochip_add(struct gpio_chip *chip) { }
|
||||||
|
static inline void acpi_gpiochip_remove(struct gpio_chip *chip) { }
|
||||||
|
|
||||||
|
static inline void
|
||||||
|
acpi_gpiochip_request_interrupts(struct gpio_chip *chip) { }
|
||||||
|
|
||||||
|
static inline void
|
||||||
|
acpi_gpiochip_free_interrupts(struct gpio_chip *chip) { }
|
||||||
|
|
||||||
|
static inline int
|
||||||
|
acpi_gpio_update_gpiod_flags(enum gpiod_flags *flags, struct acpi_gpio_info *info)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
static inline int
|
||||||
|
acpi_gpio_update_gpiod_lookup_flags(unsigned long *lookupflags,
|
||||||
|
struct acpi_gpio_info *info)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline struct gpio_desc *
|
||||||
|
acpi_find_gpio(struct device *dev, const char *con_id,
|
||||||
|
unsigned int idx, enum gpiod_flags *dflags,
|
||||||
|
unsigned long *lookupflags)
|
||||||
|
{
|
||||||
|
return ERR_PTR(-ENOENT);
|
||||||
|
}
|
||||||
|
static inline struct gpio_desc *
|
||||||
|
acpi_node_get_gpiod(struct fwnode_handle *fwnode, const char *propname,
|
||||||
|
int index, struct acpi_gpio_info *info)
|
||||||
|
{
|
||||||
|
return ERR_PTR(-ENXIO);
|
||||||
|
}
|
||||||
|
static inline int acpi_gpio_count(struct device *dev, const char *con_id)
|
||||||
|
{
|
||||||
|
return -ENODEV;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline bool acpi_can_fallback_to_crs(struct acpi_device *adev,
|
||||||
|
const char *con_id)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif /* GPIOLIB_ACPI_H */
|
|
@ -30,6 +30,7 @@
|
||||||
|
|
||||||
#include "gpiolib.h"
|
#include "gpiolib.h"
|
||||||
#include "gpiolib-of.h"
|
#include "gpiolib-of.h"
|
||||||
|
#include "gpiolib-acpi.h"
|
||||||
|
|
||||||
#define CREATE_TRACE_POINTS
|
#define CREATE_TRACE_POINTS
|
||||||
#include <trace/events/gpio.h>
|
#include <trace/events/gpio.h>
|
||||||
|
|
|
@ -16,8 +16,6 @@
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/cdev.h>
|
#include <linux/cdev.h>
|
||||||
|
|
||||||
struct acpi_device;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* struct gpio_device - internal state container for GPIO devices
|
* struct gpio_device - internal state container for GPIO devices
|
||||||
* @id: numerical ID number for the GPIO chip
|
* @id: numerical ID number for the GPIO chip
|
||||||
|
@ -68,100 +66,9 @@ struct gpio_device {
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
|
||||||
* struct acpi_gpio_info - ACPI GPIO specific information
|
|
||||||
* @adev: reference to ACPI device which consumes GPIO resource
|
|
||||||
* @flags: GPIO initialization flags
|
|
||||||
* @gpioint: if %true this GPIO is of type GpioInt otherwise type is GpioIo
|
|
||||||
* @pin_config: pin bias as provided by ACPI
|
|
||||||
* @polarity: interrupt polarity as provided by ACPI
|
|
||||||
* @triggering: triggering type as provided by ACPI
|
|
||||||
* @quirks: Linux specific quirks as provided by struct acpi_gpio_mapping
|
|
||||||
*/
|
|
||||||
struct acpi_gpio_info {
|
|
||||||
struct acpi_device *adev;
|
|
||||||
enum gpiod_flags flags;
|
|
||||||
bool gpioint;
|
|
||||||
int pin_config;
|
|
||||||
int polarity;
|
|
||||||
int triggering;
|
|
||||||
unsigned int quirks;
|
|
||||||
};
|
|
||||||
|
|
||||||
/* gpio suffixes used for ACPI and device tree lookup */
|
/* gpio suffixes used for ACPI and device tree lookup */
|
||||||
static __maybe_unused const char * const gpio_suffixes[] = { "gpios", "gpio" };
|
static __maybe_unused const char * const gpio_suffixes[] = { "gpios", "gpio" };
|
||||||
|
|
||||||
#ifdef CONFIG_ACPI
|
|
||||||
void acpi_gpiochip_add(struct gpio_chip *chip);
|
|
||||||
void acpi_gpiochip_remove(struct gpio_chip *chip);
|
|
||||||
|
|
||||||
void acpi_gpiochip_request_interrupts(struct gpio_chip *chip);
|
|
||||||
void acpi_gpiochip_free_interrupts(struct gpio_chip *chip);
|
|
||||||
|
|
||||||
int acpi_gpio_update_gpiod_flags(enum gpiod_flags *flags,
|
|
||||||
struct acpi_gpio_info *info);
|
|
||||||
int acpi_gpio_update_gpiod_lookup_flags(unsigned long *lookupflags,
|
|
||||||
struct acpi_gpio_info *info);
|
|
||||||
|
|
||||||
struct gpio_desc *acpi_find_gpio(struct device *dev,
|
|
||||||
const char *con_id,
|
|
||||||
unsigned int idx,
|
|
||||||
enum gpiod_flags *dflags,
|
|
||||||
unsigned long *lookupflags);
|
|
||||||
struct gpio_desc *acpi_node_get_gpiod(struct fwnode_handle *fwnode,
|
|
||||||
const char *propname, int index,
|
|
||||||
struct acpi_gpio_info *info);
|
|
||||||
|
|
||||||
int acpi_gpio_count(struct device *dev, const char *con_id);
|
|
||||||
|
|
||||||
bool acpi_can_fallback_to_crs(struct acpi_device *adev, const char *con_id);
|
|
||||||
#else
|
|
||||||
static inline void acpi_gpiochip_add(struct gpio_chip *chip) { }
|
|
||||||
static inline void acpi_gpiochip_remove(struct gpio_chip *chip) { }
|
|
||||||
|
|
||||||
static inline void
|
|
||||||
acpi_gpiochip_request_interrupts(struct gpio_chip *chip) { }
|
|
||||||
|
|
||||||
static inline void
|
|
||||||
acpi_gpiochip_free_interrupts(struct gpio_chip *chip) { }
|
|
||||||
|
|
||||||
static inline int
|
|
||||||
acpi_gpio_update_gpiod_flags(enum gpiod_flags *flags, struct acpi_gpio_info *info)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
static inline int
|
|
||||||
acpi_gpio_update_gpiod_lookup_flags(unsigned long *lookupflags,
|
|
||||||
struct acpi_gpio_info *info)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline struct gpio_desc *
|
|
||||||
acpi_find_gpio(struct device *dev, const char *con_id,
|
|
||||||
unsigned int idx, enum gpiod_flags *dflags,
|
|
||||||
unsigned long *lookupflags)
|
|
||||||
{
|
|
||||||
return ERR_PTR(-ENOENT);
|
|
||||||
}
|
|
||||||
static inline struct gpio_desc *
|
|
||||||
acpi_node_get_gpiod(struct fwnode_handle *fwnode, const char *propname,
|
|
||||||
int index, struct acpi_gpio_info *info)
|
|
||||||
{
|
|
||||||
return ERR_PTR(-ENXIO);
|
|
||||||
}
|
|
||||||
static inline int acpi_gpio_count(struct device *dev, const char *con_id)
|
|
||||||
{
|
|
||||||
return -ENODEV;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline bool acpi_can_fallback_to_crs(struct acpi_device *adev,
|
|
||||||
const char *con_id)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
struct gpio_array {
|
struct gpio_array {
|
||||||
struct gpio_desc **desc;
|
struct gpio_desc **desc;
|
||||||
unsigned int size;
|
unsigned int size;
|
||||||
|
|
Loading…
Reference in a new issue