diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/gpio.h | 10 | ||||
| -rw-r--r-- | include/linux/colibri_usb.h | 28 | ||||
| -rw-r--r-- | include/linux/mfd/tps6586x.h | 10 | ||||
| -rw-r--r-- | include/linux/platform_data/tegra_usb.h | 1 |
4 files changed, 48 insertions, 1 deletions
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h index d494001b1226..fcdcb5d5c995 100644 --- a/include/asm-generic/gpio.h +++ b/include/asm-generic/gpio.h @@ -170,6 +170,16 @@ extern int __gpio_cansleep(unsigned gpio); extern int __gpio_to_irq(unsigned gpio); +#define GPIOF_DIR_OUT (0 << 0) +#define GPIOF_DIR_IN (1 << 0) + +#define GPIOF_INIT_LOW (0 << 1) +#define GPIOF_INIT_HIGH (1 << 1) + +#define GPIOF_IN (GPIOF_DIR_IN) +#define GPIOF_OUT_INIT_LOW (GPIOF_DIR_OUT | GPIOF_INIT_LOW) +#define GPIOF_OUT_INIT_HIGH (GPIOF_DIR_OUT | GPIOF_INIT_HIGH) + /** * struct gpio - a structure describing a GPIO with configuration * @gpio: the GPIO number diff --git a/include/linux/colibri_usb.h b/include/linux/colibri_usb.h new file mode 100644 index 000000000000..6b3949979c38 --- /dev/null +++ b/include/linux/colibri_usb.h @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2012 Toradex, Inc. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef _COLIBRI_USB_H_ +#define _COLIBRI_USB_H_ + +struct colibri_otg_platform_data { + int cable_detect_gpio; + struct platform_device* (*host_register)(void); + void (*host_unregister)(struct platform_device*); +}; + +#endif /* _COLIBRI_USB_H_ */ diff --git a/include/linux/mfd/tps6586x.h b/include/linux/mfd/tps6586x.h index 702cee59cc7b..b5e990e9f6ee 100644 --- a/include/linux/mfd/tps6586x.h +++ b/include/linux/mfd/tps6586x.h @@ -56,7 +56,6 @@ enum pwm_pfm_mode { PWM_ONLY, AUTO_PWM_PFM, PWM_DEFAULT_VALUE, - }; enum slew_rate_settings { @@ -71,6 +70,14 @@ enum slew_rate_settings { SLEW_RATE_DEFAULT_VALUE, }; +enum tps6586x_type { + TPS658621A = 0x15, + TPS658621D = 0x2c, + TPS658623 = 0x1b, + TPS658643 = 0x03, + TPS6586X_ANY = -1, +}; + struct tps6586x_settings { /* SM0, SM1 and SM2 have PWM-only and auto PWM/PFM mode */ enum pwm_pfm_mode sm_pwm_mode; @@ -128,5 +135,6 @@ extern int tps6586x_set_bits(struct device *dev, int reg, uint8_t bit_mask); extern int tps6586x_clr_bits(struct device *dev, int reg, uint8_t bit_mask); extern int tps6586x_update(struct device *dev, int reg, uint8_t val, uint8_t mask); +extern enum tps6586x_type tps6586x_gettype(struct device *dev); #endif /*__LINUX_MFD_TPS6586X_H */ diff --git a/include/linux/platform_data/tegra_usb.h b/include/linux/platform_data/tegra_usb.h index 81b27e89631c..6499eeaff6a3 100644 --- a/include/linux/platform_data/tegra_usb.h +++ b/include/linux/platform_data/tegra_usb.h @@ -109,6 +109,7 @@ struct tegra_usb_dev_mode_data { */ struct tegra_usb_host_mode_data { int vbus_gpio; + int vbus_gpio_inverted; const char *vbus_reg; bool hot_plug; bool remote_wakeup_supported; |