Eric Lee / smarc-fsl-linux-kernel

05 Jan, 2012

3 commits

  • 7b9dd4713   Merge branch 'restart' into for-linus ... Browse Code »

    Conflicts:
    arch/arm/mach-exynos/cpu.c

    The changes to arch/arm/mach-exynos/cpu.c were moved to
    mach-exynos/common.c.

    Russell King
     
  • f88b8979d   ARM: restart: remove the now empty arch_reset() ... Browse Code »

    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
     
  • d1fce9c11   ARM: restart: bcmring: use new restart hook ... Browse Code »
    43

    Hook the Shark restart code into the new restart hook rather than
    using arch_reset().

    Signed-off-by: Russell King

    Russell King
     

27 Nov, 2011

1 commit

14 Oct, 2011

1 commit

22 Aug, 2011

1 commit

27 Jul, 2011

1 commit

  • 3960ef326   Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/… ... Browse Code »

    …git/arm/linux-arm-soc

    * 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
    ARM: Consolidate the clkdev header files
    ARM: set vga memory base at run-time
    ARM: convert PCI defines to variables
    ARM: pci: make pcibios_assign_all_busses use pci_has_flag
    ARM: remove unnecessary mach/hardware.h includes
    pci: move microblaze and powerpc pci flag functions into asm-generic
    powerpc: rename ppc_pci_*_flags to pci_*_flags

    Fix up conflicts in arch/microblaze/include/asm/pci-bridge.h

    Linus Torvalds
     

20 Jul, 2011

2 commits

  • c8f85523e   Merge branch 'cross-platform/clkdev' into next/cross-platform Browse Code »
    Arnd Bergmann
     
  • aa3831cf9   ARM: Consolidate the clkdev header files ... Browse Code »

    Now most of ARM machines has the alsmot same __clk_get/put() macro

    So place it at the arch/arm/include/asm/clkdev.h and remove the reduntant header files

    But some machines don't have the same form as above. It can use the machince specific clkdev file by HAVE_MACH_CLKDEV config

    Now there are only 3 caese.

    1) define the clk structure with clkdev macro => Need to move clk structure to proper header file

    arch/arm/mach-versatile/include/mach/clkdev.h
    arch/arm/mach-realview/include/mach/clkdev.h
    arch/arm/mach-vexpress/include/mach/clkdev.h
    arch/arm/mach-integrator/include/mach/clkdev.h

    2) export the __clk_get/put function at clock.c

    arch/arm/mach-shmobile/include/mach/clkdev.h

    3) demuxing the clk source
    arch/arm/mach-u300/include/mach/clkdev.h

    Acked-by: Viresh Kumar
    Acked-by: H Hartley Sweeten
    Acked-by: Jean-Christophe PLAGNIOL-VILLARD
    Signed-off-by: Kyungmin Park

    Kyungmin Park
     

13 Jul, 2011

1 commit

28 Jun, 2011

1 commit

31 Mar, 2011

1 commit

18 Feb, 2011

1 commit

  • f4117ac9e   ARM: P2V: separate PHYS_OFFSET from platform definitions ... Browse Code »

    This uncouple PHYS_OFFSET from the platform definitions, thereby
    facilitating run-time computation of the physical memory offset.

    Acked-by: Nicolas Pitre
    Acked-by: Viresh Kumar
    Acked-by: H Hartley Sweeten
    Acked-by: Magnus Damm
    Acked-by: Tony Lindgren
    Acked-by: Jean-Christophe PLAGNIOL-VILLARD
    Acked-by: Wan ZongShun
    Acked-by: Kukjin Kim
    Acked-by: Eric Miao
    Acked-by: Jiandong Zheng
    Signed-off-by: Russell King

    Russell King
     

03 Jan, 2011

1 commit

23 Dec, 2010

1 commit

22 Nov, 2010

1 commit

  • 963fec4e0   ARM: 6484/1: fix compile warning in mm/init.c ... Browse Code »

    Commit 7c63984b86 (ARM: do not define VMALLOC_END relative to PAGE_OFFSET)
    changed VMALLOC_END to be an explicit value. Before this, it was
    relative to PAGE_OFFSET and therefore converted to unsigned long
    as PAGE_OFFSET is an unsigned long. This introduced the following
    build warning. Fix this by changing the explicit defines of
    VMALLOC_END to be unsigned long.

    CC arch/arm/mm/init.o
    arch/arm/mm/init.c: In function 'mem_init':
    arch/arm/mm/init.c:606: warning: format '%08lx' expects type 'long unsigned int', but argument 12 has type 'unsigned int'

    Signed-off-by: Anand Gadiyar
    Acked-by: Uwe Kleine-K
    Acked-by: Nicolas Pitre
    Signed-off-by: Russell King

    Anand Gadiyar
     

02 Nov, 2010

1 commit

  • b595076a1   tree-wide: fix comment/printk typos ... Browse Code »

    "gadget", "through", "command", "maintain", "maintain", "controller", "address",
    "between", "initiali[zs]e", "instead", "function", "select", "already",
    "equal", "access", "management", "hierarchy", "registration", "interest",
    "relative", "memory", "offset", "already",

    Signed-off-by: Uwe Kleine-König
    Signed-off-by: Jiri Kosina

    Uwe Kleine-König
     

02 Oct, 2010

1 commit

  • 7c63984b8   ARM: do not define VMALLOC_END relative to PAGE_OFFSET ... Browse Code »

    VMALLOC_END is supposed to be an absolute value, while PAGE_OFFSET may
    vary depending on the selected user:kernel memory split mode through
    CONFIG_VMSPLIT_*. In fact, the goal of moving PAGE_OFFSET down is to
    accommodate more directly addressed RAM by the kernel below the vmalloc
    area, and having VMALLOC_END move along PAGE_OFFSET is rather against
    the very reason why PAGE_OFFSET can be moved in the first place.

    Signed-off-by: Nicolas Pitre

    Nicolas Pitre
     

17 Dec, 2009

1 commit

  • 60d9aa758   Merge git://git.infradead.org/mtd-2.6 ... Browse Code »

    * git://git.infradead.org/mtd-2.6: (90 commits)
    jffs2: Fix long-standing bug with symlink garbage collection.
    mtd: OneNAND: Fix test of unsigned in onenand_otp_walk()
    mtd: cfi_cmdset_0002, fix lock imbalance
    Revert "mtd: move mxcnd_remove to .exit.text"
    mtd: m25p80: add support for Macronix MX25L4005A
    kmsg_dump: fix build for CONFIG_PRINTK=n
    mtd: nandsim: add support for 4KiB pages
    mtd: mtdoops: refactor as a kmsg_dumper
    mtd: mtdoops: make record size configurable
    mtd: mtdoops: limit the maximum mtd partition size
    mtd: mtdoops: keep track of used/unused pages in an array
    mtd: mtdoops: several minor cleanups
    core: Add kernel message dumper to call on oopses and panics
    mtd: add ARM pismo support
    mtd: pxa3xx_nand: Fix PIO data transfer
    mtd: nand: fix multi-chip suspend problem
    mtd: add support for switching old SST chips into QRY mode
    mtd: fix M29W800D dev_id and uaddr
    mtd: don't use PF_MEMALLOC
    mtd: Add bad block table overrides to Davinci NAND driver
    ...

    Fixed up conflicts (mostly trivial) in
    drivers/mtd/devices/m25p80.c
    drivers/mtd/maps/pcmciamtd.c
    drivers/mtd/nand/pxa3xx_nand.c
    kernel/printk.c

    Linus Torvalds
     

10 Dec, 2009

1 commit

  • 4ef58d4e2   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial ... Browse Code »

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits)
    tree-wide: fix misspelling of "definition" in comments
    reiserfs: fix misspelling of "journaled"
    doc: Fix a typo in slub.txt.
    inotify: remove superfluous return code check
    hdlc: spelling fix in find_pvc() comment
    doc: fix regulator docs cut-and-pasteism
    mtd: Fix comment in Kconfig
    doc: Fix IRQ chip docs
    tree-wide: fix assorted typos all over the place
    drivers/ata/libata-sff.c: comment spelling fixes
    fix typos/grammos in Documentation/edac.txt
    sysctl: add missing comments
    fs/debugfs/inode.c: fix comment typos
    sgivwfb: Make use of ARRAY_SIZE.
    sky2: fix sky2_link_down copy/paste comment error
    tree-wide: fix typos "couter" -> "counter"
    tree-wide: fix typos "offest" -> "offset"
    fix kerneldoc for set_irq_msi()
    spidev: fix double "of of" in comment
    comment typo fix: sybsystem -> subsystem
    ...

    Linus Torvalds
     

05 Dec, 2009

1 commit

04 Dec, 2009

2 commits

20 Oct, 2009

1 commit

07 Oct, 2009

1 commit

15 Aug, 2009

15 commits