Doug / smarc-fsl-linux-kernel

20 Oct, 2010

4 commits

  • 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
     
  • 0ea129300   arm: return both physical and virtual addresses from addruart ... Browse Code »

    Rather than checking the MMU status in every instance of addruart, do it
    once in kernel/debug.S, and change the existing addruart macros to
    return both physical and virtual addresses. The main debug code can then
    select the appropriate address to use.

    This will also allow us to retreive the address of a uart for the MMU
    state that we're not current in.

    Updated with fixes for OMAP from Jason Wang
    and Tony Lindgren , and fix for versatile express from
    Lorenzo Pieralisi .

    Signed-off-by: Jeremy Kerr
    Signed-off-by: Lorenzo Pieralisi
    Signed-off-by: Jason Wang
    Signed-off-by: Tony Lindgren
    Tested-by: Kevin Hilman

    Jeremy Kerr
     
  • 809b4e00b   Merge branch 'devel-stable' into devel Browse Code »
    Russell King
     
  • f779b7dd3   Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/li… ... Browse Code »

    …nux-samsung into devel-stable

    Conflicts:
    arch/arm/mach-at91/include/mach/system.h
    arch/arm/mach-imx/mach-cpuimx27.c

    AT91 conflict resolution:
    Acked-by: Anders Larsen <al@alarsen.net>
    IMX conflict resolution confirmed by Uwe Kleine-König.

    Russell King
     

19 Oct, 2010

1 commit

08 Oct, 2010

6 commits

  • 5c189208b   ARM: 6436/1: AT91: Fix power-saving in idle-mode on 926T processors ... Browse Code »

    According to Atmel, their 926T processors (AT91 post RM9200) requires
    'Wait for Interrupt' mode be entered right after disabling the processor clock
    in order to minimise current consumption when idle, so do both provided we're
    not running on a 920T (an RM9200).

    Furthermore, get rid of the #ifndef CONFIG_DEBUG_KERNEL, since arch_idle()
    can be turned off completely with the kernel parameter 'nohlt'.

    Cc: Andrew Victor
    Signed-off-by: Anders Larsen
    Signed-off-by: Russell King

    Anders Larsen
     
  • ee621dd61   net: atmel_macb Kconfig: remove long dependency line ... Browse Code »

    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
     
  • cb809b1a5   AT91: fix use of clock disable on idle for AT91x40 devices ... Browse Code »

    The simpler AT91x40 processors do not have the same power management
    controller as the new AT91 devices. They do have a simpler power
    controller module that we can use to disable the CPU clock at idle
    time. Add code to support that.

    Signed-off-by: Greg Ungerer
    Acked-by: Jean-Christophe PLAGNIOL-VILLARD
    Acked-by: Nicolas Ferre

    Greg Ungerer
     
  • a6e016f19   AT91: at91sam9g20ek: merge 2mmc version in one board ... Browse Code »

    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
     
  • 9a400da84   AT91: Correct configuration define value ... Browse Code »

    The MTD nand driver for Atmel chips is atmel_nand and not at91_nand anymore.
    Change wrong configuration variables that were remaining.

    Reported-by: Christoph Egger
    Signed-off-by: Nicolas Ferre

    Nicolas Ferre
     
  • 67dd8995f   AT91: at91sam9m10g45ek: use the right machine id ... Browse Code »

    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

23 Sep, 2010

1 commit

  • 1d5b4c0fa   ARM: 6406/1: at91sam9g45: fix i2c bus speed ... Browse Code »

    Use a correct udelay value to get bus speed around 100KHz. The udelay
    value was most likely copied from the older devices, but the 9g45
    is signicantly faster (400MHz, DDR, ..), so a udelay of 2 gives a
    bus speed of around 190KHz, which is too fast for some devices.
    A udelay value of 5 gives a bus speed of around 90KHz here.

    Signed-off-by: Peter Korsgaard
    Signed-off-by: Nicolas Ferre
    Signed-off-by: Russell King

    Peter Korsgaard
     

10 Sep, 2010

5 commits

08 Sep, 2010

1 commit

11 Aug, 2010

2 commits

  • 5f6878b0d   ARM: 6323/1: cam60: don't use __init for cam60_spi_{flash_platform_data,partitions} ... Browse Code »

    From: Uwe Kleine-König
    To: linux-arm-kernel@lists.infradead.org
    Subject: [PATCH 12/19] ARM: cam60: don't use __init for cam60_spi_{flash_platform_data,partitions}
    Date: Thu, 5 Aug 2010 16:08:46 +0200
    Message-Id:

    These two structs are referenced by cam60_spi_devices. The latter is
    copied at init time to kmalloced memory and so the copy isn't freed after
    booting. So it must not contain references to .init memory.

    This isn't noticed by modpost as cam60_spi_devices is in .init.data, too.

    Noticed-and-Acked-by: Andrew Victor

    Signed-off-by: Uwe Kleine-König
    Signed-off-by: Russell King

    Uwe Kleine-König
     
  • 8436b4108   ARM: 6324/1: cam60: move cam60_spi_devices to .init.data ... Browse Code »

    cam60_spi_devices is passed to at91_add_device_spi which calls
    spi_register_board_info. The latter makes a copy of it, so living in
    .init.data is OK.

    This fixes the following warning in cam60_defconfig:
    WARNING: vmlinux.o(.data+0x2a00): Section mismatch in reference from the variable cam60_spi_devices to the (unknown reference) .init.data:(unknown)
    The variable cam60_spi_devices references
    the (unknown reference) __initdata (unknown)
    If the reference is valid then annotate the
    variable with __init* or __refdata (see linux/init.h) or name the variable:
    *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console,

    Acked-by: Andrew Victor
    Signed-off-by: Uwe Kleine-König
    Signed-off-by: Russell King

    Uwe Kleine-König
     

19 Jul, 2010

1 commit

  • 4037242c4   ARM: 6209/3: at91_udc: Add vbus polarity and polling mode ... Browse Code »

    Allow the vbus signal to optionally use polling. This is required if
    the vbus signal is connected to an non-interrupting io expander for
    example. If vbus is in polling mode, then it is assumed that the vbus
    gpio may sleep. Also add an option to have vbus be an active low
    signal. Both options are set in the platform data for the device.

    Signed-off-by: Ryan Mallon
    Acked-by: Nicolas Ferre
    Signed-off-by: Russell King

    Ryan Mallon
     

09 Jul, 2010

3 commits

  • 064baaca8   ARM: 6209/2: at91: Add support for Bluewater Systems Snapper 9260/9G20 modules ... Browse Code »

    Add support for Bluewater Systems Snapper 9260/9G20 modules

    Signed-off-by: Ryan Mallon
    Acked-by: Andrew Victor
    Signed-off-by: Russell King

    Ryan Mallon
     
  • 708ee98c5   ARM: 6200/1: AT91: Define NR_BUILTIN_GPIO ... Browse Code »

    Add definition for NR_BUILTIN_GPIO for AT91 family

    Signed-off-by: Ryan Mallon
    Acked-by: Andrew Victor
    Signed-off-by: Russell King

    Ryan Mallon
     
  • 7dca3343f   ARM: 6185/1: AT91: PM: dual ram controller support ... Browse Code »

    This rework allows to address tow memory controllers. AT91SAM9263 and
    AT91SAM9G45 family have tow SDRAM or DDR/SDRAM controllers. Power management
    should take care of this.
    This patch modify the way RAM IP header files are implemented to allow
    access to registers of both controllers ; it also adds some macros.

    We also modify the power management files to use those modified header files.
    Slow clock (assembly) and regular power management functions are synchronized
    for setting of RAM self-refresh procedure:
    (lpr & ~AT91_DDRSDRC_LPCB) | AT91_DDRSDRC_LPCB_SELF_REFRESH

    Note that AT91RM9200 is not impacted by this modification.

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

    Nicolas Ferre
     

17 Jun, 2010

3 commits

25 May, 2010

1 commit

18 May, 2010

2 commits

17 May, 2010

1 commit

04 May, 2010

1 commit

  • e8faff733   ARM: 6092/1: atmel_serial: support for RS485 communications ... Browse Code »

    Final version of the patch that adds support for RS485 communications to the atmel_serial driver.

    The patch has been already sent and discussed on both linux-kernel and linux-arm-kernel mailing lists several times.

    Many people collaborated to improve and test the code:

    Tested-by: Sebastian Heutling
    Tested-by: Bernhard Roth
    Reviewed-by: Ryan Mallon
    Signed-off-by: Claudio Scordino
    Signed-off-by: Michael Trimarchi
    Signed-off-by: Rick Bronson
    Signed-off-by: Sebastian Heutling
    Signed-off-by: Russell King

    Claudio Scordino
     

03 May, 2010

1 commit

14 Apr, 2010

4 commits

09 Apr, 2010

1 commit

  • 9823f1a84   ARM: 6043/1: AT91 slow-clock resume: Don't wait for a disabled PLL to lock ... Browse Code »

    at91 slow-clock resume: Don't wait for a disabled PLL to lock.

    We run into this problem with the PLLB on the at91: ohci-at91 disables
    the PLLB when going to suspend. The slowclock code however tries to do
    the same: It saves the PLLB register value and when restoring the value
    during resume, it waits for the PLLB to lock again. However the PLL will
    never lock and the loop would run into its timeout because the slowclock
    code just stored and restored an empty register.
    This fixes the problem by only restoring PLLA/PLLB when they were enabled
    at suspend time.

    Cc: Andrew Victor
    Signed-off-by: Anders Larsen
    Signed-off-by: Russell King

    Anders Larsen
     

24 Mar, 2010

1 commit

  • 5cfc8ee0b   ARM: convert arm to arch_gettimeoffset() ... Browse Code »

    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