![Linus Torvalds](/assets/img/avatar_default.png)
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIVAwUAUGsfSBOxKuMESys7AQIQug/+LyViiXFmCSlM+lCGkp64/BfUvy0QHqN4 K/dMvbZKOQbvmgps/xj8G+6diDzeO4hz8e1I3c/SEZ3M9TTz/Ppv1slfET9uUZ4X aLLHKqXihsxEOslw7mgp91KTd1Nr+e41f/5hr3j5Ap1HQB4yJa2mmj3reb48VfjD jmXo/dID66c2ExaVO7C8yyZXWgMGTfiy27qmEnMTxW7xQPt1oYsV2Bq0PCC/zEcq JgnwMatDVMy9en9wuEVMNelImE+XLm1T3XpLHL2WkV2JWSai98TcvGZnNKIxpFqu PueHWWCs5F5bZfn4bf6QOEstRTW76NL2qFNYrBPi0Zuq8Pm53ucnnzJUY8JFPPoR kXYmv8K73Jb10eHFuc3X4UyzvnhmJ7y3kG3jx7WoJVkW1KPgEFNmvMHkLyHgPZOU nT1tZiO0QHF4zi0JWMfK+7aeEY7EKfqRSce0F3Jw91vaIlEOIqgMgVJ1Y/nMhu3s 92mpg8JDoAcgCghok4m4Pc1qO06Fe8Iw5Qap5KMdPutp5Br2ebLL5NrwdAE8LNpR 7826r9RTMhyVRgNJ71JMFDY1IBeLeY0bxipN8dh6VYqMiKgClUeNwv7/tIgI4YS7 acQ+GdcsgTtg5qx3xwX5N2TSJVvdwnXdnWhAw7wN48tbzH8LvMV61Pq8Ytc7iK3M cAMgkbxdZRk= =VtEQ -----END PGP SIGNATURE----- Merge tag 'uapi-prep-20121002' of git://git.infradead.org/users/dhowells/linux-headers Pull preparatory patches for user API disintegration from David Howells: "The patches herein prepare for the extraction of the Userspace API bits from the various header files named in the Kbuild files. New subdirectories are created under either include/uapi/ or arch/x/include/uapi/ that correspond to the subdirectory containing that file under include/ or arch/x/include/. The new subdirs under the uapi/ directory are populated with Kbuild files that mostly do nothing at this time. Further patches will disintegrate the headers in each original directory and fill in the Kbuild files as they do it. These patches also: (1) fix up #inclusions of "foo.h" rather than <foo.h>. (2) Remove some redundant #includes from the DRM code. (3) Make the kernel build infrastructure handle Kbuild files both in the old places and the new UAPI place that both specify headers to be exported. (4) Fix some kernel tools that #include kernel headers during their build. I have compile tested this with allyesconfig against x86_64, allmodconfig against i386 and a scattering of additional defconfigs of other arches. Prepared for main script Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Michael Kerrisk <mtk.manpages@gmail.com> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Acked-by: Dave Jones <davej@redhat.com> Acked-by: H. Peter Anvin <hpa@zytor.com>" * tag 'uapi-prep-20121002' of git://git.infradead.org/users/dhowells/linux-headers: UAPI: Plumb the UAPI Kbuilds into the user header installation and checking UAPI: x86: Differentiate the generated UAPI and internal headers UAPI: Remove the objhdr-y export list UAPI: Move linux/version.h UAPI: Set up uapi/asm/Kbuild.asm UAPI: x86: Fix insn_sanity build failure after UAPI split UAPI: x86: Fix the test_get_len tool UAPI: (Scripted) Set up UAPI Kbuild files UAPI: Partition the header include path sets and add uapi/ header directories UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers UAPI: (Scripted) Convert #include "..." to #include <path/...> in drivers/gpu/ UAPI: (Scripted) Remove redundant DRM UAPI header #inclusions from drivers/gpu/. UAPI: Refer to the DRM UAPI headers with <...> and from certain headers only
205 lines
4.4 KiB
C
205 lines
4.4 KiB
C
/*
|
|
* Consumer interface the pin control subsystem
|
|
*
|
|
* Copyright (C) 2012 ST-Ericsson SA
|
|
* Written on behalf of Linaro for ST-Ericsson
|
|
* Based on bits of regulator core, gpio core and clk core
|
|
*
|
|
* Author: Linus Walleij <linus.walleij@linaro.org>
|
|
*
|
|
* License terms: GNU General Public License (GPL) version 2
|
|
*/
|
|
#ifndef __LINUX_PINCTRL_CONSUMER_H
|
|
#define __LINUX_PINCTRL_CONSUMER_H
|
|
|
|
#include <linux/err.h>
|
|
#include <linux/list.h>
|
|
#include <linux/seq_file.h>
|
|
#include <linux/pinctrl/pinctrl-state.h>
|
|
|
|
/* This struct is private to the core and should be regarded as a cookie */
|
|
struct pinctrl;
|
|
struct pinctrl_state;
|
|
struct device;
|
|
|
|
#ifdef CONFIG_PINCTRL
|
|
|
|
/* External interface to pin control */
|
|
extern int pinctrl_request_gpio(unsigned gpio);
|
|
extern void pinctrl_free_gpio(unsigned gpio);
|
|
extern int pinctrl_gpio_direction_input(unsigned gpio);
|
|
extern int pinctrl_gpio_direction_output(unsigned gpio);
|
|
|
|
extern struct pinctrl * __must_check pinctrl_get(struct device *dev);
|
|
extern void pinctrl_put(struct pinctrl *p);
|
|
extern struct pinctrl_state * __must_check pinctrl_lookup_state(
|
|
struct pinctrl *p,
|
|
const char *name);
|
|
extern int pinctrl_select_state(struct pinctrl *p, struct pinctrl_state *s);
|
|
|
|
extern struct pinctrl * __must_check devm_pinctrl_get(struct device *dev);
|
|
extern void devm_pinctrl_put(struct pinctrl *p);
|
|
|
|
#else /* !CONFIG_PINCTRL */
|
|
|
|
static inline int pinctrl_request_gpio(unsigned gpio)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline void pinctrl_free_gpio(unsigned gpio)
|
|
{
|
|
}
|
|
|
|
static inline int pinctrl_gpio_direction_input(unsigned gpio)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int pinctrl_gpio_direction_output(unsigned gpio)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline struct pinctrl * __must_check pinctrl_get(struct device *dev)
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
static inline void pinctrl_put(struct pinctrl *p)
|
|
{
|
|
}
|
|
|
|
static inline struct pinctrl_state * __must_check pinctrl_lookup_state(
|
|
struct pinctrl *p,
|
|
const char *name)
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
static inline int pinctrl_select_state(struct pinctrl *p,
|
|
struct pinctrl_state *s)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline struct pinctrl * __must_check devm_pinctrl_get(struct device *dev)
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
static inline void devm_pinctrl_put(struct pinctrl *p)
|
|
{
|
|
}
|
|
|
|
#endif /* CONFIG_PINCTRL */
|
|
|
|
static inline struct pinctrl * __must_check pinctrl_get_select(
|
|
struct device *dev, const char *name)
|
|
{
|
|
struct pinctrl *p;
|
|
struct pinctrl_state *s;
|
|
int ret;
|
|
|
|
p = pinctrl_get(dev);
|
|
if (IS_ERR(p))
|
|
return p;
|
|
|
|
s = pinctrl_lookup_state(p, name);
|
|
if (IS_ERR(s)) {
|
|
pinctrl_put(p);
|
|
return ERR_PTR(PTR_ERR(s));
|
|
}
|
|
|
|
ret = pinctrl_select_state(p, s);
|
|
if (ret < 0) {
|
|
pinctrl_put(p);
|
|
return ERR_PTR(ret);
|
|
}
|
|
|
|
return p;
|
|
}
|
|
|
|
static inline struct pinctrl * __must_check pinctrl_get_select_default(
|
|
struct device *dev)
|
|
{
|
|
return pinctrl_get_select(dev, PINCTRL_STATE_DEFAULT);
|
|
}
|
|
|
|
static inline struct pinctrl * __must_check devm_pinctrl_get_select(
|
|
struct device *dev, const char *name)
|
|
{
|
|
struct pinctrl *p;
|
|
struct pinctrl_state *s;
|
|
int ret;
|
|
|
|
p = devm_pinctrl_get(dev);
|
|
if (IS_ERR(p))
|
|
return p;
|
|
|
|
s = pinctrl_lookup_state(p, name);
|
|
if (IS_ERR(s)) {
|
|
devm_pinctrl_put(p);
|
|
return ERR_CAST(s);
|
|
}
|
|
|
|
ret = pinctrl_select_state(p, s);
|
|
if (ret < 0) {
|
|
devm_pinctrl_put(p);
|
|
return ERR_PTR(ret);
|
|
}
|
|
|
|
return p;
|
|
}
|
|
|
|
static inline struct pinctrl * __must_check devm_pinctrl_get_select_default(
|
|
struct device *dev)
|
|
{
|
|
return devm_pinctrl_get_select(dev, PINCTRL_STATE_DEFAULT);
|
|
}
|
|
|
|
#ifdef CONFIG_PINCONF
|
|
|
|
extern int pin_config_get(const char *dev_name, const char *name,
|
|
unsigned long *config);
|
|
extern int pin_config_set(const char *dev_name, const char *name,
|
|
unsigned long config);
|
|
extern int pin_config_group_get(const char *dev_name,
|
|
const char *pin_group,
|
|
unsigned long *config);
|
|
extern int pin_config_group_set(const char *dev_name,
|
|
const char *pin_group,
|
|
unsigned long config);
|
|
|
|
#else
|
|
|
|
static inline int pin_config_get(const char *dev_name, const char *name,
|
|
unsigned long *config)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int pin_config_set(const char *dev_name, const char *name,
|
|
unsigned long config)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int pin_config_group_get(const char *dev_name,
|
|
const char *pin_group,
|
|
unsigned long *config)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int pin_config_group_set(const char *dev_name,
|
|
const char *pin_group,
|
|
unsigned long config)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
#endif
|
|
|
|
#endif /* __LINUX_PINCTRL_CONSUMER_H */
|