Commit 76f37681 authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge tag 'intel-pinctrl-v6.1-2' of... 

Merge tag 'intel-pinctrl-v6.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel into devel

intel-pinctrl for v6.1-2

* Add missing and remove unused headers in the pin control and GPIO drivers
* Revise the pin control and GPIO headers
parents dbbd909e e5530adc

drivers/gpio/gpio-arizona.c

+2 −3
Original line number Diff line number Diff line
@@ -7,13 +7,12 @@ 
 * Author: Mark Brown <broonie@opensource.wolfsonmicro.com>

 */



#include <linux/gpio/driver.h>

#include <linux/kernel.h>

#include <linux/slab.h>

#include <linux/module.h>

#include <linux/gpio/driver.h>

#include <linux/platform_device.h>

#include <linux/pm_runtime.h>

#include <linux/seq_file.h>

#include <linux/slab.h>



#include <linux/mfd/arizona/core.h>

#include <linux/mfd/arizona/pdata.h>

drivers/gpio/gpio-aspeed.c

+3 −2
Original line number Diff line number Diff line
@@ -5,10 +5,9 @@ 
 * Joel Stanley <joel@jms.id.au>

 */



#include <asm/div64.h>

#include <linux/clk.h>

#include <linux/gpio/driver.h>

#include <linux/gpio/aspeed.h>

#include <linux/gpio/driver.h>

#include <linux/hashtable.h>

#include <linux/init.h>

#include <linux/io.h>
@@ -19,6 +18,8 @@ 
#include <linux/spinlock.h>

#include <linux/string.h>



#include <asm/div64.h>



/*

 * These two headers aren't meant to be used by GPIO drivers. We need

 * them in order to access gpio_chip_hwgpio() which we need to implement

drivers/gpio/gpio-da9052.c

+4 −5
Original line number Diff line number Diff line
@@ -6,17 +6,16 @@ 
 *

 * Author: David Dajun Chen <dchen@diasemi.com>

 */

#include <linux/module.h>

#include <linux/fs.h>

#include <linux/uaccess.h>

#include <linux/platform_device.h>

#include <linux/gpio/driver.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/syscalls.h>

#include <linux/seq_file.h>

#include <linux/uaccess.h>



#include <linux/mfd/da9052/da9052.h>

#include <linux/mfd/da9052/reg.h>

#include <linux/mfd/da9052/pdata.h>

#include <linux/mfd/da9052/reg.h>



#define DA9052_INPUT				1

#define DA9052_OUTPUT_OPENDRAIN		2

drivers/gpio/gpio-mockup.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/property.h>

#include <linux/seq_file.h>

#include <linux/slab.h>

#include <linux/string_helpers.h>

#include <linux/uaccess.h>

drivers/gpio/gpio-pca953x.c

+2 −1
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ 


#include <linux/acpi.h>

#include <linux/bitmap.h>

#include <linux/gpio/driver.h>

#include <linux/gpio/consumer.h>

#include <linux/gpio/driver.h>

#include <linux/i2c.h>

#include <linux/init.h>

#include <linux/interrupt.h>
@@ -20,6 +20,7 @@ 
#include <linux/platform_data/pca953x.h>

#include <linux/regmap.h>

#include <linux/regulator/consumer.h>

#include <linux/seq_file.h>

#include <linux/slab.h>



#include <asm/unaligned.h>