28 Nov, 2011

1 commit


07 Nov, 2011

1 commit

  • * 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
    scsi: drop unused Kconfig symbol
    pci: drop unused Kconfig symbol
    stmmac: drop unused Kconfig symbol
    x86: drop unused Kconfig symbol
    powerpc: drop unused Kconfig symbols
    powerpc: 40x: drop unused Kconfig symbol
    mips: drop unused Kconfig symbols
    openrisc: drop unused Kconfig symbols
    arm: at91: drop unused Kconfig symbol
    samples: drop unused Kconfig symbol
    m32r: drop unused Kconfig symbol
    score: drop unused Kconfig symbols
    sh: drop unused Kconfig symbol
    um: drop unused Kconfig symbol
    sparc: drop unused Kconfig symbol
    alpha: drop unused Kconfig symbol

    Fix up trivial conflict in drivers/net/ethernet/stmicro/stmmac/Kconfig
    as per Michal: the STMMAC_DUAL_MAC config variable is still unused and
    should be deleted.

    Linus Torvalds
     

02 Nov, 2011

1 commit

  • * 'next/dt' of git://git.linaro.org/people/arnd/arm-soc:
    ARM: gic: use module.h instead of export.h
    ARM: gic: fix irq_alloc_descs handling for sparse irq
    ARM: gic: add OF based initialization
    ARM: gic: add irq_domain support
    irq: support domains with non-zero hwirq base
    of/irq: introduce of_irq_init
    ARM: at91: add at91sam9g20 and Calao USB A9G20 DT support
    ARM: at91: dt: at91sam9g45 family and board device tree files
    arm/mx5: add device tree support for imx51 babbage
    arm/mx5: add device tree support for imx53 boards
    ARM: msm: Add devicetree support for msm8660-surf
    msm_serial: Add devicetree support
    msm_serial: Use relative resources for iomem

    Fix up conflicts in arch/arm/mach-at91/{at91sam9260.c,at91sam9g45.c}

    Linus Torvalds
     

01 Nov, 2011

1 commit


25 Oct, 2011

1 commit

  • Create a new device tree source file for Atmel at91sam9g45 SoC family.
    The Evaluation Kit at91sam9m10g45ek includes it.
    This first basic support will be populated as drivers and boards will be
    converted to device tree.
    Contains serial, dma and interrupt controllers.

    The generic board file still takes advantage of platform data for early serial
    init. As we need a storage media and the NAND flash driver is not converted to
    DT yet, we keep old initialization for it.

    Signed-off-by: Nicolas Ferre
    Reviewed-by: Rob Herring

    Nicolas Ferre
     

07 Sep, 2011

2 commits


25 May, 2011

2 commits


23 Apr, 2011

1 commit

  • commit

    ee621dd (net: atmel_macb Kconfig: remove long dependency line)

    replaced a list of several explicit machines in the dependencies of MACB by
    a single symbol that is selected by the respective machines. ee621dd missed
    to let ARCH_AT91CAP9 select HAVE_NET_MACB though which is fixed here.

    Signed-off-by: Uwe Kleine-König
    Acked-by: Andrew Victor
    Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD

    Uwe Kleine-König
     

15 Jan, 2011

2 commits


26 Oct, 2010

1 commit


25 Oct, 2010

1 commit

  • * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
    Update broken web addresses in arch directory.
    Update broken web addresses in the kernel.
    Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
    Revert "Fix typo: configuation => configuration" partially
    ida: document IDA_BITMAP_LONGS calculation
    ext2: fix a typo on comment in ext2/inode.c
    drivers/scsi: Remove unnecessary casts of private_data
    drivers/s390: Remove unnecessary casts of private_data
    net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
    drivers/infiniband: Remove unnecessary casts of private_data
    drivers/gpu/drm: Remove unnecessary casts of private_data
    kernel/pm_qos_params.c: Remove unnecessary casts of private_data
    fs/ecryptfs: Remove unnecessary casts of private_data
    fs/seq_file.c: Remove unnecessary casts of private_data
    arm: uengine.c: remove C99 comments
    arm: scoop.c: remove C99 comments
    Fix typo configue => configure in comments
    Fix typo: configuation => configuration
    Fix typo interrest[ing|ed] => interest[ing|ed]
    Fix various typos of valid in comments
    ...

    Fix up trivial conflicts in:
    drivers/char/ipmi/ipmi_si_intf.c
    drivers/usb/gadget/rndis.c
    net/irda/irnet/irnet_ppp.c

    Linus Torvalds
     

20 Oct, 2010

1 commit


18 Oct, 2010

1 commit


08 Oct, 2010

3 commits

  • Many Atmel SOC are embedding a MACB controller. This patch removes the long
    dependency line for this Atmel MACB ethernet driver configuration entry.
    The HAVE_NET_MACB configuration option is located in the net Kconfig file
    as it may be setup by ARM/AT91 and AVR32 chips.

    Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD
    Cc: David Miller
    Cc: Haavard Skinnemoen
    Acked-by: Nicolas Ferre
    Acked-by: Andrew Victor

    Jean-Christophe PLAGNIOL-VILLARD
     
  • The board-sam9g20ek-2slot-mmc.c was a revision of the at91sam9g20ek
    since board revision C. It contains 2 sd/mmc slots.

    This merge keep the support of the old machine ID
    MACH_AT91SAM9G20EK_2MMC for backward compatibility.

    Now we use the ATAG to pass the hardware functionality to kernel
    with this board revision encoding
    bit 0:
    0 => 1 sd/mmc slot
    1 => 2 sd/mmc slots connectors (board from revision C)

    system_rev tested on Barebox commit d8f3ee103a9f4bd

    Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD
    Signed-off-by: Nicolas Ferre

    Jean-Christophe PLAGNIOL-VILLARD
     
  • Today the board use 2 machines id AT91SAM9G45EKES and AT91SAM9M10G45EK
    now will use only AT91SAM9M10G45EK.

    The other boards revision will be specified via system_rev.

    for 9g45ekes, m10g45ekes and m10g45ek boards and revisions

    Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD
    Cc: Patrice Vilchez
    Acked-by: Nicolas Ferre

    Jean-Christophe PLAGNIOL-VILLARD
     

05 Oct, 2010

1 commit


09 Jul, 2010

1 commit


18 May, 2010

1 commit


17 May, 2010

1 commit


14 Apr, 2010

1 commit


24 Mar, 2010

1 commit

  • Convert arm to use GENERIC_TIME via the arch_getoffset() infrastructure,
    reducing the amount of arch specific code we need to maintain.

    The arm architecture is the last arch that need to be converted.

    Signed-off-by: John Stultz
    Signed-off-by: Russell King
    Cc: Andrew Morton

    John Stultz
     

20 Jan, 2010

2 commits


05 Dec, 2009

2 commits


16 Nov, 2009

5 commits

  • at91sam9g20ek rev. C and onwards embed two SD/MMC slots. This patch modify the
    previous dual slot board definition to match the official rev. C board. It also
    allows the use of at91_mci SD/MMC driver in addition to the atmel-mci one.

    Some pins have been re-affected from leds or Ethernet phy IRQ to the SD/MMC
    slot A. This lead to a modification of those definitions.

    Signed-off-by: Nicolas Ferre
    Acked-by: Andrew Victor

    Nicolas Ferre
     
  • Many Atmel SOC are embedding a LCD controller. This patch removes the long
    dependency line for this Atmel LCD framebuffer driver configuration entry.
    The HAVE_FB_ATMEL configuration option is located in the video Kconfig file
    as it may be setup by ARM/AT91 and AVR32 chips.

    Signed-off-by: Nicolas Ferre
    Acked-by: Jean-Christophe PLAGNIOL-VILLARD
    Acked-by: Andrew Victor

    Nicolas Ferre
     
  • Instead of adding "depends on" at config level, introduce HAVE_* config
    variables. Add them at machine or soc level to specify the ability of a
    particular support.
    It will ease new board introduction and readability.

    Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD
    Signed-off-by: Nicolas Ferre
    Acked-by: Andrew Victor

    Jean-Christophe PLAGNIOL-VILLARD
     
  • Those "depends on" are a double check as all machine entries are
    surrounded by "if " conditions.

    Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD
    Signed-off-by: Nicolas Ferre
    Acked-by: Andrew Victor

    Jean-Christophe PLAGNIOL-VILLARD
     
  • at91sam9g20ek rev. C and onwards embed two SD/MMC slots. This patch modify the
    previous dual slot board definition to match the official rev. C board. It also
    allows the use of at91_mci SD/MMC driver in addition to the atmel-mci one.

    Some pins have been re-affected from leds or Ethernet phy IRQ to the SD/MMC
    slot A. This lead to a modification of those definitions.

    Signed-off-by: Nicolas Ferre
    Acked-by: Andrew Victor

    Nicolas Ferre
     

11 Nov, 2009

1 commit


23 Sep, 2009

1 commit

  • Created a modified version of the at91sam9g20 evaluation kit platform
    (board-sam9g20ek-2slot-mmc.c) and device support to make use of the
    updated atmel-mci driver.

    As the use of two slots modify GPIO pin allocation, we create another
    board file.

    This requires getting the most updated arch/arm/tools/mach-types from
    http://www.arm.linux.org.uk/developer/machines/download.php to have the machine
    type for the at91sam9g20ek-2slot-mmc board.

    [nicolas.ferre@atmel.com: printk, slot_count modification in at91sam9260_devices.c file]
    [akpm@linux-foundation.org: coding-style fixes]
    Signed-off-by: Rob Emanuele
    Signed-off-by: Nicolas Ferre
    Cc: Haavard Skinnemoen
    Cc: Andrew Victor
    Cc: Russell King
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Rob Emanuele
     

31 Jul, 2009

2 commits


02 Jul, 2009

1 commit

  • From: Hong Xu

    Here are the modification to at91sam9261 files dedicated to the support of
    at91sam9g10. This direction has been adopted to minimize code duplication.

    All at91sam9261 drivers are enabled in _devices and board- files. Modificaton
    to peripherals that support at91sam9g10 will be added in future patches.

    Signed-off-by: Hong Xu
    Signed-off-by: Nicolas Ferre
    Acked-by: Andrew Victor
    Signed-off-by: Russell King

    Nicolas Ferre
     

27 Jun, 2009

1 commit

  • Here are the at91 specific files dedicated to the at91sam9g45 series. They
    mimic the traditional at91 way of managing chips & boards.

    The first board that embeds at91sam9g45 chip is the AT91SAM9G45-EKES. In
    the future, the main board for this 9g45 series will be the
    AT91SAM9M10G45-EK (I choose this last name for the board file).

    Simple drivers are enabled in _devices and board- files. Newer peripheral
    support will be added in future patches.

    Incuded peripherals support (for now):
    - USART
    - SPI
    - Ethernet
    - NAND flash
    - LCD
    - gpio/joystick/buttons
    - leds and pwm

    Signed-off-by: Nicolas Ferre
    Acked-by: Andrew Victor
    Signed-off-by: Russell King

    Nicolas Ferre