Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: m-labs/linux-milkymist
base: 064001a258a8
...
head fork: m-labs/linux-milkymist
compare: 5e4523785769
  • 2 commits
  • 13 files changed
  • 0 commit comments
  • 1 contributor
Commits on Jul 13, 2013
Lars-Peter Clausen larsclausen lm32: Fix header file export
Add support for using uapi for header file exporting.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
227108f
Lars-Peter Clausen larsclausen lm32: Use CLKSRC_OF for timer setup
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
5e45237
1  arch/lm32/Kconfig
View
@@ -12,6 +12,7 @@ config LM32
select ARCH_REQUIRE_GPIOLIB
select OF
select OF_EARLY_FLATTREE
+ select CLKSRC_OF
select HAVE_MEMBLOCK
select MODULES_USE_ELF_REL
select MODULES_USE_ELF_RELA
6 arch/lm32/boot/dts/milkymist_one.dts
View
@@ -81,6 +81,12 @@
interrupt-parent = <&pic>;
};
+ timer@1000 {
+ compatible = "milkymist,timer";
+ reg = <0x1000 0x1000>;
+ interrupts = <1 2 3>;
+ };
+
sysctl: sysctl@1000 {
compatible = "milkymist,sysctl";
reg = <0x1000 0x1000>;
24 arch/lm32/include/asm/Kbuild
View
@@ -1,8 +1,6 @@
include include/asm-generic/Kbuild.asm
generic-y += atomic.h
-generic-y += auxvec.h
-generic-y += bitsperlong.h
generic-y += bug.h
generic-y += bugs.h
generic-y += barrier.h
@@ -16,7 +14,6 @@ generic-y += device.h
generic-y += div64.h
generic-y += dma.h
generic-y += emergency-restart.h
-generic-y += errno.h
generic-y += exec.h
generic-y += fb.h
generic-y += fcntl.h
@@ -24,48 +21,27 @@ generic-y += ftrace.h
generic-y += futex.h
generic-y += hardirq.h
generic-y += hw_irq.h
-generic-y += ioctl.h
-generic-y += ioctls.h
generic-y += io.h
-generic-y += ipcbuf.h
generic-y += irq_regs.h
generic-y += kdebug.h
generic-y += kmap_types.h
generic-y += linkage.h
generic-y += local.h
-generic-y += mman.h
generic-y += mmu_context.h
generic-y += mmu.h
generic-y += module.h
-generic-y += msgbuf.h
-generic-y += param.h
generic-y += pci.h
generic-y += percpu.h
generic-y += pgalloc.h
-generic-y += poll.h
-generic-y += posix_types.h
-generic-y += resource.h
generic-y += scatterlist.h
generic-y += segment.h
-generic-y += sembuf.h
generic-y += setup.h
-generic-y += shmbuf.h
generic-y += shmparam.h
-generic-y += siginfo.h
-generic-y += signal.h
-generic-y += socket.h
-generic-y += sockios.h
-generic-y += statfs.h
-generic-y += stat.h
generic-y += string.h
-generic-y += swab.h
generic-y += syscalls.h
-generic-y += termbits.h
-generic-y += termios.h
generic-y += tlb.h
generic-y += tlbflush.h
generic-y += topology.h
-generic-y += types.h
generic-y += ucontext.h
generic-y += unaligned.h
generic-y += user.h
16 arch/lm32/include/asm/byteorder.h
View
@@ -1,16 +0,0 @@
-#ifndef _LM32_ASM_BYTEORDER_H
-#define _LM32_ASM_BYTEORDER_H
-
-#include <asm/types.h>
-
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__) || defined(__KERNEL__)
-// there is a 64bit data type supported by the processor
-# define __BYTEORDER_HAS_U64__
-
-// so we don't have to implement swab64 in assembler ;)
-# define __SWAB_64_THRU_32__
-#endif
-
-#include <linux/byteorder/big_endian.h>
-
-#endif /* _LM32_BYTEORDER_H */
9 arch/lm32/include/asm/time.h
View
@@ -1,9 +0,0 @@
-#ifndef _ASM_LM32_TIME_H
-#define _ASM_LM32_TIME_H
-
-/*
- * board specific routines required by time_init().
- */
-extern void plat_time_init(void);
-
-#endif /* _ASM_TIME_H */
14 arch/lm32/include/asm/unistd.h
View
@@ -1,18 +1,6 @@
#if !defined(_ASM_LM32_UNISTD_H) || defined(__SYSCALL)
#define _ASM_LM32_UNISTD_H
-#define __ARCH_WANT_SYSCALL_NO_AT
-#define __ARCH_WANT_SYSCALL_NO_FLAGS
-#define __ARCH_WANT_SYSCALL_OFF_T
-#define __ARCH_WANT_SYSCALL_DEPRECATED
-#define __ARCH_WANT_SYS_CLONE
-
-#include <asm-generic/unistd.h>
-
-#undef __NR_mmap
-
-#define sys_vfork sys_ni_syscall
-#define sys_mmap sys_ni_syscall
-#define sys_mmap2 sys_mmap_pgoff
+#include <uapi/asm/unistd.h>
#endif /* _ASM_LM32_UNISTD_H */
59 arch/lm32/include/uapi/asm/Kbuild
View
@@ -0,0 +1,59 @@
+include include/uapi/asm-generic/Kbuild.asm
+
+generic-y += auxvec.h
+generic-y += bitsperlong.h
+generic-y += errno.h
+generic-y += fcntl.h
+generic-y += ioctl.h
+generic-y += ioctls.h
+generic-y += ipcbuf.h
+generic-y += mman.h
+generic-y += msgbuf.h
+generic-y += param.h
+generic-y += poll.h
+generic-y += posix_types.h
+generic-y += resource.h
+generic-y += sembuf.h
+generic-y += setup.h
+generic-y += shmbuf.h
+generic-y += siginfo.h
+generic-y += signal.h
+generic-y += socket.h
+generic-y += sockios.h
+generic-y += stat.h
+generic-y += statfs.h
+generic-y += swab.h
+generic-y += termbits.h
+generic-y += termios.h
+generic-y += types.h
+
+generic-y += auxvec.h
+header-y += bitsperlong.h
+header-y += byteorder.h
+header-y += elf.h
+header-y += errno.h
+header-y += fcntl.h
+header-y += ioctl.h
+header-y += ioctls.h
+header-y += ipcbuf.h
+header-y += mman.h
+header-y += msgbuf.h
+header-y += param.h
+header-y += poll.h
+header-y += posix_types.h
+header-y += resource.h
+header-y += sembuf.h
+header-y += setup.h
+header-y += shmbuf.h
+header-y += sigcontext.h
+header-y += siginfo.h
+header-y += signal.h
+header-y += socket.h
+header-y += sockios.h
+header-y += stat.h
+header-y += statfs.h
+header-y += swab.h
+header-y += termbits.h
+header-y += termios.h
+header-y += types.h
+header-y += unistd.h
1  arch/lm32/include/uapi/asm/byteorder.h
View
@@ -0,0 +1 @@
+#include <linux/byteorder/big_endian.h>
5 arch/lm32/include/asm/elf.h → arch/lm32/include/uapi/asm/elf.h
View
@@ -110,9 +110,4 @@ do { \
#define ELF_PLATFORM (NULL)
-// TODO SET_PERSONALITY
-//#ifdef __KERNEL__
-//#define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)
-//#endif
-
#endif
0  arch/lm32/include/asm/sigcontext.h → arch/lm32/include/uapi/asm/sigcontext.h
View
File renamed without changes
13 arch/lm32/include/uapi/asm/unistd.h
View
@@ -0,0 +1,13 @@
+#define __ARCH_WANT_SYSCALL_NO_AT
+#define __ARCH_WANT_SYSCALL_NO_FLAGS
+#define __ARCH_WANT_SYSCALL_OFF_T
+#define __ARCH_WANT_SYSCALL_DEPRECATED
+#define __ARCH_WANT_SYS_CLONE
+
+#include <asm-generic/unistd.h>
+
+#undef __NR_mmap
+
+#define sys_vfork sys_ni_syscall
+#define sys_mmap sys_ni_syscall
+#define sys_mmap2 sys_mmap_pgoff
4 arch/lm32/kernel/time.c
View
@@ -1,7 +1,7 @@
#include <linux/kernel.h>
-#include <asm/time.h>
+#include <linux/clocksource.h>
void __init time_init(void)
{
- plat_time_init();
+ clocksource_of_init();
}
5 arch/lm32/platforms/milkymist/time.c
View
@@ -20,6 +20,7 @@
#include <linux/clocksource.h>
#include <linux/timex.h>
#include <linux/io.h>
+#include <linux/of.h>
#include <asm/hw/interrupts.h>
#include <asm/hw/sysctl.h>
@@ -138,7 +139,7 @@ static struct irqaction timer_irqaction = {
.dev_id = &milkymist_clockevent,
};
-void __init plat_time_init(void)
+void __init milkymist_timer_init(void)
{
int ret;
@@ -159,3 +160,5 @@ void __init plat_time_init(void)
setup_irq(IRQ_TIMER0, &timer_irqaction);
}
+CLOCKSOURCE_OF_DECLARE(milkymist, "milkymist,timer",
+ milkymist_timer_init);

No commit comments for this range

Something went wrong with that request. Please try again.