X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Ffiles%2Farch%2Fmips%2Fralink%2Frt305x%2Frt305x.c;h=70f548a11d4385790bdea0051b36b3d7ec61761f;hb=5045f0c4dada84278362a62d9ce4187467487422;hp=9d940a2f541be2556748ac56c8ee65981dbfd907;hpb=b887a6d197170b719028f31085876d8deaed35b6;p=openwrt.git

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 9d940a2f54..70f548a11d 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/rt305x.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/rt305x.c
@@ -1,7 +1,7 @@
 /*
  * Ralink RT305x SoC specific setup
  *
- * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008-2011 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
@@ -15,18 +15,11 @@
 #include <linux/init.h>
 #include <linux/module.h>
 
+#include <asm/mach-ralink/common.h>
+#include <asm/mach-ralink/ramips_gpio.h>
 #include <asm/mach-ralink/rt305x.h>
 #include <asm/mach-ralink/rt305x_regs.h>
 
-unsigned char rt305x_sys_type[RT305X_SYS_TYPE_LEN];
-
-unsigned long rt305x_cpu_freq;
-EXPORT_SYMBOL_GPL(rt305x_cpu_freq);
-
-unsigned long rt305x_sys_freq;
-EXPORT_SYMBOL_GPL(rt305x_sys_freq);
-
-void __iomem * rt305x_intc_base;
 void __iomem * rt305x_sysc_base;
 void __iomem * rt305x_memc_base;
 
@@ -40,7 +33,7 @@ void __init rt305x_detect_sys_type(void)
 	n1 = rt305x_sysc_rr(SYSC_REG_CHIP_NAME1);
 	id = rt305x_sysc_rr(SYSC_REG_CHIP_ID);
 
-	snprintf(rt305x_sys_type, RT305X_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),
@@ -50,21 +43,59 @@ void __init rt305x_detect_sys_type(void)
 		(id & CHIP_ID_REV_MASK));
 }
 
-void __init rt305x_detect_sys_freq(void)
+static void rt305x_gpio_reserve(int first, int last)
 {
-	u32	t;
+	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);
 
-	t = rt305x_sysc_rr(SYSC_REG_SYSTEM_CONFIG);
-	t = ((t >> SYSTEM_CONFIG_CPUCLK_SHIFT) & SYSTEM_CONFIG_CPUCLK_MASK);
+	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 SYSTEM_CONFIG_CPUCLK_320:
-		rt305x_cpu_freq = 320000000;
+	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 SYSTEM_CONFIG_CPUCLK_384:
-		rt305x_cpu_freq = 384000000;
+	case RT305X_GPIO_MODE_GPIO_UARTF:
+	case RT305X_GPIO_MODE_GPIO_I2S:
+		rt305x_gpio_reserve(RT305X_GPIO_7, RT305X_GPIO_10);
 		break;
 	}
 
-	rt305x_sys_freq = rt305x_cpu_freq / 3;
+	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);
 }