07 Jan, 2012

1 commit

  • 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

1 commit

  • 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
     

16 Dec, 2011

1 commit


01 Dec, 2011

1 commit


29 Nov, 2011

3 commits


28 Nov, 2011

5 commits


22 Nov, 2011

1 commit

  • 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
     

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
     

25 Oct, 2011

1 commit


11 Sep, 2011

1 commit


28 Jul, 2011

7 commits


25 May, 2011

2 commits


26 Oct, 2010

3 commits


09 Jan, 2009

1 commit

  • arch/arm/mach-at91/at91cap9.c:337: error: 'NR_AIC_IRQS' undeclared here (not in a function)
    arch/arm/mach-at91/at91rm9200.c:301: error: 'NR_AIC_IRQS' undeclared here (not in a function)
    arch/arm/mach-at91/at91sam9260.c:351: error: 'NR_AIC_IRQS' undeclared here (not in a function)
    arch/arm/mach-at91/at91sam9261.c:287: error: 'NR_AIC_IRQS' undeclared here (not in a function)
    arch/arm/mach-at91/at91sam9263.c:312: error: 'NR_AIC_IRQS' undeclared here (not in a function)
    arch/arm/mach-at91/at91sam9rl.c:304: error: 'NR_AIC_IRQS' undeclared here (not in a function)
    arch/arm/mach-h720x/h7202-eval.c:38: error: implicit declaration of function 'IRQ_CHAINED_GPIOB'
    arch/arm/mach-ks8695/devices.c:46: error: 'KS8695_IRQ_WAN_RX_STATUS' undeclared here (not in a function)
    arch/arm/mach-msm/devices.c:28: error: 'INT_UART1' undeclared here (not in a function)
    arch/arm/mach-mx2/devices.c:233: error: 'MXC_GPIO_IRQ_START' undeclared here (not in a function)
    arch/arm/mach-mx3/devices.c:128: error: 'MXC_GPIO_IRQ_START' undeclared here (not in a function)
    arch/arm/mach-omap1/mcbsp.c:140: error: 'INT_730_McBSP1RX' undeclared here (not in a function)
    arch/arm/mach-omap1/mcbsp.c:165: error: 'INT_McBSP1RX' undeclared here (not in a function)
    arch/arm/mach-omap1/mcbsp.c:200: error: 'INT_McBSP1RX' undeclared here (not in a function)
    arch/arm/mach-omap2/board-apollon.c:286: error: implicit declaration of function 'omap_set_gpio_direction'
    arch/arm/mach-omap2/mcbsp.c:154: error: 'INT_24XX_MCBSP1_IRQ_RX' undeclared here (not in a function)
    arch/arm/mach-omap2/mcbsp.c:181: error: 'INT_24XX_MCBSP1_IRQ_RX' undeclared here (not in a function)
    arch/arm/mach-pxa/e350.c:36: error: 'IRQ_BOARD_START' undeclared here (not in a function)
    arch/arm/plat-s3c/dev-i2c0.c:32: error: 'IRQ_IIC' undeclared here (not in a function)
    ...

    Signed-off-by: Russell King

    Russell King
     

07 Aug, 2008

1 commit


10 Jul, 2008

1 commit

  • Support for the at91sam9g20 : Atmel 400Mhz ARM 926ej-s SOC.

    AT91sam9g20 is an evolution of the at91sam9260 with a faster clock
    speed.
    We created a new board for this device but based the chip support
    directly on 9260 files with little updates.
    Here is the chip page on Atmel wabsite:
    http://atmel.com/dyn/products/product_card.asp?part_id=4337

    Signed-off-by: Sedji Gaouaou
    Signed-off-by: Justin Waters
    Acked-by: Andrew Victor
    Signed-off-by: Russell King

    sedji gaouaou
     

04 Apr, 2008

1 commit


26 Jan, 2008

1 commit


03 May, 2007

1 commit


16 Feb, 2007

1 commit

  • - Remove a duplicated define for AT91_RSTC_KEY
    - Set AT91_RSTC_KEY to the correct value
    - Replace the hardcoded keys in at91sam9620.c and at91sam9261.c
    by AT91_RSTC_KEY

    Signed-off-by: Jan Altenberg
    Acked-by: Andrew Victor
    Signed-off-by: Andrew Morton
    Signed-off-by: Russell King

    Jan Altenberg
     

15 Feb, 2007

1 commit

  • Add support for the Atmel AT91SAM9XE range of processors. These are
    basically AT91SAM9260's with different amounts of internal SRAM and
    Flash.

    We make use of the existing AT91SAM9260 support, but just perform
    run-time detection of the size of the internal SRAM.

    Original patch from Nicolas Ferre.

    Signed-off-by: Andrew Victor
    Signed-off-by: Russell King

    Andrew Victor
     

14 Feb, 2007

1 commit


08 Feb, 2007

2 commits

  • Define the Timer/Counter Unit clocks on the AT91RM9200, AT91SAM9260 and
    AT91SAM9261 processors.

    Original patch from David Brownell.

    Signed-off-by: Andrew Victor
    Signed-off-by: Russell King

    Andrew Victor
     
  • Now that Linux includes support for the Atmel AT91SAM9260 and
    AT91SAM9261 processors in addition to the original Atmel AT91RM9200
    (with support for more AT91 processors pending), the "mach-at91rm9200"
    and "arch-at91rm9200" directories should be renamed to indicate their
    more generic nature.

    The following git commands should be run BEFORE applying this patch:
    git-mv arch/arm/mach-at91rm9200 arch/arm/mach-at91
    git-mv include/asm-arm/arch-at91rm9200 include/asm-arm/arch-at91

    Signed-off-by: Andrew Victor
    Signed-off-by: Russell King

    Andrew Victor