9
0
Fork 0

i.MX: split out iomux-v1 support

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2009-12-03 14:13:41 +01:00
parent 28d2ad70a6
commit 6bd5caf6c6
3 changed files with 90 additions and 63 deletions

View File

@ -1,8 +1,8 @@
obj-y += clocksource.o
obj-$(CONFIG_ARCH_IMX1) += speed-imx1.o gpio.o
obj-$(CONFIG_ARCH_IMX1) += speed-imx1.o gpio.o iomux-v1.o
obj-$(CONFIG_ARCH_IMX25) += speed-imx25.o iomux-v3.o
obj-$(CONFIG_ARCH_IMX21) += speed-imx21.o gpio.o imx21.o
obj-$(CONFIG_ARCH_IMX27) += speed-imx27.o gpio.o imx27.o
obj-$(CONFIG_ARCH_IMX21) += speed-imx21.o gpio.o imx21.o iomux-v1.o
obj-$(CONFIG_ARCH_IMX27) += speed-imx27.o gpio.o imx27.o iomux-v1.o
obj-$(CONFIG_ARCH_IMX31) += speed-imx31.o iomux-v2.o
obj-$(CONFIG_ARCH_IMX35) += speed-imx35.o iomux-v3.o
obj-$(CONFIG_IMX_CLKO) += clko.o

View File

@ -26,66 +26,6 @@
#include <common.h>
#include <mach/imx-regs.h>
void imx_gpio_mode(int gpio_mode)
{
unsigned int pin = gpio_mode & GPIO_PIN_MASK;
unsigned int port = (gpio_mode & GPIO_PORT_MASK) >> GPIO_PORT_SHIFT;
unsigned int ocr = (gpio_mode & GPIO_OCR_MASK) >> GPIO_OCR_SHIFT;
unsigned int aout = (gpio_mode & GPIO_AOUT_MASK) >> GPIO_AOUT_SHIFT;
unsigned int bout = (gpio_mode & GPIO_BOUT_MASK) >> GPIO_BOUT_SHIFT;
unsigned int tmp;
/* Pullup enable */
if(gpio_mode & GPIO_PUEN)
PUEN(port) |= (1 << pin);
else
PUEN(port) &= ~(1 << pin);
/* Data direction */
if(gpio_mode & GPIO_OUT)
DDIR(port) |= 1 << pin;
else
DDIR(port) &= ~(1 << pin);
/* Primary / alternate function */
if(gpio_mode & GPIO_AF)
GPR(port) |= (1 << pin);
else
GPR(port) &= ~(1 << pin);
/* use as gpio? */
if(!(gpio_mode & (GPIO_PF | GPIO_AF)))
GIUS(port) |= (1 << pin);
else
GIUS(port) &= ~(1 << pin);
/* Output / input configuration */
if (pin < 16) {
tmp = OCR1(port);
tmp &= ~(3 << (pin * 2));
tmp |= (ocr << (pin * 2));
OCR1(port) = tmp;
ICONFA1(port) &= ~(3 << (pin * 2));
ICONFA1(port) |= aout << (pin * 2);
ICONFB1(port) &= ~(3 << (pin * 2));
ICONFB1(port) |= bout << (pin * 2);
} else {
pin -= 16;
tmp = OCR2(port);
tmp &= ~(3 << (pin * 2));
tmp |= (ocr << (pin * 2));
OCR2(port) = tmp;
ICONFA2(port) &= ~(3 << (pin * 2));
ICONFA2(port) |= aout << (pin * 2);
ICONFB2(port) &= ~(3 << (pin * 2));
ICONFB2(port) |= bout << (pin * 2);
}
}
void gpio_set_value(unsigned gpio, int value)
{
if(value)

View File

@ -0,0 +1,87 @@
#include <common.h>
#include <mach/imx-regs.h>
/*
* GPIO Module and I/O Multiplexer
* x = 0..3 for reg_A, reg_B, reg_C, reg_D
*
* i.MX1 and i.MXL: 0 <= x <= 3
* i.MX27 : 0 <= x <= 5
*/
#define DDIR(x) __REG2(IMX_GPIO_BASE + 0x00, ((x) & 7) << 8)
#define OCR1(x) __REG2(IMX_GPIO_BASE + 0x04, ((x) & 7) << 8)
#define OCR2(x) __REG2(IMX_GPIO_BASE + 0x08, ((x) & 7) << 8)
#define ICONFA1(x) __REG2(IMX_GPIO_BASE + 0x0c, ((x) & 7) << 8)
#define ICONFA2(x) __REG2(IMX_GPIO_BASE + 0x10, ((x) & 7) << 8)
#define ICONFB1(x) __REG2(IMX_GPIO_BASE + 0x14, ((x) & 7) << 8)
#define ICONFB2(x) __REG2(IMX_GPIO_BASE + 0x18, ((x) & 7) << 8)
#define DR(x) __REG2(IMX_GPIO_BASE + 0x1c, ((x) & 7) << 8)
#define GIUS(x) __REG2(IMX_GPIO_BASE + 0x20, ((x) & 7) << 8)
#define SSR(x) __REG2(IMX_GPIO_BASE + 0x24, ((x) & 7) << 8)
#define ICR1(x) __REG2(IMX_GPIO_BASE + 0x28, ((x) & 7) << 8)
#define ICR2(x) __REG2(IMX_GPIO_BASE + 0x2c, ((x) & 7) << 8)
#define IMR(x) __REG2(IMX_GPIO_BASE + 0x30, ((x) & 7) << 8)
#define ISR(x) __REG2(IMX_GPIO_BASE + 0x34, ((x) & 7) << 8)
#define GPR(x) __REG2(IMX_GPIO_BASE + 0x38, ((x) & 7) << 8)
#define SWR(x) __REG2(IMX_GPIO_BASE + 0x3c, ((x) & 7) << 8)
#define PUEN(x) __REG2(IMX_GPIO_BASE + 0x40, ((x) & 7) << 8)
void imx_gpio_mode(int gpio_mode)
{
unsigned int pin = gpio_mode & GPIO_PIN_MASK;
unsigned int port = (gpio_mode & GPIO_PORT_MASK) >> GPIO_PORT_SHIFT;
unsigned int ocr = (gpio_mode & GPIO_OCR_MASK) >> GPIO_OCR_SHIFT;
unsigned int aout = (gpio_mode & GPIO_AOUT_MASK) >> GPIO_AOUT_SHIFT;
unsigned int bout = (gpio_mode & GPIO_BOUT_MASK) >> GPIO_BOUT_SHIFT;
unsigned int tmp;
/* Pullup enable */
if(gpio_mode & GPIO_PUEN)
PUEN(port) |= (1 << pin);
else
PUEN(port) &= ~(1 << pin);
/* Data direction */
if(gpio_mode & GPIO_OUT)
DDIR(port) |= 1 << pin;
else
DDIR(port) &= ~(1 << pin);
/* Primary / alternate function */
if(gpio_mode & GPIO_AF)
GPR(port) |= (1 << pin);
else
GPR(port) &= ~(1 << pin);
/* use as gpio? */
if(!(gpio_mode & (GPIO_PF | GPIO_AF)))
GIUS(port) |= (1 << pin);
else
GIUS(port) &= ~(1 << pin);
/* Output / input configuration */
if (pin < 16) {
tmp = OCR1(port);
tmp &= ~(3 << (pin * 2));
tmp |= (ocr << (pin * 2));
OCR1(port) = tmp;
ICONFA1(port) &= ~(3 << (pin * 2));
ICONFA1(port) |= aout << (pin * 2);
ICONFB1(port) &= ~(3 << (pin * 2));
ICONFB1(port) |= bout << (pin * 2);
} else {
pin -= 16;
tmp = OCR2(port);
tmp &= ~(3 << (pin * 2));
tmp |= (ocr << (pin * 2));
OCR2(port) = tmp;
ICONFA2(port) &= ~(3 << (pin * 2));
ICONFA2(port) |= aout << (pin * 2);
ICONFB2(port) &= ~(3 << (pin * 2));
ICONFB2(port) |= bout << (pin * 2);
}
}