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

Commit 7b2fa570 authored by Grant Likely's avatar Grant Likely
Browse files

gpio/mxs: Move Freescale mxs gpio driver to drivers/gpio 



GPIO drivers are getting moved to drivers/gpio for cleanup and
consolidation.  This patch moves the mxs driver.  Follow up patches
will clean it up and make it a fine upstanding example of a gpio
driver.

v2: Removed header file entirely and put struct definition directly
    into driver.  The struct isn't used anywhere else in the kernel.

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Tested-by: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 59c5f46f

arch/arm/mach-mxs/Makefile

+1 −1
Original line number Diff line number Diff line 
# Common support

obj-y := clock.o devices.o gpio.o icoll.o iomux.o system.o timer.o

obj-y := clock.o devices.o icoll.o iomux.o system.o timer.o



obj-$(CONFIG_MXS_OCOTP) += ocotp.o

obj-$(CONFIG_PM) += pm.o

arch/arm/mach-mxs/gpio.h

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

 * Copyright 2007 Freescale Semiconductor, Inc. All Rights Reserved.

 * Copyright 2008 Juergen Beisert, kernel@pengutronix.de

 *

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

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

 * MA  02110-1301, USA.

 */



#ifndef __MXS_GPIO_H__

#define __MXS_GPIO_H__



struct mxs_gpio_port {

	void __iomem *base;

	int id;

	int irq;

	int irq_high;

	int virtual_irq_start;

	struct gpio_chip chip;

};



int mxs_gpio_init(struct mxs_gpio_port*, int);



#endif /* __MXS_GPIO_H__ */

arch/arm/mach-mxs/mach-mx28evk.c

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <mach/iomux-mx28.h>



#include "devices-mx28.h"

#include "gpio.h"



#define MX28EVK_FLEXCAN_SWITCH	MXS_GPIO_NR(2, 13)

#define MX28EVK_FEC_PHY_POWER	MXS_GPIO_NR(2, 15)

drivers/gpio/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -93,6 +93,10 @@ config GPIO_EXYNOS4 
	help

	  Say yes here to support Samsung Exynos4 series SoCs GPIO library



config GPIO_MXS

	def_bool y

	depends on ARCH_MXS



config GPIO_PLAT_SAMSUNG

	bool "Samsung SoCs GPIO library support"

	default y if SAMSUNG_GPIOLIB_4BIT

drivers/gpio/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ obj-$(CONFIG_GPIO_ADP5588) += adp5588-gpio.o 
obj-$(CONFIG_GPIO_BASIC_MMIO_CORE)	+= basic_mmio_gpio.o

obj-$(CONFIG_GPIO_BASIC_MMIO)	+= basic_mmio_gpio.o

obj-$(CONFIG_GPIO_EXYNOS4)	+= gpio-exynos4.o

obj-$(CONFIG_GPIO_MXS)		+= gpio-mxs.o

obj-$(CONFIG_GPIO_PLAT_SAMSUNG)	+= gpio-plat-samsung.o

obj-$(CONFIG_GPIO_S5PC100)	+= gpio-s5pc100.o

obj-$(CONFIG_GPIO_S5PV210)	+= gpio-s5pv210.o