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
     

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
     

11 Sep, 2011

1 commit


28 Jul, 2011

6 commits


25 May, 2011

2 commits


26 Oct, 2010

1 commit


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
     

22 Sep, 2008

1 commit


07 Aug, 2008

1 commit


04 Apr, 2008

1 commit


26 Jan, 2008

1 commit


03 May, 2007

1 commit


22 Feb, 2007

1 commit

  • The duplicate file "include/asm-arm/arch-at91rm9200/entry-macro.S" can
    be removed - it was already moved to include/asm-arm/arch-at91/.

    Fix 3 small typo's - two in comments, and the incorrect clock was
    specified for the LCD device.

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

    Andrew Victor
     

14 Feb, 2007

1 commit


08 Feb, 2007

1 commit