Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/linux-milkymist
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 064001a258a8
Choose a base ref
...
head repository: m-labs/linux-milkymist
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5e4523785769
Choose a head ref
  • 2 commits
  • 13 files changed
  • 1 contributor

Commits on Jul 13, 2013

  1. lm32: Fix header file export

    Add support for using uapi for header file exporting.
    
    Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
    larsclausen committed Jul 13, 2013
    Copy the full SHA
    227108f View commit details
  2. lm32: Use CLKSRC_OF for timer setup

    Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
    larsclausen committed Jul 13, 2013
    Copy the full SHA
    5e45237 View commit details
1 change: 1 addition & 0 deletions arch/lm32/Kconfig
Original file line number Diff line number Diff line change
@@ -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 changes: 6 additions & 0 deletions arch/lm32/boot/dts/milkymist_one.dts
Original file line number Diff line number Diff line change
@@ -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 changes: 0 additions & 24 deletions arch/lm32/include/asm/Kbuild
Original file line number Diff line number Diff line change
@@ -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,56 +14,34 @@ 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
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 changes: 0 additions & 16 deletions arch/lm32/include/asm/byteorder.h

This file was deleted.

9 changes: 0 additions & 9 deletions arch/lm32/include/asm/time.h

This file was deleted.

14 changes: 1 addition & 13 deletions arch/lm32/include/asm/unistd.h
Original file line number Diff line number Diff line change
@@ -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 changes: 59 additions & 0 deletions arch/lm32/include/uapi/asm/Kbuild
Original file line number Diff line number Diff line change
@@ -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 change: 1 addition & 0 deletions arch/lm32/include/uapi/asm/byteorder.h
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include <linux/byteorder/big_endian.h>
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
13 changes: 13 additions & 0 deletions arch/lm32/include/uapi/asm/unistd.h
Original file line number Diff line number Diff line change
@@ -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 changes: 2 additions & 2 deletions arch/lm32/kernel/time.c
Original file line number Diff line number Diff line change
@@ -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 changes: 4 additions & 1 deletion arch/lm32/platforms/milkymist/time.c
Original file line number Diff line number Diff line change
@@ -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);