07 Jan, 2012

1 commit

  • Conflicts:
    arch/arm/mach-at91/at91cap9.c
    arch/arm/mach-at91/at91sam9260.c
    arch/arm/mach-at91/at91sam9261.c
    arch/arm/mach-at91/at91sam9263.c
    arch/arm/mach-at91/at91sam9g45.c
    arch/arm/mach-at91/at91sam9rl.c
    arch/arm/mach-exynos/cpu.c
    arch/arm/mach-shmobile/board-kota2.c

    This resolves a bunch of conflicts between the arm-soc tree
    and changes from the arm tree that have gone upstream.

    Signed-off-by: Arnd Bergmann

    Arnd Bergmann
     

05 Jan, 2012

2 commits

  • Remove the now empty arch_reset() from all the mach/system.h includes,
    and remove its callsite. Remove arm_machine_restart() as this function
    no longer does anything useful.

    For samsung platforms, remove the include of mach/system-reset.h and
    plat/system-reset.h from their respective mach/system.h headers as these
    just define their arch_reset functions. As a result, the s3c2410 and
    plat-samsung system-reset.h files are no longer referenced, so remove
    these files entirely.

    Acked-by: Nicolas Pitre
    Acked-by: H Hartley Sweeten
    Acked-by: Jamie Iles
    Acked-by: Tony Lindgren
    Acked-by: Linus Walleij
    Signed-off-by: Russell King

    Russell King
     
  • arch_reset() is deprecated; systems should hook into system restart via
    the 'restart' method in the platforms machine description record.

    Acked-by: Nicolas Pitre
    Acked-by: Jamie Iles
    Acked-by: Tony Lindgren
    Signed-off-by: Russell King

    Russell King
     

18 Dec, 2011

2 commits


06 Dec, 2011

1 commit


27 Nov, 2011

1 commit


16 Nov, 2011

1 commit


09 Nov, 2011

1 commit


05 Oct, 2011

1 commit


26 Sep, 2011

2 commits

  • Nicolas Pitre's generic ioremap() patch set means that we don't need
    this any more.

    Signed-off-by: Jamie Iles

    Jamie Iles
     
  • picoXcell is a family of femtocell devices with an ARM application
    processor and picoArray DSP processor array.

    This patch adds support for picoXcell boards to be booted using the
    device tree registering the VIC's, UART's and timers.

    v3: - fixup vic compatible string in binding
    v2: - cleanup empty mach headers
    - convert to of_platform_populate()
    - simplify uncompress.h
    - split vic node into 2 devices
    - add missing __initconst attributes

    Signed-off-by: Jamie Iles

    Jamie Iles