diff options
Diffstat (limited to 'arch/arm/plat-omap/gpio.c')
| -rw-r--r-- | arch/arm/plat-omap/gpio.c | 134 | 
1 files changed, 100 insertions, 34 deletions
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c index ee0b21f5b09..7fd89ba8d3b 100644 --- a/arch/arm/plat-omap/gpio.c +++ b/arch/arm/plat-omap/gpio.c @@ -6,6 +6,9 @@   * Copyright (C) 2003-2005 Nokia Corporation   * Written by Juha Yrjölä <juha.yrjola@nokia.com>   * + * Copyright (C) 2009 Texas Instruments + * Added OMAP4 support - Santosh Shilimkar <santosh.shilimkar@ti.com> + *   * This program is free software; you can redistribute it and/or modify   * it under the terms of the GNU General Public License version 2 as   * published by the Free Software Foundation. @@ -146,6 +149,16 @@  #define OMAP34XX_GPIO5_BASE		IO_ADDRESS(0x49056000)  #define OMAP34XX_GPIO6_BASE		IO_ADDRESS(0x49058000) +/* + * OMAP44XX  specific GPIO registers + */ +#define OMAP44XX_GPIO1_BASE             IO_ADDRESS(0x4a310000) +#define OMAP44XX_GPIO2_BASE             IO_ADDRESS(0x48055000) +#define OMAP44XX_GPIO3_BASE             IO_ADDRESS(0x48057000) +#define OMAP44XX_GPIO4_BASE             IO_ADDRESS(0x48059000) +#define OMAP44XX_GPIO5_BASE             IO_ADDRESS(0x4805B000) +#define OMAP44XX_GPIO6_BASE             IO_ADDRESS(0x4805D000) +  #define OMAP_MPUIO_VBASE		IO_ADDRESS(OMAP_MPUIO_BASE)  struct gpio_bank { @@ -153,11 +166,13 @@ struct gpio_bank {  	u16 irq;  	u16 virtual_irq_start;  	int method; -#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) +#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP24XX) ||  \ +		defined(CONFIG_ARCH_OMAP34XX) || defined(CONFIG_ARCH_OMAP4)  	u32 suspend_wakeup;  	u32 saved_wakeup;  #endif -#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) +#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ +			defined(CONFIG_ARCH_OMAP4)  	u32 non_wakeup_gpios;  	u32 enabled_non_wakeup_gpios; @@ -251,6 +266,24 @@ static struct gpio_bank gpio_bank_34xx[6] = {  #endif +#ifdef CONFIG_ARCH_OMAP4 +static struct gpio_bank gpio_bank_44xx[6] = { +	{ OMAP44XX_GPIO1_BASE, INT_44XX_GPIO_BANK1, IH_GPIO_BASE,	\ +		METHOD_GPIO_24XX }, +	{ OMAP44XX_GPIO2_BASE, INT_44XX_GPIO_BANK2, IH_GPIO_BASE + 32,	\ +		METHOD_GPIO_24XX }, +	{ OMAP44XX_GPIO3_BASE, INT_44XX_GPIO_BANK3, IH_GPIO_BASE + 64,	\ +		METHOD_GPIO_24XX }, +	{ OMAP44XX_GPIO4_BASE, INT_44XX_GPIO_BANK4, IH_GPIO_BASE + 96,	\ +		METHOD_GPIO_24XX }, +	{ OMAP44XX_GPIO5_BASE, INT_44XX_GPIO_BANK5, IH_GPIO_BASE + 128, \ +		METHOD_GPIO_24XX }, +	{ OMAP44XX_GPIO6_BASE, INT_44XX_GPIO_BANK6, IH_GPIO_BASE + 160, \ +		METHOD_GPIO_24XX }, +}; + +#endif +  static struct gpio_bank *gpio_bank;  static int gpio_bank_count; @@ -273,7 +306,7 @@ static inline struct gpio_bank *get_gpio_bank(int gpio)  	}  	if (cpu_is_omap24xx())  		return &gpio_bank[gpio >> 5]; -	if (cpu_is_omap34xx()) +	if (cpu_is_omap34xx() || cpu_is_omap44xx())  		return &gpio_bank[gpio >> 5];  	BUG();  	return NULL; @@ -285,7 +318,7 @@ static inline int get_gpio_index(int gpio)  		return gpio & 0x1f;  	if (cpu_is_omap24xx())  		return gpio & 0x1f; -	if (cpu_is_omap34xx()) +	if (cpu_is_omap34xx() || cpu_is_omap44xx())  		return gpio & 0x1f;  	return gpio & 0x0f;  } @@ -307,7 +340,7 @@ static inline int gpio_valid(int gpio)  		return 0;  	if (cpu_is_omap24xx() && gpio < 128)  		return 0; -	if (cpu_is_omap34xx() && gpio < 192) +	if ((cpu_is_omap34xx() || cpu_is_omap44xx()) && gpio < 192)  		return 0;  	return -1;  } @@ -353,7 +386,8 @@ static void _set_gpio_direction(struct gpio_bank *bank, int gpio, int is_input)  		reg += OMAP850_GPIO_DIR_CONTROL;  		break;  #endif -#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) +#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ +			defined(CONFIG_ARCH_OMAP4)  	case METHOD_GPIO_24XX:  		reg += OMAP24XX_GPIO_OE;  		break; @@ -425,7 +459,8 @@ static void _set_gpio_dataout(struct gpio_bank *bank, int gpio, int enable)  			l &= ~(1 << gpio);  		break;  #endif -#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) +#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ +			defined(CONFIG_ARCH_OMAP4)  	case METHOD_GPIO_24XX:  		if (enable)  			reg += OMAP24XX_GPIO_SETDATAOUT; @@ -476,7 +511,8 @@ static int __omap_get_gpio_datain(int gpio)  		reg += OMAP850_GPIO_DATA_INPUT;  		break;  #endif -#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) +#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ +			defined(CONFIG_ARCH_OMAP4)  	case METHOD_GPIO_24XX:  		reg += OMAP24XX_GPIO_DATAIN;  		break; @@ -520,7 +556,7 @@ void omap_set_gpio_debounce(int gpio, int enable)  	else  		goto done; -	if (cpu_is_omap34xx()) { +	if (cpu_is_omap34xx() || cpu_is_omap44xx()) {  		if (enable)  			clk_enable(bank->dbck);  		else @@ -550,7 +586,8 @@ void omap_set_gpio_debounce_time(int gpio, int enc_time)  }  EXPORT_SYMBOL(omap_set_gpio_debounce_time); -#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) +#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ +				defined(CONFIG_ARCH_OMAP4)  static inline void set_24xx_gpio_triggering(struct gpio_bank *bank, int gpio,  						int trigger)  { @@ -660,7 +697,8 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger)  			goto bad;  		break;  #endif -#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) +#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ +				defined(CONFIG_ARCH_OMAP4)  	case METHOD_GPIO_24XX:  		set_24xx_gpio_triggering(bank, gpio, trigger);  		break; @@ -745,7 +783,8 @@ static void _clear_gpio_irqbank(struct gpio_bank *bank, int gpio_mask)  		reg += OMAP850_GPIO_INT_STATUS;  		break;  #endif -#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) +#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ +				defined(CONFIG_ARCH_OMAP4)  	case METHOD_GPIO_24XX:  		reg += OMAP24XX_GPIO_IRQSTATUS1;  		break; @@ -814,7 +853,8 @@ static u32 _get_gpio_irqbank_mask(struct gpio_bank *bank)  		inv = 1;  		break;  #endif -#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) +#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ +				defined(CONFIG_ARCH_OMAP4)  	case METHOD_GPIO_24XX:  		reg += OMAP24XX_GPIO_IRQENABLE1;  		mask = 0xffffffff; @@ -887,7 +927,8 @@ static void _enable_gpio_irqbank(struct gpio_bank *bank, int gpio_mask, int enab  			l |= gpio_mask;  		break;  #endif -#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) +#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ +		defined(CONFIG_ARCH_OMAP4)  	case METHOD_GPIO_24XX:  		if (enable)  			reg += OMAP24XX_GPIO_SETIRQENABLE1; @@ -932,7 +973,8 @@ static int _set_gpio_wakeup(struct gpio_bank *bank, int gpio, int enable)  		spin_unlock_irqrestore(&bank->lock, flags);  		return 0;  #endif -#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) +#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ +				defined(CONFIG_ARCH_OMAP4)  	case METHOD_GPIO_24XX:  		if (bank->non_wakeup_gpios & (1 << gpio)) {  			printk(KERN_ERR "Unable to modify wakeup on " @@ -1017,7 +1059,8 @@ static void omap_gpio_free(struct gpio_chip *chip, unsigned offset)  		__raw_writel(1 << offset, reg);  	}  #endif -#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) +#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ +				defined(CONFIG_ARCH_OMAP4)  	if (bank->method == METHOD_GPIO_24XX) {  		/* Disable wake-up during idle for dynamic tick */  		void __iomem *reg = bank->base + OMAP24XX_GPIO_CLEARWKUENA; @@ -1069,7 +1112,8 @@ static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc)  	if (bank->method == METHOD_GPIO_850)  		isr_reg = bank->base + OMAP850_GPIO_INT_STATUS;  #endif -#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) +#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ +				defined(CONFIG_ARCH_OMAP4)  	if (bank->method == METHOD_GPIO_24XX)  		isr_reg = bank->base + OMAP24XX_GPIO_IRQSTATUS1;  #endif @@ -1346,7 +1390,7 @@ static int gpio_2irq(struct gpio_chip *chip, unsigned offset)  /*---------------------------------------------------------------------*/  static int initialized; -#if !defined(CONFIG_ARCH_OMAP3) +#if !(defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4))  static struct clk * gpio_ick;  #endif @@ -1359,7 +1403,7 @@ static struct clk * gpio5_ick;  static struct clk * gpio5_fck;  #endif -#if defined(CONFIG_ARCH_OMAP3) +#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)  static struct clk *gpio_iclks[OMAP34XX_NR_GPIOS];  #endif @@ -1419,8 +1463,8 @@ static int __init _omap_gpio_init(void)  	}  #endif -#if defined(CONFIG_ARCH_OMAP3) -	if (cpu_is_omap34xx()) { +#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4) +	if (cpu_is_omap34xx() || cpu_is_omap44xx()) {  		for (i = 0; i < OMAP34XX_NR_GPIOS; i++) {  			sprintf(clk_name, "gpio%d_ick", i + 1);  			gpio_iclks[i] = clk_get(NULL, clk_name); @@ -1497,6 +1541,17 @@ static int __init _omap_gpio_init(void)  			(rev >> 4) & 0x0f, rev & 0x0f);  	}  #endif +#ifdef CONFIG_ARCH_OMAP4 +	if (cpu_is_omap44xx()) { +		int rev; + +		gpio_bank_count = OMAP34XX_NR_GPIOS; +		gpio_bank = gpio_bank_44xx; +		rev = __raw_readl(gpio_bank[0].base + OMAP24XX_GPIO_REVISION); +		printk(KERN_INFO "OMAP44xx GPIO hardware version %d.%d\n", +			(rev >> 4) & 0x0f, rev & 0x0f); +	} +#endif  	for (i = 0; i < gpio_bank_count; i++) {  		int j, gpio_count = 16; @@ -1520,7 +1575,8 @@ static int __init _omap_gpio_init(void)  			gpio_count = 32; /* 730 has 32-bit GPIOs */  		} -#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) +#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ +				defined(CONFIG_ARCH_OMAP4)  		if (bank->method == METHOD_GPIO_24XX) {  			static const u32 non_wakeup_gpios[] = {  				0xe203ffc0, 0x08700040 @@ -1577,7 +1633,7 @@ static int __init _omap_gpio_init(void)  		set_irq_chained_handler(bank->irq, gpio_irq_handler);  		set_irq_data(bank->irq, bank); -		if (cpu_is_omap34xx()) { +		if (cpu_is_omap34xx() || cpu_is_omap44xx()) {  			sprintf(clk_name, "gpio%d_dbck", i + 1);  			bank->dbck = clk_get(NULL, clk_name);  			if (IS_ERR(bank->dbck)) @@ -1599,7 +1655,8 @@ static int __init _omap_gpio_init(void)  	return 0;  } -#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) +#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP24XX) || \ +		defined(CONFIG_ARCH_OMAP34XX) || defined(CONFIG_ARCH_OMAP4)  static int omap_gpio_suspend(struct sys_device *dev, pm_message_t mesg)  {  	int i; @@ -1622,7 +1679,8 @@ static int omap_gpio_suspend(struct sys_device *dev, pm_message_t mesg)  			wake_set = bank->base + OMAP1610_GPIO_SET_WAKEUPENA;  			break;  #endif -#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) +#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ +				defined(CONFIG_ARCH_OMAP4)  		case METHOD_GPIO_24XX:  			wake_status = bank->base + OMAP24XX_GPIO_WAKE_EN;  			wake_clear = bank->base + OMAP24XX_GPIO_CLEARWKUENA; @@ -1663,7 +1721,8 @@ static int omap_gpio_resume(struct sys_device *dev)  			wake_set = bank->base + OMAP1610_GPIO_SET_WAKEUPENA;  			break;  #endif -#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) +#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ +			defined(CONFIG_ARCH_OMAP4)  		case METHOD_GPIO_24XX:  			wake_clear = bank->base + OMAP24XX_GPIO_CLEARWKUENA;  			wake_set = bank->base + OMAP24XX_GPIO_SETWKUENA; @@ -1695,7 +1754,8 @@ static struct sys_device omap_gpio_device = {  #endif -#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) +#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ +				defined(CONFIG_ARCH_OMAP4)  static int workaround_enabled; @@ -1711,7 +1771,8 @@ void omap2_gpio_prepare_for_retention(void)  		if (!(bank->enabled_non_wakeup_gpios))  			continue; -#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) +#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ +				defined(CONFIG_ARCH_OMAP4)  		bank->saved_datain = __raw_readl(bank->base + OMAP24XX_GPIO_DATAIN);  		l1 = __raw_readl(bank->base + OMAP24XX_GPIO_FALLINGDETECT);  		l2 = __raw_readl(bank->base + OMAP24XX_GPIO_RISINGDETECT); @@ -1720,7 +1781,8 @@ void omap2_gpio_prepare_for_retention(void)  		bank->saved_risingdetect = l2;  		l1 &= ~bank->enabled_non_wakeup_gpios;  		l2 &= ~bank->enabled_non_wakeup_gpios; -#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) +#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ +			defined(CONFIG_ARCH_OMAP4)  		__raw_writel(l1, bank->base + OMAP24XX_GPIO_FALLINGDETECT);  		__raw_writel(l2, bank->base + OMAP24XX_GPIO_RISINGDETECT);  #endif @@ -1745,7 +1807,8 @@ void omap2_gpio_resume_after_retention(void)  		if (!(bank->enabled_non_wakeup_gpios))  			continue; -#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) +#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ +			defined(CONFIG_ARCH_OMAP4)  		__raw_writel(bank->saved_fallingdetect,  				 bank->base + OMAP24XX_GPIO_FALLINGDETECT);  		__raw_writel(bank->saved_risingdetect, @@ -1755,14 +1818,16 @@ void omap2_gpio_resume_after_retention(void)  		 * state.  If so, generate an IRQ by software.  This is  		 * horribly racy, but it's the best we can do to work around  		 * this silicon bug. */ -#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) +#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ +			defined(CONFIG_ARCH_OMAP4)  		l = __raw_readl(bank->base + OMAP24XX_GPIO_DATAIN);  #endif  		l ^= bank->saved_datain;  		l &= bank->non_wakeup_gpios;  		if (l) {  			u32 old0, old1; -#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) +#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \ +			defined(CONFIG_ARCH_OMAP4)  			old0 = __raw_readl(bank->base + OMAP24XX_GPIO_LEVELDETECT0);  			old1 = __raw_readl(bank->base + OMAP24XX_GPIO_LEVELDETECT1);  			__raw_writel(old0 | l, bank->base + OMAP24XX_GPIO_LEVELDETECT0); @@ -1798,7 +1863,8 @@ static int __init omap_gpio_sysinit(void)  	mpuio_init(); -#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) +#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP24XX) || \ +		defined(CONFIG_ARCH_OMAP34XX) || defined(CONFIG_ARCH_OMAP4)  	if (cpu_is_omap16xx() || cpu_class_is_omap2()) {  		if (ret == 0) {  			ret = sysdev_class_register(&omap_gpio_sysclass); @@ -1887,7 +1953,7 @@ static int dbg_gpio_show(struct seq_file *s, void *unused)  			irqstat = irq_desc[irq].status;  #if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP24XX) ||	\ -		defined(CONFIG_ARCH_OMAP34XX) +		defined(CONFIG_ARCH_OMAP34XX) || defined(CONFIG_ARCH_OMAP4)  			if (is_in && ((bank->suspend_wakeup & mask)  					|| irqstat & IRQ_TYPE_SENSE_MASK)) {  				char	*trigger = NULL;  |