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

Commit 4ac941d2 authored by Dan Williams's avatar Dan Williams Committed by Russell King
Browse files

[ARM] 4082/1: iop3xx: fix iop33x gpio register offset 



iop33x gpio offset is correct in include/asm-arm/arch-iop33x/iop33x.h, but
include/asm-arm/hardware/iop3xx.h adds 4.

Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 9ca3f07b

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

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,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_GPIO_REG(reg)	(IOP3XX_PERIPHERAL_VIRT_BASE + 0x07c4 + (reg))

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



#include <asm/hardware/iop3xx.h>

include/asm-arm/hardware/iop3xx.h

+3 −3
Original line number Diff line number Diff line
@@ -168,9 +168,9 @@ extern void gpio_line_set(int line, int value); 
#define IOP3XX_PERCR0		(volatile u32 *)IOP3XX_REG_ADDR(0x0710)



/* General Purpose I/O  */

#define IOP3XX_GPOE		(volatile u32 *)IOP3XX_GPIO_REG(0x0004)

#define IOP3XX_GPID		(volatile u32 *)IOP3XX_GPIO_REG(0x0008)

#define IOP3XX_GPOD		(volatile u32 *)IOP3XX_GPIO_REG(0x000c)

#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  */

#define IOP3XX_TU_TMR0		(volatile u32 *)IOP3XX_TIMER_REG(0x0000)