summaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/files/arch/mips/ralink
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-09-04 15:08:26 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-09-04 15:08:26 +0000
commit2f3b768d56c443c04e57ada7ac6893ef7c8ab7bc (patch)
treeccf6a5b81e9dc2421a4387d63ac2735067130ab1 /target/linux/ramips/files/arch/mips/ralink
parent3ff4f7ce16ee4fa844ab699d64c1b8f8f8065c07 (diff)
[ramips] add GPIO configuration feature
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17512 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ramips/files/arch/mips/ralink')
-rw-r--r--target/linux/ramips/files/arch/mips/ralink/common/gpio.c2
-rw-r--r--target/linux/ramips/files/arch/mips/ralink/rt288x/mach-rt-n15.c6
-rw-r--r--target/linux/ramips/files/arch/mips/ralink/rt288x/rt288x.c35
-rw-r--r--target/linux/ramips/files/arch/mips/ralink/rt305x/mach-v22rw-2x2.c6
-rw-r--r--target/linux/ramips/files/arch/mips/ralink/rt305x/mach-whr-g300n.c4
-rw-r--r--target/linux/ramips/files/arch/mips/ralink/rt305x/rt305x.c58
6 files changed, 108 insertions, 3 deletions
diff --git a/target/linux/ramips/files/arch/mips/ralink/common/gpio.c b/target/linux/ramips/files/arch/mips/ralink/common/gpio.c
index f882b925a..4e90df024 100644
--- a/target/linux/ramips/files/arch/mips/ralink/common/gpio.c
+++ b/target/linux/ramips/files/arch/mips/ralink/common/gpio.c
@@ -220,5 +220,3 @@ __init int ramips_gpio_init(void)
return 0;
}
-
-arch_initcall(ramips_gpio_init);
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-rt-n15.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-rt-n15.c
index be5c815cb..26f08845b 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-rt-n15.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/mach-rt-n15.c
@@ -18,10 +18,14 @@
#include <asm/mips_machine.h>
#include <asm/mach-ralink/machine.h>
#include <asm/mach-ralink/dev_gpio_leds.h>
+#include <asm/mach-ralink/rt288x.h>
+#include <asm/mach-ralink/rt288x_regs.h>
#include "devices.h"
#define RT_N15_GPIO_LED_POWER 11
+#define RT_N15_GPIO_BUTTON_WPS 0
+#define RT_N15_GPIO_BUTTON_RESET 12
#ifdef CONFIG_MTD_PARTITIONS
static struct mtd_partition rt_n15_partitions[] = {
@@ -73,6 +77,8 @@ static struct gpio_led rt_n15_leds_gpio[] __initdata = {
static void __init rt_n15_init(void)
{
+ rt288x_gpio_init(RT2880_GPIO_MODE_UART0);
+
rt288x_register_flash(0, &rt_n15_flash_data);
ramips_register_gpio_leds(-1, ARRAY_SIZE(rt_n15_leds_gpio),
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/rt288x.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/rt288x.c
index e7c3787e1..49a301a1e 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt288x/rt288x.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/rt288x.c
@@ -1,7 +1,7 @@
/*
* Ralink RT288x SoC specific setup
*
- * Copyright (C) 2008 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
* Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
*
* Parts of this file are based on Ralink's 2.6.21 BSP
@@ -14,6 +14,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/module.h>
+#include <linux/gpio.h>
#include <asm/mach-ralink/common.h>
#include <asm/mach-ralink/rt288x.h>
@@ -73,3 +74,35 @@ void __init rt288x_detect_sys_freq(void)
rt288x_sys_freq = rt288x_cpu_freq / 2;
}
+static void rt288x_gpio_reserve(int first, int last)
+{
+ for (; first <= last; first++)
+ gpio_request(first, "reserved");
+}
+
+void __init rt288x_gpio_init(u32 mode)
+{
+ rt288x_sysc_wr(mode, SYSC_REG_GPIO_MODE);
+
+ ramips_gpio_init();
+ if ((mode & RT2880_GPIO_MODE_I2C) == 0)
+ rt288x_gpio_reserve(1, 2);
+
+ if ((mode & RT2880_GPIO_MODE_SPI) == 0)
+ rt288x_gpio_reserve(3, 6);
+
+ if ((mode & RT2880_GPIO_MODE_UART0) == 0)
+ rt288x_gpio_reserve(7, 14);
+
+ if ((mode & RT2880_GPIO_MODE_JTAG) == 0)
+ rt288x_gpio_reserve(17, 21);
+
+ if ((mode & RT2880_GPIO_MODE_MDIO) == 0)
+ rt288x_gpio_reserve(22, 23);
+
+ if ((mode & RT2880_GPIO_MODE_SDRAM) == 0)
+ rt288x_gpio_reserve(24, 39);
+
+ if ((mode & RT2880_GPIO_MODE_PCI) == 0)
+ rt288x_gpio_reserve(40, 71);
+}
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-v22rw-2x2.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-v22rw-2x2.c
index 118676327..8bd2c956f 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-v22rw-2x2.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-v22rw-2x2.c
@@ -18,9 +18,13 @@
#include <asm/mips_machine.h>
#include <asm/mach-ralink/machine.h>
#include <asm/mach-ralink/dev_gpio_leds.h>
+#include <asm/mach-ralink/rt305x.h>
+#include <asm/mach-ralink/rt305x_regs.h>
#include "devices.h"
+#define V22RW_2X2_GPIO_BUTTON_WPS 0
+#define V22RW_2X2_GPIO_BUTTON_SWRST 10
#define V22RW_2X2_GPIO_LED_SECURITY 13
#define V22RW_2X2_GPIO_LED_WPS 14
@@ -78,6 +82,8 @@ static struct gpio_led v22rw_2x2_leds_gpio[] __initdata = {
static void __init v22rw_2x2_init(void)
{
+ rt305x_gpio_init(RT305X_GPIO_MODE_GPIO << RT305X_GPIO_MODE_UART0_SHIFT);
+
rt305x_register_flash(0, &v22rw_2x2_flash_data);
ramips_register_gpio_leds(-1, ARRAY_SIZE(v22rw_2x2_leds_gpio),
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-whr-g300n.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-whr-g300n.c
index 97fe85737..2c2f44469 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-whr-g300n.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-whr-g300n.c
@@ -18,6 +18,8 @@
#include <asm/mips_machine.h>
#include <asm/mach-ralink/machine.h>
#include <asm/mach-ralink/dev_gpio_leds.h>
+#include <asm/mach-ralink/rt305x.h>
+#include <asm/mach-ralink/rt305x_regs.h>
#include "devices.h"
@@ -87,6 +89,8 @@ static struct gpio_led whr_g300n_leds_gpio[] __initdata = {
static void __init whr_g300n_init(void)
{
+ rt305x_gpio_init(RT305X_GPIO_MODE_GPIO << RT305X_GPIO_MODE_UART0_SHIFT);
+
rt305x_register_flash(0, &whr_g300n_flash_data);
ramips_register_gpio_leds(-1, ARRAY_SIZE(whr_g300n_leds_gpio),
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/rt305x.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/rt305x.c
index 249da36b0..002aaebab 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/rt305x.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/rt305x.c
@@ -14,6 +14,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/module.h>
+#include <linux/gpio.h>
#include <asm/mach-ralink/common.h>
#include <asm/mach-ralink/rt305x.h>
@@ -66,3 +67,60 @@ void __init rt305x_detect_sys_freq(void)
rt305x_sys_freq = rt305x_cpu_freq / 3;
}
+
+static void rt305x_gpio_reserve(int first, int last)
+{
+ for (; first <= last; first++)
+ gpio_request(first, "reserved");
+}
+
+void __init rt305x_gpio_init(u32 mode)
+{
+ u32 t;
+
+ rt305x_sysc_wr(mode, SYSC_REG_GPIO_MODE);
+
+ ramips_gpio_init();
+ if ((mode & RT305X_GPIO_MODE_I2C) == 0)
+ rt305x_gpio_reserve(RT305X_GPIO_I2C_SD, RT305X_GPIO_I2C_SCLK);
+
+ if ((mode & RT305X_GPIO_MODE_SPI) == 0)
+ rt305x_gpio_reserve(RT305X_GPIO_SPI_EN, RT305X_GPIO_SPI_CLK);
+
+ t = mode >> RT305X_GPIO_MODE_UART0_SHIFT;
+ t &= RT305X_GPIO_MODE_UART0_MASK;
+ switch (t) {
+ case RT305X_GPIO_MODE_UARTF:
+ case RT305X_GPIO_MODE_PCM_UARTF:
+ case RT305X_GPIO_MODE_PCM_I2S:
+ case RT305X_GPIO_MODE_I2S_UARTF:
+ rt305x_gpio_reserve(RT305X_GPIO_7, RT305X_GPIO_14);
+ break;
+ case RT305X_GPIO_MODE_PCM_GPIO:
+ rt305x_gpio_reserve(RT305X_GPIO_10, RT305X_GPIO_14);
+ break;
+ case RT305X_GPIO_MODE_GPIO_UARTF:
+ case RT305X_GPIO_MODE_GPIO_I2S:
+ rt305x_gpio_reserve(RT305X_GPIO_7, RT305X_GPIO_10);
+ break;
+ }
+
+ if ((mode & RT305X_GPIO_MODE_UART1) == 0)
+ rt305x_gpio_reserve(RT305X_GPIO_UART1_TXD,
+ RT305X_GPIO_UART1_RXD);
+
+ if ((mode & RT305X_GPIO_MODE_JTAG) == 0)
+ rt305x_gpio_reserve(RT305X_GPIO_JTAG_TDO, RT305X_GPIO_JTAG_TDI);
+
+ if ((mode & RT305X_GPIO_MODE_MDIO) == 0)
+ rt305x_gpio_reserve(RT305X_GPIO_MDIO_MDC,
+ RT305X_GPIO_MDIO_MDIO);
+
+ if ((mode & RT305X_GPIO_MODE_SDRAM) == 0)
+ rt305x_gpio_reserve(RT305X_GPIO_SDRAM_MD16,
+ RT305X_GPIO_SDRAM_MD31);
+
+ if ((mode & RT305X_GPIO_MODE_RGMII) == 0)
+ rt305x_gpio_reserve(RT305X_GPIO_GE0_TXD0,
+ RT305X_GPIO_GE0_RXCLK);
+}