Merge branch 'iop-cleanup' into devel (7af2755d) · Commits · e / devices / android_kernel_fairphone_FP4

arch/arm/Kconfig

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -457,7 +457,7 @@ config ARCH_IOP32X
	depends on MMU		depends on MMU
	select ARCH_REQUIRE_GPIOLIB		select ARCH_REQUIRE_GPIOLIB
	select CPU_XSCALE		select CPU_XSCALE
	select NEED_MACH_GPIO_H		select GPIO_IOP
	select NEED_RET_TO_USER		select NEED_RET_TO_USER
	select PCI		select PCI
	select PLAT_IOP		select PLAT_IOP
	@@ -470,7 +470,7 @@ config ARCH_IOP33X
	depends on MMU		depends on MMU
	select ARCH_REQUIRE_GPIOLIB		select ARCH_REQUIRE_GPIOLIB
	select CPU_XSCALE		select CPU_XSCALE
	select NEED_MACH_GPIO_H		select GPIO_IOP
	select NEED_RET_TO_USER		select NEED_RET_TO_USER
	select PCI		select PCI
	select PLAT_IOP		select PLAT_IOP

arch/arm/include/asm/hardware/iop3xx-gpio.h

deleted100644 → 0

+0 −75

Original line number	Original line	Diff line number	Diff line
	/*
	* arch/arm/include/asm/hardware/iop3xx-gpio.h
	*
	* IOP3xx GPIO wrappers
	*
	* Copyright (c) 2008 Arnaud Patard <arnaud.patard@rtp-net.org>
	* Based on IXP4XX gpio.h file
	*
	* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	*
	*/

	#ifndef __ASM_ARM_HARDWARE_IOP3XX_GPIO_H
	#define __ASM_ARM_HARDWARE_IOP3XX_GPIO_H

	#include <mach/hardware.h>
	#include <asm-generic/gpio.h>

	#define __ARM_GPIOLIB_COMPLEX

	#define IOP3XX_N_GPIOS 8

	static inline int gpio_get_value(unsigned gpio)
	{
	if (gpio > IOP3XX_N_GPIOS)
	return __gpio_get_value(gpio);

	return gpio_line_get(gpio);
	}

	static inline void gpio_set_value(unsigned gpio, int value)
	{
	if (gpio > IOP3XX_N_GPIOS) {
	__gpio_set_value(gpio, value);
	return;
	}
	gpio_line_set(gpio, value);
	}

	static inline int gpio_cansleep(unsigned gpio)
	{
	if (gpio < IOP3XX_N_GPIOS)
	return 0;
	else
	return __gpio_cansleep(gpio);
	}

	/*
	* The GPIOs are not generating any interrupt
	* Note : manuals are not clear about this
	*/
	static inline int gpio_to_irq(int gpio)
	{
	return -EINVAL;
	}

	static inline int irq_to_gpio(int gpio)
	{
	return -EINVAL;
	}

	#endif

arch/arm/include/asm/hardware/iop3xx.h

+0 −12

Original line number	Original line	Diff line number	Diff line
	@@ -18,16 +18,9 @@
	/*		/*
	* IOP3XX GPIO handling		* IOP3XX GPIO handling
	*/		*/
	#define GPIO_IN 0
	#define GPIO_OUT 1
	#define GPIO_LOW 0
	#define GPIO_HIGH 1
	#define IOP3XX_GPIO_LINE(x) (x)		#define IOP3XX_GPIO_LINE(x) (x)

	#ifndef __ASSEMBLY__		#ifndef __ASSEMBLY__
	extern void gpio_line_config(int line, int direction);
	extern int gpio_line_get(int line);
	extern void gpio_line_set(int line, int value);
	extern int init_atu;		extern int init_atu;
	extern int iop3xx_get_init_atu(void);		extern int iop3xx_get_init_atu(void);
	#endif		#endif
	@@ -168,11 +161,6 @@ extern int iop3xx_get_init_atu(void);
	/* PERCR0 DOESN'T EXIST - index from 1! */		/* PERCR0 DOESN'T EXIST - index from 1! */
	#define IOP3XX_PERCR0 (volatile u32 *)IOP3XX_REG_ADDR(0x0710)		#define IOP3XX_PERCR0 (volatile u32 *)IOP3XX_REG_ADDR(0x0710)

	/* General Purpose I/O */
	#define IOP3XX_GPOE (volatile u32 *)IOP3XX_GPIO_REG(0x0000)
	#define IOP3XX_GPID (volatile u32 *)IOP3XX_GPIO_REG(0x0004)
	#define IOP3XX_GPOD (volatile u32 *)IOP3XX_GPIO_REG(0x0008)

	/* Timers */		/* Timers */
	#define IOP3XX_TU_TMR0 (volatile u32 *)IOP3XX_TIMER_REG(0x0000)		#define IOP3XX_TU_TMR0 (volatile u32 *)IOP3XX_TIMER_REG(0x0000)
	#define IOP3XX_TU_TMR1 (volatile u32 *)IOP3XX_TIMER_REG(0x0004)		#define IOP3XX_TU_TMR1 (volatile u32 *)IOP3XX_TIMER_REG(0x0004)

arch/arm/mach-iop32x/em7210.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -32,6 +32,7 @@
	#include <asm/mach/time.h>		#include <asm/mach/time.h>
	#include <asm/mach-types.h>		#include <asm/mach-types.h>
	#include <mach/time.h>		#include <mach/time.h>
			#include "gpio-iop32x.h"

	static void __init em7210_timer_init(void)		static void __init em7210_timer_init(void)
	{		{
	@@ -183,6 +184,7 @@ void em7210_power_off(void)

	static void __init em7210_init_machine(void)		static void __init em7210_init_machine(void)
	{		{
			register_iop32x_gpio();
	platform_device_register(&em7210_serial_device);		platform_device_register(&em7210_serial_device);
	platform_device_register(&iop3xx_i2c0_device);		platform_device_register(&iop3xx_i2c0_device);
	platform_device_register(&iop3xx_i2c1_device);		platform_device_register(&iop3xx_i2c1_device);

arch/arm/mach-iop32x/glantank.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -34,6 +34,7 @@
	#include <asm/mach-types.h>		#include <asm/mach-types.h>
	#include <asm/page.h>		#include <asm/page.h>
	#include <mach/time.h>		#include <mach/time.h>
			#include "gpio-iop32x.h"

	/*		/*
	* GLAN Tank timer tick configuration.		* GLAN Tank timer tick configuration.
	@@ -187,6 +188,7 @@ static void glantank_power_off(void)

	static void __init glantank_init_machine(void)		static void __init glantank_init_machine(void)
	{		{
			register_iop32x_gpio();
	platform_device_register(&iop3xx_i2c0_device);		platform_device_register(&iop3xx_i2c0_device);
	platform_device_register(&iop3xx_i2c1_device);		platform_device_register(&iop3xx_i2c1_device);
	platform_device_register(&glantank_flash_device);		platform_device_register(&glantank_flash_device);