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

Commit 72edd84a authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Russell King
Browse files

[ARM] 3827/1: iop3xx: add common gpio module 



Implement the gpio_line_{config,get,set} API for iop3xx.

Signed-off-by: default avatarLennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 610300e8

arch/arm/plat-iop/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Makefile for the linux kernel.

#



obj-y			:= i2c.o pci.o setup.o time.o

obj-y			:= gpio.o i2c.o pci.o setup.o time.o

obj-m			:=

obj-n			:=

obj-			:=

arch/arm/plat-iop/gpio.c

0 → 100644
+48 −0
Original line number Diff line number Diff line 
/*

 * arch/arm/plat-iop/gpio.c

 * GPIO handling for Intel IOP3xx processors.

 *

 * Copyright (C) 2006 Lennert Buytenhek <buytenh@wantstofly.org>

 *

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

 */



#include <linux/device.h>

#include <asm/hardware/iop3xx.h>



void gpio_line_config(int line, int direction)

{

	unsigned long flags;



	local_irq_save(flags);

	if (direction == GPIO_IN) {

		*IOP3XX_GPOE |= 1 << line;

	} else if (direction == GPIO_OUT) {

		*IOP3XX_GPOE &= ~(1 << line);

	}

	local_irq_restore(flags);

}

EXPORT_SYMBOL(gpio_line_config);



int gpio_line_get(int line)

{

	return !!(*IOP3XX_GPID & (1 << line));

}

EXPORT_SYMBOL(gpio_line_get);



void gpio_line_set(int line, int value)

{

	unsigned long flags;



	local_irq_save(flags);

	if (value == GPIO_LOW) {

		*IOP3XX_GPOD &= ~(1 << line);

	} else if (value == GPIO_HIGH) {

		*IOP3XX_GPOD |= 1 << line;

	}

	local_irq_restore(flags);

}

EXPORT_SYMBOL(gpio_line_set);

drivers/i2c/busses/i2c-iop3xx.c

+9 −7
Original line number Diff line number Diff line
@@ -82,14 +82,16 @@ iop3xx_i2c_enable(struct i2c_algo_iop3xx_data *iop3xx_adap) 


	/* 

	 * Every time unit enable is asserted, GPOD needs to be cleared

	 * on IOP32X to avoid data corruption on the bus.

	 * on IOP3XX to avoid data corruption on the bus.

	 */

#ifdef CONFIG_ARCH_IOP32X

#define IOP321_GPOD_I2C0    0x00c0  /* clear these bits to enable ch0 */

#define IOP321_GPOD_I2C1    0x0030  /* clear these bits to enable ch1 */



	*IOP321_GPOD &= (iop3xx_adap->id == 0) ? ~IOP321_GPOD_I2C0 : 

		~IOP321_GPOD_I2C1;

#ifdef CONFIG_PLAT_IOP

	if (iop3xx_adap->id == 0) {

		gpio_line_set(IOP3XX_GPIO_LINE(7), GPIO_LOW);

		gpio_line_set(IOP3XX_GPIO_LINE(6), GPIO_LOW);

	} else {

		gpio_line_set(IOP3XX_GPIO_LINE(5), GPIO_LOW);

		gpio_line_set(IOP3XX_GPIO_LINE(4), GPIO_LOW);

	}

#endif

	/* NB SR bits not same position as CR IE bits :-( */

	iop3xx_adap->SR_enabled =

include/asm-arm/arch-iop32x/iop321.h

+1 −0
Original line number Diff line number Diff line
@@ -216,6 +216,7 @@ 
 * Peripherals that are shared between the iop32x and iop33x but

 * located at different addresses.

 */

#define IOP3XX_GPIO_REG(reg)   (IOP3XX_PERIPHERAL_VIRT_BASE + 0x07c0 + (reg))

#define IOP3XX_TIMER_REG(reg)  (IOP3XX_PERIPHERAL_VIRT_BASE + 0x07e0 + (reg))



#include <asm/hardware/iop3xx.h>

include/asm-arm/arch-iop33x/iop331.h

+1 −0
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ 
 * Peripherals that are shared between the iop32x and iop33x but

 * located at different addresses.

 */

#define IOP3XX_GPIO_REG(reg)   (IOP3XX_PERIPHERAL_VIRT_BASE + 0x1780 + (reg))

#define IOP3XX_TIMER_REG(reg)  (IOP3XX_PERIPHERAL_VIRT_BASE + 0x07d0 + (reg))



#include <asm/hardware/iop3xx.h>