Commit 562b4884 authored by Linus Walleij's avatar Linus Walleij
Browse files

gpio: pl061: move platform data into driver 



No boardfile defines any PL061 platform data anymore: the
Integrator IM/PD-1 includes the file but is not making use
of the struct. Let's delete the include and all references,
then move the platform data into the driver for later
consolidation into the driver state container.

The only resource defined by the IM/PD-1 is the IRQ which
is passed through the AMBA PrimeCell bus abstraction
struct amba_device.

Cc: arm@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: Russell King <linux@armlinux.org.uk>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 2796325f

arch/arm/mach-integrator/impd1.c

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

#include <linux/amba/clcd.h>

#include <linux/amba/mmci.h>

#include <linux/amba/pl061.h>

#include <linux/io.h>

#include <linux/platform_data/clk-integrator.h>

#include <linux/slab.h>

drivers/gpio/gpio-pl061.c

+13 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <linux/gpio.h>

#include <linux/device.h>

#include <linux/amba/bus.h>

#include <linux/amba/pl061.h>

#include <linux/slab.h>

#include <linux/pinctrl/consumer.h>

#include <linux/pm.h>
@@ -39,6 +38,19 @@ 


#define PL061_GPIO_NR	8



struct pl061_platform_data {

	/* number of the first GPIO */

	unsigned	gpio_base;



	/* number of the first IRQ.

	 * If the IRQ functionality in not desired this must be set to 0.

	 */

	unsigned	irq_base;



	u8		directions;	/* startup directions, 1: out, 0: in */

	u8		values;		/* startup values */

};



#ifdef CONFIG_PM

struct pl061_context_save_regs {

	u8 gpio_data;

include/linux/amba/pl061.h

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
#include <linux/types.h>



/* platform data for the PL061 GPIO driver */



struct pl061_platform_data {

	/* number of the first GPIO */

	unsigned	gpio_base;



	/* number of the first IRQ.

	 * If the IRQ functionality in not desired this must be set to 0.

	 */

	unsigned	irq_base;



	u8		directions;	/* startup directions, 1: out, 0: in */

	u8		values;		/* startup values */

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE