Commit 97b583f3 authored by Linus Walleij's avatar Linus Walleij Committed by Lee Jones
Browse files

mfd/pinctrl: Delete platform data header 



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: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 45e84223

drivers/pinctrl/pinctrl-abx500.c

+0 −1
Original line number Diff line number Diff line
@@ -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>

drivers/pinctrl/pinctrl-abx500.h

+12 −0
Original line number Diff line number Diff line
@@ -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.

include/linux/mfd/abx500/ab8500-gpio.h

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
/*

 * 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 */