aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ifxmips/files
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2008-06-22 20:40:36 +0000
committerJohn Crispin <john@openwrt.org>2008-06-22 20:40:36 +0000
commit5eda098fa7e0db84205b62d6c60486c598d77632 (patch)
treeded888e38cc43d85e9a293a9dd24554af834e922 /target/linux/ifxmips/files
parent1a7f41506ddef25ef3c7c6be5651ad90eed1b8b3 (diff)
downloadupstream-5eda098fa7e0db84205b62d6c60486c598d77632.tar.gz
upstream-5eda098fa7e0db84205b62d6c60486c598d77632.tar.bz2
upstream-5eda098fa7e0db84205b62d6c60486c598d77632.zip
move files, rename defines for ifxmips
SVN-Revision: 11565
Diffstat (limited to 'target/linux/ifxmips/files')
-rw-r--r--target/linux/ifxmips/files/arch/mips/ifxmips/Kconfig4
-rw-r--r--target/linux/ifxmips/files/arch/mips/ifxmips/Makefile2
-rw-r--r--target/linux/ifxmips/files/arch/mips/ifxmips/gpio.c (renamed from target/linux/ifxmips/files/drivers/char/ifxmips_gpio.c)0
-rw-r--r--target/linux/ifxmips/files/arch/mips/ifxmips/reset.c26
-rw-r--r--target/linux/ifxmips/files/drivers/char/ifxmips_mei_core.c22
5 files changed, 25 insertions, 29 deletions
diff --git a/target/linux/ifxmips/files/arch/mips/ifxmips/Kconfig b/target/linux/ifxmips/files/arch/mips/ifxmips/Kconfig
index aadbd5cf9a..f01fcd3625 100644
--- a/target/linux/ifxmips/files/arch/mips/ifxmips/Kconfig
+++ b/target/linux/ifxmips/files/arch/mips/ifxmips/Kconfig
@@ -20,10 +20,6 @@ config IFXMIPS_LED
bool "IFXMips led"
default y
-config IFXMIPS_GPIO
- bool "IFXMips gpio"
- default y
-
config IFXMIPS_SSC
bool "IFXMips ssc"
default y
diff --git a/target/linux/ifxmips/files/arch/mips/ifxmips/Makefile b/target/linux/ifxmips/files/arch/mips/ifxmips/Makefile
index d9c8e6ad70..b221c37d6e 100644
--- a/target/linux/ifxmips/files/arch/mips/ifxmips/Makefile
+++ b/target/linux/ifxmips/files/arch/mips/ifxmips/Makefile
@@ -1 +1 @@
-obj-y := reset.o prom.o setup.o interrupt.o dma-core.o pmu.o board.o cgu.o gptu.o
+obj-y := reset.o prom.o setup.o interrupt.o dma-core.o pmu.o board.o cgu.o gptu.o gpio.o
diff --git a/target/linux/ifxmips/files/drivers/char/ifxmips_gpio.c b/target/linux/ifxmips/files/arch/mips/ifxmips/gpio.c
index 8beb0b8200..8beb0b8200 100644
--- a/target/linux/ifxmips/files/drivers/char/ifxmips_gpio.c
+++ b/target/linux/ifxmips/files/arch/mips/ifxmips/gpio.c
diff --git a/target/linux/ifxmips/files/arch/mips/ifxmips/reset.c b/target/linux/ifxmips/files/arch/mips/ifxmips/reset.c
index 4953c60c8e..1b2aef327b 100644
--- a/target/linux/ifxmips/files/arch/mips/ifxmips/reset.c
+++ b/target/linux/ifxmips/files/arch/mips/ifxmips/reset.c
@@ -32,33 +32,33 @@
#include <asm/ifxmips/ifxmips.h>
static void
-ifxmips_machine_restart (char *command)
+ifxmips_machine_restart(char *command)
{
- printk (KERN_NOTICE "System restart\n");
- local_irq_disable ();
+ printk(KERN_NOTICE "System restart\n");
+ local_irq_disable();
- ifxmips_w32(ifxmips_r32(IFXMIPS_RCU_REQ) | IFXMIPS_RST_ALL, IFXMIPS_RCU_REQ);
- for (;;);
+ ifxmips_w32(ifxmips_r32(IFXMIPS_RCU_RST) | IFXMIPS_RCU_RST_ALL, IFXMIPS_RCU_RST);
+ for(;;);
}
static void
-ifxmips_machine_halt (void)
+ifxmips_machine_halt(void)
{
- printk (KERN_NOTICE "System halted.\n");
- local_irq_disable ();
- for (;;);
+ printk(KERN_NOTICE "System halted.\n");
+ local_irq_disable();
+ for(;;);
}
static void
-ifxmips_machine_power_off (void)
+ifxmips_machine_power_off(void)
{
printk (KERN_NOTICE "Please turn off the power now.\n");
- local_irq_disable ();
- for (;;);
+ local_irq_disable();
+ for(;;);
}
void
-ifxmips_reboot_setup (void)
+ifxmips_reboot_setup(void)
{
_machine_restart = ifxmips_machine_restart;
_machine_halt = ifxmips_machine_halt;
diff --git a/target/linux/ifxmips/files/drivers/char/ifxmips_mei_core.c b/target/linux/ifxmips/files/drivers/char/ifxmips_mei_core.c
index 91e17a9330..e8787c5710 100644
--- a/target/linux/ifxmips/files/drivers/char/ifxmips_mei_core.c
+++ b/target/linux/ifxmips/files/drivers/char/ifxmips_mei_core.c
@@ -725,9 +725,9 @@ mei_fuse_prg (void)
{
u32 reg_data, fuse_value;
int i = 0;
- meiLongwordRead ( IFXMIPS_RCU_REQ, &reg_data);
+ meiLongwordRead ( IFXMIPS_RCU_RST, &reg_data);
while ((reg_data & 0x10000000) == 0) {
- meiLongwordRead ( IFXMIPS_RCU_REQ, &reg_data);
+ meiLongwordRead ( IFXMIPS_RCU_RST, &reg_data);
//add a watchdog
i++;
/* 0x4000 translate to about 16 ms@111M, so should be enough */
@@ -736,8 +736,8 @@ mei_fuse_prg (void)
}
// STEP a: Prepare memory for external accesses
// Write fuse_en bit24
- meiLongwordRead (IFXMIPS_RCU_REQ, &reg_data);
- meiLongwordWrite (IFXMIPS_RCU_REQ, reg_data | (1 << 24));
+ meiLongwordRead (IFXMIPS_RCU_RST, &reg_data);
+ meiLongwordWrite (IFXMIPS_RCU_RST, reg_data | (1 << 24));
mei_fuse_rar_init ();
for (i = 0; i < 4; i++) {
@@ -795,8 +795,8 @@ mei_fuse_prg (void)
break;
}
}
- meiLongwordRead (IFXMIPS_RCU_REQ, &reg_data);
- meiLongwordWrite (IFXMIPS_RCU_REQ, reg_data & 0xF7FFFFFF);
+ meiLongwordRead (IFXMIPS_RCU_RST, &reg_data);
+ meiLongwordWrite (IFXMIPS_RCU_RST, reg_data & 0xF7FFFFFF);
}
/**
@@ -912,11 +912,11 @@ meiResetARC (void)
meiHaltArc ();
- meiLongwordRead (IFXMIPS_RCU_REQ, &arc_debug_data);
- meiLongwordWrite (IFXMIPS_RCU_REQ,
+ meiLongwordRead (IFXMIPS_RCU_RST, &arc_debug_data);
+ meiLongwordWrite (IFXMIPS_RCU_RST,
arc_debug_data | IFXMIPS_RCU_RST_REQ_DFE |
IFXMIPS_RCU_RST_REQ_AFE);
- meiLongwordWrite (IFXMIPS_RCU_REQ, arc_debug_data);
+ meiLongwordWrite (IFXMIPS_RCU_RST, arc_debug_data);
// reset ARC
meiLongwordWrite(MEI_RST_CONTROL, MEI_SOFT_RESET);
meiLongwordWrite(MEI_RST_CONTROL, 0);
@@ -2769,8 +2769,8 @@ mei_ioctl (MEI_inode_t * ino, MEI_file_t * fil, unsigned int command,
*IFXMIPS_GPIO_P0_OD = (*IFXMIPS_GPIO_P0_OD) | 0x800;
//enable ARC JTAG
- meiLongwordRead(IFXMIPS_RCU_REQ, &reg_data);
- meiLongwordWrite(IFXMIPS_RCU_REQ, reg_data | IFXMIPS_RCU_RST_REQ_ARC_JTAG);
+ meiLongwordRead(IFXMIPS_RCU_RST, &reg_data);
+ meiLongwordWrite(IFXMIPS_RCU_RST, reg_data | IFXMIPS_RCU_RST_REQ_ARC_JTAG);
break;
case GET_ADSL_LOOP_DIAGNOSTICS_MODE: