ramips: update mips multi-machine stuff

[openwrt.git] / target / linux / ramips / files / arch / mips / ralink / rt288x / rt288x.c

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 cd429a1..49a301a 100644 (file)
--- 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,19 +14,18 @@
 #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>
 #include <asm/mach-ralink/rt288x_regs.h>
 
-unsigned char rt288x_sys_type[RT288X_SYS_TYPE_LEN];
-
 unsigned long rt288x_cpu_freq;
 EXPORT_SYMBOL_GPL(rt288x_cpu_freq);
 
 unsigned long rt288x_sys_freq;
 EXPORT_SYMBOL_GPL(rt288x_sys_freq);
 
-void __iomem * rt288x_intc_base;
 void __iomem * rt288x_sysc_base;
 void __iomem * rt288x_memc_base;
 
@@ -40,7 +39,7 @@ void __init rt288x_detect_sys_type(void)
        n1 = rt288x_sysc_rr(SYSC_REG_CHIP_NAME1);
        id = rt288x_sysc_rr(SYSC_REG_CHIP_ID);
 
-       snprintf(rt288x_sys_type, RT288X_SYS_TYPE_LEN,
+       snprintf(ramips_sys_type, RAMIPS_SYS_TYPE_LEN,
                "Ralink %c%c%c%c%c%c%c%c id:%u rev:%u",
                (char) (n0 & 0xff), (char) ((n0 >> 8) & 0xff),
                (char) ((n0 >> 16) & 0xff), (char) ((n0 >> 24) & 0xff),
@@ -75,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);
+}