]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
mfd/pinctrl: Delete platform data header
authorLinus Walleij <linus.walleij@linaro.org>
Tue, 3 Dec 2013 14:50:49 +0000 (15:50 +0100)
committerLee Jones <lee.jones@linaro.org>
Tue, 21 Jan 2014 08:27:42 +0000 (08:27 +0000)
This deletes the special AB8500 GPIO platform data passing
header and merges the few remaining contents down into the
abx500 pinctrl driver which handles the abx500 GPIO device.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
drivers/pinctrl/pinctrl-abx500.c
drivers/pinctrl/pinctrl-abx500.h
include/linux/mfd/abx500/ab8500-gpio.h [deleted file]

index 62bd7cf79a3b69befffda99a606aebecb2c2a1c8..163da9c3ea0e164c228bff771ed8b41347632fa7 100644 (file)
@@ -24,7 +24,6 @@
 #include <linux/bitops.h>
 #include <linux/mfd/abx500.h>
 #include <linux/mfd/abx500/ab8500.h>
-#include <linux/mfd/abx500/ab8500-gpio.h>
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/pinctrl/consumer.h>
 #include <linux/pinctrl/pinmux.h>
index 82293806e842c1b86b55c1b8f229da1aec1c58d5..2beef3bfe9ca93f3857361a879e76e38ee7161ac 100644 (file)
@@ -15,6 +15,18 @@ enum abx500_pin_func {
        ABX500_ALT_C,
 };
 
+enum abx500_gpio_pull_updown {
+       ABX500_GPIO_PULL_DOWN = 0x0,
+       ABX500_GPIO_PULL_NONE = 0x1,
+       ABX500_GPIO_PULL_UP = 0x3,
+};
+
+enum abx500_gpio_vinsel {
+       ABX500_GPIO_VINSEL_VBAT = 0x0,
+       ABX500_GPIO_VINSEL_VIN_1V8 = 0x1,
+       ABX500_GPIO_VINSEL_VDD_BIF = 0x2,
+};
+
 /**
  * struct abx500_function - ABx500 pinctrl mux function
  * @name: The name of the function, exported to pinctrl core.
diff --git a/include/linux/mfd/abx500/ab8500-gpio.h b/include/linux/mfd/abx500/ab8500-gpio.h
deleted file mode 100644 (file)
index ebef068..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright ST-Ericsson 2010.
- *
- * Author: Bibek Basu <bibek.basu@stericsson.com>
- * Licensed under GPLv2.
- */
-
-#ifndef _AB8500_GPIO_H
-#define _AB8500_GPIO_H
-
-enum abx500_gpio_pull_updown {
-       ABX500_GPIO_PULL_DOWN = 0x0,
-       ABX500_GPIO_PULL_NONE = 0x1,
-       ABX500_GPIO_PULL_UP = 0x3,
-};
-
-enum abx500_gpio_vinsel {
-       ABX500_GPIO_VINSEL_VBAT = 0x0,
-       ABX500_GPIO_VINSEL_VIN_1V8 = 0x1,
-       ABX500_GPIO_VINSEL_VDD_BIF = 0x2,
-};
-
-#endif /* _AB8500_GPIO_H */