Eric Lee / smarc-fsl-linux-kernel

22 Nov, 2011

1 commit

  • 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
     

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
     

01 Nov, 2011

1 commit

11 Sep, 2011

1 commit

  • 1754aab9b   mtd: ATMEL, AVR32: inline nand partition table access ... Browse Code »
    43

    Currently atmel_nand driver used by AT91 and AVR32 calls a special callback
    which return nand partition table and number of partitions. However in all
    boards this callback returns just static data. So drop this callback and
    make atmel_nand use partition table provided statically via platform_data.

    Nicolas Ferre: I am in favor for a mainline inclusion through linux-mtd tree.
    Hans-Christian Egtvedt: I'm fine by sending the changes for AVR32 through linux-mtd

    Signed-off-by: Dmitry Eremin-Solenikov
    Acked-by: Hans-Christian Egtvedt
    Acked-by: Nicolas Ferre
    Acked-by: Jean-Christophe PLAGNIOL-VILLARD
    Signed-off-by: Artem Bityutskiy

    Dmitry Eremin-Solenikov
     

11 Jul, 2011

1 commit

14 Jun, 2011

4 commits

10 Jun, 2011

1 commit

25 May, 2011

1 commit

12 May, 2011

1 commit

  • f25f4f522   PM / AVR32: Use struct syscore_ops instead of sysdevs for PM ... Browse Code »

    Convert some AVR32 architecture's code to using struct syscore_ops
    objects for power management instead of sysdev classes and sysdevs.

    This simplifies the code and reduces the kernel's memory footprint.
    It also is necessary for removing sysdevs from the kernel entirely in
    the future.

    Signed-off-by: Rafael J. Wysocki
    Acked-by: Greg Kroah-Hartman
    Acked-by: Hans-Christian Egtvedt

    Rafael J. Wysocki
     

13 Apr, 2011

5 commits

30 Mar, 2011

1 commit

25 Mar, 2011

5 commits

23 Mar, 2011

1 commit

  • 3ea205c44   avr32: at32ap700x: fix typo in DMA master configuration ... Browse Code »

    Commit 4aa5f366431fe (avr32: at32ap700x: specify DMA src and dst
    masters) specified the masters for the ac97c playback device
    but incorrectly set them in the capture slave information rather
    than playback.

    Cc: Hans-Christian Egtvedt
    Reported-by: Nicolas Ferre
    Signed-off-by: Jamie Iles
    Acked-by: Vinod Koul
    [rebased on dmaengine for 2.6.39 (d42efe6b)]
    Signed-off-by: Dan Williams

    Jamie Iles
     

07 Mar, 2011

1 commit

14 Feb, 2011

1 commit

30 Jan, 2011

1 commit

  • 4aa5f3664   avr32: at32ap700x: specify DMA src and dst masters ... Browse Code »

    Now that the dw_dmac DMA driver supports configurable source and
    destination masters we need to specify which ones to use. This was
    previously hardcoded to 0 and 1 respectively in the driver.

    Acked-by: Hans-Christian Egtvedt
    Signed-off-by: Jamie Iles
    Signed-off-by: Dan Williams

    Jamie Iles
     

16 Nov, 2010

1 commit

  • 2f55ac072   suspend: constify platform_suspend_ops ... Browse Code »

    While at it, fix two checkpatch errors.
    Several non-const struct instances constified by this patch were added after
    the introduction of platform_suspend_ops in checkpatch.pl's list of "should
    be const" structs (79404849e90a41ea2109bd0e2f7c7164b0c4ce73).

    Patch against mainline.
    Inspired by hunks of the grsecurity patch, updated for newer kernels.

    Signed-off-by: Lionel Debroux
    Acked-by: Ingo Molnar
    Signed-off-by: Jiri Kosina

    Lionel Debroux
     

27 Jul, 2010

1 commit

  • f7512e7c4   serial: fix rs485 for atmel_serial on avr32 ... Browse Code »

    This patch fixes a build failure [1-4] in the atmel_serial code introduced by
    patch the patch ARM: 6092/1: atmel_serial: support for RS485
    communications (e8faff7330a3501eafc9bfe5f4f15af444be29f5)

    The build failure was caused by missing struct field and missing defines
    for the avr32 board - the patch fixes this.

    [1] http://kisskb.ellerman.id.au/kisskb/buildresult/2575242/ - first failure in linux-next, may 11th
    [2] http://kisskb.ellerman.id.au/kisskb/buildresult/2816418/ - still exists as of today
    [3] http://kisskb.ellerman.id.au/kisskb/buildresult/2617511/ - first failure in Linus' tree - May 20th - did really no one notice this?!
    [4] http://kisskb.ellerman.id.au/kisskb/buildresult/2813956/ - still exists in Linus' tree as of today

    Signed-off-by: Peter Huewe
    Signed-off-by: Greg Kroah-Hartman

    Peter Huewe
     

30 Mar, 2010

1 commit

  • 5a0e3ad6a   include cleanup: Update gfp.h and slab.h includes to prepare for breaking implic… ... Browse Code »

    …it slab.h inclusion from percpu.h

    percpu.h is included by sched.h and module.h and thus ends up being
    included when building most .c files. percpu.h includes slab.h which
    in turn includes gfp.h making everything defined by the two files
    universally available and complicating inclusion dependencies.

    percpu.h -> slab.h dependency is about to be removed. Prepare for
    this change by updating users of gfp and slab facilities include those
    headers directly instead of assuming availability. As this conversion
    needs to touch large number of source files, the following script is
    used as the basis of conversion.

    http://userweb.kernel.org/~tj/misc/slabh-sweep.py

    The script does the followings.

    * Scan files for gfp and slab usages and update includes such that
    only the necessary includes are there. ie. if only gfp is used,
    gfp.h, if slab is used, slab.h.

    * When the script inserts a new include, it looks at the include
    blocks and try to put the new include such that its order conforms
    to its surrounding. It's put in the include block which contains
    core kernel includes, in the same order that the rest are ordered -
    alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
    doesn't seem to be any matching order.

    * If the script can't find a place to put a new include (mostly
    because the file doesn't have fitting include block), it prints out
    an error message indicating which .h file needs to be added to the
    file.

    The conversion was done in the following steps.

    1. The initial automatic conversion of all .c files updated slightly
    over 4000 files, deleting around 700 includes and adding ~480 gfp.h
    and ~3000 slab.h inclusions. The script emitted errors for ~400
    files.

    2. Each error was manually checked. Some didn't need the inclusion,
    some needed manual addition while adding it to implementation .h or
    embedding .c file was more appropriate for others. This step added
    inclusions to around 150 files.

    3. The script was run again and the output was compared to the edits
    from #2 to make sure no file was left behind.

    4. Several build tests were done and a couple of problems were fixed.
    e.g. lib/decompress_*.c used malloc/free() wrappers around slab
    APIs requiring slab.h to be added manually.

    5. The script was run on all .h files but without automatically
    editing them as sprinkling gfp.h and slab.h inclusions around .h
    files could easily lead to inclusion dependency hell. Most gfp.h
    inclusion directives were ignored as stuff from gfp.h was usually
    wildly available and often used in preprocessor macros. Each
    slab.h inclusion directive was examined and added manually as
    necessary.

    6. percpu.h was updated not to include slab.h.

    7. Build test were done on the following configurations and failures
    were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
    distributed build env didn't work with gcov compiles) and a few
    more options had to be turned off depending on archs to make things
    build (like ipr on powerpc/64 which failed due to missing writeq).

    * x86 and x86_64 UP and SMP allmodconfig and a custom test config.
    * powerpc and powerpc64 SMP allmodconfig
    * sparc and sparc64 SMP allmodconfig
    * ia64 SMP allmodconfig
    * s390 SMP allmodconfig
    * alpha SMP allmodconfig
    * um on x86_64 SMP allmodconfig

    8. percpu.h modifications were reverted so that it could be applied as
    a separate patch and serve as bisection point.

    Given the fact that I had only a couple of failures from tests on step
    6, I'm fairly confident about the coverage of this conversion patch.
    If there is a breakage, it's likely to be something in one of the arch
    headers which should be easily discoverable easily on most builds of
    the specific arch.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>

    Tejun Heo
     

03 Mar, 2010

1 commit

  • 640e95abd   USB: atmel uaba: Adding invert vbus_pin ... Browse Code »

    Adding vbus_pin_inverted so that the usb detect pin can be active high
    or low depending on HW implementation also replaced the
    gpio_get_value(udc->vbus_pin); with a call to vbus_is_present(udc); This
    allows the driver to be loaded and save about 0,15W on the consumption.

    Signed-off-by: Eirik Aanonsen
    Signed-off-by: Greg Kroah-Hartman

    Eirik Aanonsen
     

28 Dec, 2009

2 commits

  • cbf8de162   avr32: clean up memory allocation in at32_add_device_mci ... Browse Code »

    This patch will check if the kzalloc for the MCI DMA struct actually
    returns a valid address, and also clean up properly if it fails or the
    function fails at a later stage.

    This also silences a compiler warning about using the slave variable
    uninitialized.

    Signed-off-by: Hans-Christian Egtvedt
    Signed-off-by: Haavard Skinnemoen

    Hans-Christian Egtvedt
     
  • 754a00aeb   arch/avr32: Fix build failure for avr32 caused by typo ... Browse Code »

    This patch fixes a build failure introduced by the patch
    atmel-mci: change use of dma slave interface by Nicolas Ferre
    by changing mci_dma_slave to the correct name of mci_dma_data

    This should make the avr32 tree build again.

    References:
    http://kisskb.ellerman.id.au/kisskb/buildresult/1893610/
    http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git;a=commitdiff;h=2635d1ba711560d521f6218c585a3e0401f566e1

    Patch against Linus' tree.

    Signed-off-by: Peter Huewe
    Signed-off-by: Haavard Skinnemoen

    Peter Huewe
     

16 Dec, 2009

2 commits

  • 050cbb09d   Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
    avr32: update default configurations for ATNGW100, ATSTK1002 and ATSTK1006
    avr32: add default configurations for ATNGW100 mkII and EVKLCD10X
    avr32: add support for ATNGW100 mkII board
    avr32: convert to asm-generic/hardirq.h
    avr32: add two new at91 to cpu.h definition
    avr32: clean up linker script using standard macros.
    avr32: MRMT: correct setup of SPI slaves
    avr32: function for independently setting up SPI slaves
    avr32: re-instate MCI WP/CD pin assignments for ATNGW100

    Linus Torvalds
     
  • 2635d1ba7   atmel-mci: change use of dma slave interface ... Browse Code »

    Allow the use of another DMA controller driver in atmel-mci sd/mmc driver.
    This adds a generic dma_slave pointer to the mci platform structure where
    we can store DMA controller information. In atmel-mci we use information
    provided by this structure to initialize the driver (with new helper
    functions that are architecture dependant).

    This also adds at32/avr32 chip modifications to cope with this new access
    method.

    Signed-off-by: Nicolas Ferre
    Cc: Haavard Skinnemoen
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Nicolas Ferre
     

15 Dec, 2009

1 commit

04 Nov, 2009

2 commits

  • d8951adeb   at91: at91sam9g45 family: identify several chip versions ... Browse Code »

    cpu_is_xxx() macros are identifying generic at91sam9g45 chip. This patch adds
    the capacity to differentiate Engineering Samples and final lots through the
    inclusion of at91_cpu_fully_identify() and the related chip IDs with chip
    version field preserved.

    Signed-off-by: Nicolas Ferre
    Acked-by: Jean-Christophe PLAGNIOL-VILLARD
    Acked-by: Hans-Christian Egtvedt

    Nicolas Ferre
     
  • 2f5d46d2f   avr32: add two new at91 to cpu.h definition ... Browse Code »

    Somme common drivers will need those at91 cpu_is_xxx() definitions. As
    at91sam9g10 and at91sam9g45 are on the way to linus' tree, here is the patch
    that adds those chips to cpu.h in AVR32 architecture.

    Signed-off-by: Nicolas Ferre
    Signed-off-by: Haavard Skinnemoen

    Nicolas Ferre
     

07 Oct, 2009

1 commit

  • 5416bf33f   avr32: add two new at91 to cpu.h definition ... Browse Code »

    Somme common drivers will need those at91 cpu_is_xxx() definitions. As
    at91sam9g10 and at91sam9g45 are on the way to linus' tree, here is the patch
    that adds those chips to cpu.h in AVR32 architecture.

    Signed-off-by: Nicolas Ferre
    Signed-off-by: Haavard Skinnemoen

    Nicolas Ferre
     

27 Aug, 2009

1 commit

  • 070842037   avr32: function for independently setting up SPI slaves ... Browse Code »

    at32ap_spi_setup_slaves() is exposed to allow the addition of SPI slaves
    to a SPI bus that has already been registered. This is especially
    useful for add-on cards, which have their own board setup function.
    at32ap_spi_add_device() has been slightly re-organized, but should be
    transparent to existing users.

    So to add a SPI slave, after a SPI bus has already been registered:

    /* Configure the list of slaves on SPI controller "id" */
    at32_spi_setup_slaves(id,spi_board_info,ARRAY_SIZE(spi_board_info));
    /* Register the list of slaves */
    spi_register_board_info(spi_board_info,ARRAY_SIZE(spi_board_info));

    Signed-off-by: Peter Ma
    [haavard.skinnemoen@atmel.com: trivial whitespace fix]
    Signed-off-by: Haavard Skinnemoen

    Peter Ma