Eric Lee / smarc-fsl-linux-kernel

07 Jan, 2012

1 commit

  • 40ba95fdf   Merge branch 'depends/rmk/restart' into next/cleanup ... Browse Code »

    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

  • 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
     
  • 1b2073e77   ARM: restart: at91: use new restart hook ... Browse Code »

    Rather than using a private function pointer, use the existing
    arm_pm_restart function pointer instead. We no longer need to enable
    the I-cache in at91sam9_alt_reset() as the caches will now be on when
    this function is called.

    Update the function names to use the 'restart' terminology rather than
    the 'reboot' terminology.

    Signed-off-by: Russell King

    Russell King
     

22 Dec, 2011

1 commit

20 Dec, 2011

1 commit

16 Dec, 2011

1 commit

01 Dec, 2011

2 commits

29 Nov, 2011

7 commits

28 Nov, 2011

15 commits

27 Nov, 2011

1 commit

22 Nov, 2011

2 commits

  • 84e0cdb0a   macb: unify at91 and avr32 platform data ... Browse Code »

    Both at91 and avr32 defines its own platform data structure for
    the macb driver and both share common structures though at91
    includes a currently unused phy_irq_pin. Create a common
    macb_platform_data for macb that both at91 and avr32 can use. In
    future we can use this to support other architectures that use the
    same IP block with the macb driver.

    v2: rename eth_platform_data to macb_platform_data and allow at91_ether
    to share the platform data with macb.

    Signed-off-by: Jamie Iles
    Acked-by: Nicolas Ferre
    Tested-by: Jean-Christophe PLAGNIOL-VILLARD

    Jamie Iles
     
  • 865d605ee   at91: provide macb clks with "pclk" and "hclk" name ... Browse Code »

    The macb driver expects clocks with the names "pclk" and "hclk". We
    currently provide "macb_clk" but to fit in line with other
    architectures (namely AVR32), provide "pclk" and a fake "hclk".

    Cc: Jean-Christophe PLAGNIOL-VILLARD
    Signed-off-by: Jamie Iles
    Acked-by: David S. Miller
    Acked-by: Nicolas Ferre
    Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD

    Jamie Iles
     

16 Nov, 2011

1 commit

09 Nov, 2011

4 commits

08 Nov, 2011

2 commits

  • 3c0030320   Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux ... Browse Code »

    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
    cpuidle: Single/Global registration of idle states
    cpuidle: Split cpuidle_state structure and move per-cpu statistics fields
    cpuidle: Remove CPUIDLE_FLAG_IGNORE and dev->prepare()
    cpuidle: Move dev->last_residency update to driver enter routine; remove dev->last_state
    ACPI: Fix CONFIG_ACPI_DOCK=n compiler warning
    ACPI: Export FADT pm_profile integer value to userspace
    thermal: Prevent polling from happening during system suspend
    ACPI: Drop ACPI_NO_HARDWARE_INIT
    ACPI atomicio: Convert width in bits to bytes in __acpi_ioremap_fast()
    PNPACPI: Simplify disabled resource registration
    ACPI: Fix possible recursive locking in hwregs.c
    ACPI: use kstrdup()
    mrst pmu: update comment
    tools/power turbostat: less verbose debugging

    Linus Torvalds
     
  • e0d65113a   Merge git://git.infradead.org/mtd-2.6 ... Browse Code »

    * git://git.infradead.org/mtd-2.6: (226 commits)
    mtd: tests: annotate as DANGEROUS in Kconfig
    mtd: tests: don't use mtd0 as a default
    mtd: clean up usage of MTD_DOCPROBE_ADDRESS
    jffs2: add compr=lzo and compr=zlib options
    jffs2: implement mount option parsing and compression overriding
    mtd: nand: initialize ops.mode
    mtd: provide an alias for the redboot module name
    mtd: m25p80: don't probe device which has status of 'disabled'
    mtd: nand_h1900 never worked
    mtd: Add DiskOnChip G3 support
    mtd: m25p80: add EON flash EN25Q32B into spi flash id table
    mtd: mark block device queue as non-rotational
    mtd: r852: make r852_pm_ops static
    mtd: m25p80: add support for at25df321a spi data flash
    mtd: mxc_nand: preset_v1_v2: unlock all NAND flash blocks
    mtd: nand: switch `check_pattern()' to standard `memcmp()'
    mtd: nand: invalidate cache on unaligned reads
    mtd: nand: do not scan bad blocks with NAND_BBT_NO_OOB set
    mtd: nand: wait to set BBT version
    mtd: nand: scrub BBT on ECC errors
    ...

    Fix up trivial conflicts:
    - arch/arm/mach-at91/board-usb-a9260.c
    Merged into board-usb-a926x.c
    - drivers/mtd/maps/lantiq-flash.c
    add_mtd_partitions -> mtd_device_register vs changed to use
    mtd_device_parse_register.

    Linus Torvalds