aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/mfd/pcf50633/core.h4
-rw-r--r--include/linux/mfd/pcf50633/gpio.h59
2 files changed, 35 insertions, 28 deletions
diff --git a/include/linux/mfd/pcf50633/core.h b/include/linux/mfd/pcf50633/core.h
index 42f9af553ed..e69829b6e90 100644
--- a/include/linux/mfd/pcf50633/core.h
+++ b/include/linux/mfd/pcf50633/core.h
@@ -19,6 +19,7 @@
#include <linux/regulator/machine.h>
#include <linux/power_supply.h>
#include <linux/mfd/pcf50633/backlight.h>
+#include <linux/gpio.h>
struct pcf50633;
@@ -41,6 +42,8 @@ struct pcf50633_platform_data {
u8 resumers[5];
struct pcf50633_bl_platform_data *backlight_data;
+
+ int gpio_base;
};
struct pcf50633_irq {
@@ -146,6 +149,7 @@ struct pcf50633 {
int onkey1s_held;
+ struct platform_device *gpio_pdev;
struct platform_device *rtc_pdev;
struct platform_device *mbc_pdev;
struct platform_device *adc_pdev;
diff --git a/include/linux/mfd/pcf50633/gpio.h b/include/linux/mfd/pcf50633/gpio.h
index a42b845efc5..af2c341d5f6 100644
--- a/include/linux/mfd/pcf50633/gpio.h
+++ b/include/linux/mfd/pcf50633/gpio.h
@@ -15,37 +15,40 @@
#include <linux/mfd/pcf50633/core.h>
-#define PCF50633_GPIO1 1
-#define PCF50633_GPIO2 2
-#define PCF50633_GPIO3 3
-#define PCF50633_GPO 4
-
-#define PCF50633_REG_GPIO1CFG 0x14
-#define PCF50633_REG_GPIO2CFG 0x15
-#define PCF50633_REG_GPIO3CFG 0x16
-#define PCF50633_REG_GPOCFG 0x17
-
-#define PCF50633_GPOCFG_GPOSEL_MASK 0x07
-
-enum pcf50633_reg_gpocfg {
- PCF50633_GPOCFG_GPOSEL_0 = 0x00,
- PCF50633_GPOCFG_GPOSEL_LED_NFET = 0x01,
- PCF50633_GPOCFG_GPOSEL_SYSxOK = 0x02,
- PCF50633_GPOCFG_GPOSEL_CLK32K = 0x03,
- PCF50633_GPOCFG_GPOSEL_ADAPUSB = 0x04,
- PCF50633_GPOCFG_GPOSEL_USBxOK = 0x05,
- PCF50633_GPOCFG_GPOSEL_ACTPH4 = 0x06,
- PCF50633_GPOCFG_GPOSEL_1 = 0x07,
- PCF50633_GPOCFG_GPOSEL_INVERSE = 0x08,
+#define PCF50633_GPIO1 0
+#define PCF50633_GPIO2 1
+#define PCF50633_GPIO3 2
+#define PCF50633_GPO 3
+
+#define PCF50633_REG_GPIOCFG(x) (0x14 + (x))
+
+enum pcf50633_gpio_config {
+ PCF50633_GPIO_CONFIG_OUTPUT = 0x0,
+ PCF50633_GPIO_CONFIG_SYSxOK = 0x2,
+ PCF50633_GPIO_CONFIG_CHARGING = 0x3,
+ PCF50633_GPIO_CONFIG_MOBILE_MODE = 0x4,
+ PCF50633_GPIO_CONFIG_USBxOK = 0x5,
+ PCF50633_GPIO_CONFIG_ACTPH = 0x6,
+ PCF50633_GPIO_CONFIG_INPUT = 0x7,
+
+ PCF50633_GPIO_CONFIG_INVERT = 0x8,
+
+ PCF50633_GPO_CONFIG_OUTPUT = 0x0,
+ PCF50633_GPO_CONFIG_LED_NFET = 0x1,
+ PCF50633_GPO_CONFIG_SYSxOK = 0x2,
+ PCF50633_GPO_CONFIG_CLK32K = 0x3,
+ PCF50633_GPO_CONFIG_MOBILE_MODE = 0x4,
+ PCF50633_GPO_CONFIG_USBxOK = 0x5,
+ PCF50633_GPO_CONFIG_ACTPH = 0x6,
+ PCF50633_GPO_CONFIG_INPUT = 0x7,
+
+ PCF50633_GPO_CONFIG_INVERT = 0x8,
};
-int pcf50633_gpio_set(struct pcf50633 *pcf, int gpio, u8 val);
-u8 pcf50633_gpio_get(struct pcf50633 *pcf, int gpio);
+int pcf50633_gpio_set_config(struct pcf50633 *pcf, unsigned gpio,
+ enum pcf50633_gpio_config config);
-int pcf50633_gpio_invert_set(struct pcf50633 *, int gpio, int invert);
-int pcf50633_gpio_invert_get(struct pcf50633 *pcf, int gpio);
-
-int pcf50633_gpio_power_supply_set(struct pcf50633 *,
+int pcf50633_gpio_power_supply_set(struct pcf50633 *pcf,
int gpio, int regulator, int on);
#endif /* __LINUX_MFD_PCF50633_GPIO_H */