Commit df038a2e authored by Miles Bader's avatar Miles Bader Committed by Linus Torvalds

[PATCH] Update AS85EP1 port on v850

parent ae51f84c
...@@ -98,8 +98,6 @@ void __init mach_setup (char **cmdline) ...@@ -98,8 +98,6 @@ void __init mach_setup (char **cmdline)
AS85EP1_PORT_PMC (LEDS_PORT) = 0; /* Make the LEDs port an I/O port. */ AS85EP1_PORT_PMC (LEDS_PORT) = 0; /* Make the LEDs port an I/O port. */
AS85EP1_PORT_PM (LEDS_PORT) = 0; /* Make all the bits output pins. */ AS85EP1_PORT_PM (LEDS_PORT) = 0; /* Make all the bits output pins. */
mach_tick = as85ep1_led_tick; mach_tick = as85ep1_led_tick;
ROOT_DEV = MKDEV (BLKMEM_MAJOR, 0);
} }
void __init mach_get_physical_ram (unsigned long *ram_start, void __init mach_get_physical_ram (unsigned long *ram_start,
...@@ -133,10 +131,10 @@ void __init mach_reserve_bootmem () ...@@ -133,10 +131,10 @@ void __init mach_reserve_bootmem ()
root_fs_image_end - root_fs_image_start); root_fs_image_end - root_fs_image_start);
} }
void mach_gettimeofday (struct timeval *tv) void mach_gettimeofday (struct timespec *tv)
{ {
tv->tv_sec = 0; tv->tv_sec = 0;
tv->tv_usec = 0; tv->tv_nsec = 0;
} }
void __init mach_sched_init (struct irqaction *timer_action) void __init mach_sched_init (struct irqaction *timer_action)
......
...@@ -14,8 +14,9 @@ ...@@ -14,8 +14,9 @@
#ifndef __V850_AS85EP1_H__ #ifndef __V850_AS85EP1_H__
#define __V850_AS85EP1_H__ #define __V850_AS85EP1_H__
#include <asm/v850e.h>
#define CPU_ARCH "v850e"
#define CPU_MODEL "as85ep1" #define CPU_MODEL "as85ep1"
#define CPU_MODEL_LONG "NEC V850E/AS85EP1" #define CPU_MODEL_LONG "NEC V850E/AS85EP1"
#define PLATFORM "AS85EP1" #define PLATFORM "AS85EP1"
...@@ -86,9 +87,6 @@ ...@@ -86,9 +87,6 @@
#define AS85EP1_PORT_PMC(n) (*(volatile u8 *)AS85EP1_PORT_PMC_ADDR(n)) #define AS85EP1_PORT_PMC(n) (*(volatile u8 *)AS85EP1_PORT_PMC_ADDR(n))
/* NB85E-style interrupt system. */
#include <asm/nb85e_intc.h>
/* Hardware-specific interrupt numbers (in the kernel IRQ namespace). */ /* Hardware-specific interrupt numbers (in the kernel IRQ namespace). */
#define IRQ_INTCCC(n) (0x0C + (n)) #define IRQ_INTCCC(n) (0x0C + (n))
#define IRQ_INTCCC_NUM 8 #define IRQ_INTCCC_NUM 8
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment