Eric Lee / smarc-fsl-linux-kernel

30 Mar, 2012

1 commit

  • 12679a2d7   Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm ... Browse Code »

    Pull more ARM updates from Russell King.

    This got a fair number of conflicts with the split, but
    also with some other sparse-irq and header file include cleanups. They
    all looked pretty trivial, though.

    * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (59 commits)
    ARM: fix Kconfig warning for HAVE_BPF_JIT
    ARM: 7361/1: provide XIP_VIRT_ADDR for no-MMU builds
    ARM: 7349/1: integrator: convert to sparse irqs
    ARM: 7259/3: net: JIT compiler for packet filters
    ARM: 7334/1: add jump label support
    ARM: 7333/2: jump label: detect %c support for ARM
    ARM: 7338/1: add support for early console output via semihosting
    ARM: use set_current_blocked() and block_sigmask()
    ARM: exec: remove redundant set_fs(USER_DS)
    ARM: 7332/1: extract out code patch function from kprobes
    ARM: 7331/1: extract out insn generation code from ftrace
    ARM: 7330/1: ftrace: use canonical Thumb-2 wide instruction format
    ARM: 7351/1: ftrace: remove useless memory checks
    ARM: 7316/1: kexec: EOI active and mask all interrupts in kexec crash path
    ARM: Versatile Express: add NO_IOPORT
    ARM: get rid of asm/irq.h in asm/prom.h
    ARM: 7319/1: Print debug info for SIGBUS in user faults
    ARM: 7318/1: gic: refactor irq_start assignment
    ARM: 7317/1: irq: avoid NULL check in for_each_irq_desc loop
    ARM: 7315/1: perf: add support for the Cortex-A7 PMU
    ...

    Linus Torvalds
     

16 Feb, 2012

1 commit

26 Jan, 2012

1 commit

10 Jan, 2012

1 commit

05 Jan, 2012

1 commit

24 Nov, 2011

1 commit

15 Nov, 2011

1 commit

14 Nov, 2011

1 commit

08 Nov, 2011

1 commit

  • 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
     

27 Oct, 2011

1 commit

  • ca9066628   Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm ... Browse Code »

    * 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (43 commits)
    ARM: 7135/1: ep93xx: bring back missing
    ARM: 7104/1: plat-pxa: break out GPIO driver specifics
    ARM: 7103/1: plat-pxa: move PXA GPIO driver to GPIO subsystem
    ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics
    ARM: 7101/1: arm/tegra: Replace with
    ARM: 7094/1: arm/tegra: Move EN_VDD_1V05_GPIO to board-harmony.h
    ARM: 7083/1: rewrite U300 GPIO to use gpiolib
    ARM: 7074/1: gpio: davinci: eliminate unused variable warnings
    ARM: 7063/1: Orion: gpio: add missing include of linux/types.h
    ARM: 7055/1: arm/tegra: mach/gpio.h: include linux/types.h to fix build
    ARM: 7054/1: arm/tegra: Delete custom gpio_to_irq, and irq_to_gpio
    ARM: 7053/1: gpio/tegra: Implement gpio_chip.to_irq
    ARM: 7052/1: gpio/tegra: Remove use of irq_to_gpio
    ARM: 7057/1: mach-pnx4008: rename GPIO header
    ARM: 7056/1: plat-nomadik: kill off
    ARM: 7050/1: mach-sa1100: delete irq_to_gpio() function
    ARM: 7049/1: mach-sa1100: move SA1100 GPIO driver to GPIO subsystem
    ARM: 7045/1: mach-lpc32xx: break out GPIO driver specifics
    ARM: 7044/1: mach-lpc32xx: move LPC32XX GPIO driver to GPIO subsystem
    ARM: 7043/1: mach-ixp2000: rename GPIO header
    ...

    Fix up trivial conflicts in arch/arm/mach-u300/Kconfig manually

    Linus Torvalds
     

17 Oct, 2011

1 commit

  • 3f8e28803   ARM: 7006/1: Migrate to asm-generic wrapper support ... Browse Code »

    With d8ecc5c (kbuild: asm-generic support, 2011-04-27) we can
    remove a handful of asm-generic wrappers in ARM code. Since the
    generic version of sizes.h doesn't contain SZ_48M, we replace
    the 4 users of SZ_48M with the equivalent SZ_32M + SZ_16M.

    Signed-off-by: Stephen Boyd
    Cc: Imre Kaloz
    Acked-by: Krzysztof Halasa
    Cc: Eric Miao
    Signed-off-by: Russell King

    Stephen Boyd
     

02 Oct, 2011

1 commit

11 Sep, 2011

1 commit

  • f3c8cfc23   mtd: pxa3xx_nand: enable multiple chip select support ... Browse Code »

    Current pxa3xx_nand controller has two chip select which
    both be workable. This patch enable this feature.

    Update platform driver to support this feature.

    Another notice should be taken that:
    When you want to use this feature, you should not enable the
    keep configuration feature, for two chip select could be
    attached with different nand chip. The different page size
    and timing requirement make the keep configuration impossible.

    Signed-off-by: Lei Wen

    Lei Wen
     

08 Aug, 2011

1 commit

20 Oct, 2010

1 commit

  • 6451d7783   arm: remove machine_desc.io_pg_offst and .phys_io ... Browse Code »

    Since we're now using addruart to establish the debug mapping, we can
    remove the io_pg_offst and phys_io members of struct machine_desc.

    The various declarations were removed using the following script:

    grep -rl MACHINE_START arch/arm | xargs \
    sed -i '/MACHINE_START/,/MACHINE_END/ { /\.\(phys_io\|io_pg_offst\)/d }'

    [ Initial patch was from Jeremy Kerr, example script from Russell King ]

    Signed-off-by: Nicolas Pitre
    Acked-by: Eric Miao

    Nicolas Pitre
     

09 Oct, 2010

2 commits

08 Oct, 2010

1 commit

05 Aug, 2010

2 commits

11 May, 2010

1 commit

01 Dec, 2009

1 commit

23 Mar, 2009

3 commits

  • a6b993c6b   [ARM] pxa/aspenite: add support for debug ethernet ... Browse Code »

    Signed-off-by: Zhangfei Gao
    Signed-off-by: Eric Miao

    Eric Miao
     
  • 9c291f0f8   [ARM] pxa/aspenite: add support for console uart ... Browse Code »

    Signed-off-by: Eric Miao

    Eric Miao
     
  • 49cbe7863   [ARM] pxa: add base support for Marvell's PXA168 processor line ... Browse Code »

    """The Marvell® PXA168 processor is the first in a family of application
    processors targeted at mass market opportunities in computing and consumer
    devices. It balances high computing and multimedia performance with low
    power consumption to support extended battery life, and includes a wealth
    of integrated peripherals to reduce overall BOM cost .... """

    See http://www.marvell.com/featured/pxa168.jsp for more information.

    1. Marvell Mohawk core is a hybrid of xscale3 and its own ARM core,
    there are many enhancements like instructions for flushing the
    whole D-cache, and so on

    2. Clock reuses Russell's common clkdev, and added the basic support
    for UART1/2.

    3. Devices are a bit different from the 'mach-pxa' way, the platform
    devices are now dynamically allocated only when necessary (i.e.
    when pxa_register_device() is called). Description for each device
    are stored in an array of 'struct pxa_device_desc'. Now that:

    a. this array of device description is marked with __initdata and
    can be freed up system is fully up

    b. which means board code has to add all needed devices early in
    his initializing function

    c. platform specific data can now be marked as __initdata since
    they are allocated and copied by platform_device_add_data()

    4. only the basic UART1/2/3 are added, more devices will come later.

    Signed-off-by: Jason Chagas
    Signed-off-by: Eric Miao

    Eric Miao