Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14bf873e authored by Vladimir Zapolskiy's avatar Vladimir Zapolskiy Committed by Linus Walleij
Browse files

gpio: lpc32xx: remove unused platform data file 



ARM LPC32xx platform is device-tree only, there is no need to keep
a file with GPIO platform data structures, however some of macro
definitions should be moved to the driver code, which is the only user
of the removed header file.

Signed-off-by: default avatarVladimir Zapolskiy <vz@mleia.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 332e99d5

drivers/gpio/gpio-lpc32xx.c

+14 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <linux/of_gpio.h>

#include <linux/of_gpio.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/platform_data/gpio-lpc32xx.h>





#include <mach/hardware.h>

#include <mach/hardware.h>

#include <mach/platform.h>

#include <mach/platform.h>
@@ -68,6 +67,20 @@ 
#define GPI3_PIN_IN_SEL(x, y)			(((x) >> (y)) & 1)

#define GPI3_PIN_IN_SEL(x, y)			(((x) >> (y)) & 1)

#define GPO3_PIN_IN_SEL(x, y)			(((x) >> (y)) & 1)

#define GPO3_PIN_IN_SEL(x, y)			(((x) >> (y)) & 1)





#define LPC32XX_GPIO_P0_MAX	8

#define LPC32XX_GPIO_P1_MAX	24

#define LPC32XX_GPIO_P2_MAX	13

#define LPC32XX_GPIO_P3_MAX	6

#define LPC32XX_GPI_P3_MAX	29

#define LPC32XX_GPO_P3_MAX	24



#define LPC32XX_GPIO_P0_GRP	0

#define LPC32XX_GPIO_P1_GRP	(LPC32XX_GPIO_P0_GRP + LPC32XX_GPIO_P0_MAX)

#define LPC32XX_GPIO_P2_GRP	(LPC32XX_GPIO_P1_GRP + LPC32XX_GPIO_P1_MAX)

#define LPC32XX_GPIO_P3_GRP	(LPC32XX_GPIO_P2_GRP + LPC32XX_GPIO_P2_MAX)

#define LPC32XX_GPI_P3_GRP	(LPC32XX_GPIO_P3_GRP + LPC32XX_GPIO_P3_MAX)

#define LPC32XX_GPO_P3_GRP	(LPC32XX_GPI_P3_GRP + LPC32XX_GPI_P3_MAX)



struct gpio_regs {

struct gpio_regs {

	void __iomem *inp_state;

	void __iomem *inp_state;

	void __iomem *outp_state;

	void __iomem *outp_state;

include/linux/platform_data/gpio-lpc32xx.h

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

 * Author: Kevin Wells <kevin.wells@nxp.com>

 *

 * Copyright (C) 2010 NXP Semiconductors

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#ifndef __MACH_GPIO_LPC32XX_H

#define __MACH_GPIO_LPC32XX_H



/*

 * Note!

 * Muxed GP pins need to be setup to the GP state in the board level

 * code prior to using this driver.

 * GPI pins : 28xP3 group

 * GPO pins : 24xP3 group

 * GPIO pins: 8xP0 group, 24xP1 group, 13xP2 group, 6xP3 group

 */



#define LPC32XX_GPIO_P0_MAX 8

#define LPC32XX_GPIO_P1_MAX 24

#define LPC32XX_GPIO_P2_MAX 13

#define LPC32XX_GPIO_P3_MAX 6

#define LPC32XX_GPI_P3_MAX 29

#define LPC32XX_GPO_P3_MAX 24



#define LPC32XX_GPIO_P0_GRP 0

#define LPC32XX_GPIO_P1_GRP (LPC32XX_GPIO_P0_GRP + LPC32XX_GPIO_P0_MAX)

#define LPC32XX_GPIO_P2_GRP (LPC32XX_GPIO_P1_GRP + LPC32XX_GPIO_P1_MAX)

#define LPC32XX_GPIO_P3_GRP (LPC32XX_GPIO_P2_GRP + LPC32XX_GPIO_P2_MAX)

#define LPC32XX_GPI_P3_GRP (LPC32XX_GPIO_P3_GRP + LPC32XX_GPIO_P3_MAX)

#define LPC32XX_GPO_P3_GRP (LPC32XX_GPI_P3_GRP + LPC32XX_GPI_P3_MAX)



/*

 * A specific GPIO can be selected with this macro

 * ie, GPIO_05 can be selected with LPC32XX_GPIO(LPC32XX_GPIO_P3_GRP, 5)

 * See the LPC32x0 User's guide for GPIO group numbers

 */

#define LPC32XX_GPIO(x, y) ((x) + (y))



#endif /* __MACH_GPIO_LPC32XX_H */