20 Mar, 2008

5 commits


06 Mar, 2008

2 commits

  • * omap-fixes:
    ARM: OMAP2: Register the L4 io bus to boot OMAP2
    ARM: OMAP1: Compile in other 16xx boards to OSK defconfig
    ARM: OMAP1: Refresh H2 defconfig
    ARM: OMAP1: Refresh OSK defconfig
    ARM: OMAP: gpio lockdep updates
    ARM: OMAP1: omap1/pm.c build fix
    ARM: OMAP1: omap h2 regression fix
    ARM: OMAP1: Fix compile for boards depending on old gpio expander
    ARM: OMAP1: omap h3 regression and build fix
    ARM: OMAP: Remove compiler warning when i2c is not set
    ARM: OMAP: fix omap i2c init (regression)
    ARM: OMAP: fix false lockdep warnings
    ARM: OMAP: Fix sleep under spinlock for cpufreq
    ARM: OMAP: Pass logical DMA channel number always to callback handlers

    Russell King
     
  • __FUNCTION__ is gcc-specific, use __func__

    Signed-off-by: Harvey Harrison
    Signed-off-by: Andrew Morton
    Signed-off-by: Russell King

    Harvey Harrison
     

05 Mar, 2008

5 commits

  • Fix some spinlock issues reported by lockdep: since the gpio bank
    locks can be aquired in both irq and non-irq contexts, they need
    to be consistent about always using the irq-safe variants.

    Signed-off-by: David Brownell
    Signed-off-by: Tony Lindgren

    David Brownell
     
  • In mainline, the "old style" I2C registration was only removed for
    OMAP2, leading to init-time bugs (regressions) like:

    sysfs: duplicate filename 'i2c_omap.1' can not be created
    ------------[ cut here ]------------
    WARNING: at fs/sysfs/dir.c:424 sysfs_add_one+0x40/0xd4()
    Modules linked in:
    ... deletia ...
    [] (omap_init_i2c+0x0/0x50) from [] (omap_init_devices+0x10/0x24)
    r4:c001e000
    [] (omap_init_devices+0x0/0x24) from [] (do_initcalls+0x78/0x200)
    ... deletia ...
    ---[ end trace ca143223eefdc828 ]---
    kobject_add_internal failed for i2c_omap.1 with -EEXIST, don't try to register things with the same name in the same directory.

    The fix is obvious: remove the old init code, it's no longer needed.

    Signed-off-by: David Brownell
    Signed-off-by: Tony Lindgren

    David Brownell
     
  • Remove false lockdep warnings about lock recursion when declaring
    IRQs as being wake-capable, by marking putting GPIO irq_desc locks
    into their own class.

    (Thanks to Peter Zijlstra for helping track down such a small
    fix to this problem.)

    Signed-off-by: David Brownell
    Signed-off-by: Tony Lindgren

    David Brownell
     
  • [ 10.523437] BUG: sleeping function called from invalid context at kernel/mut6
    [ 10.523437] in_atomic():0, irqs_disabled():128
    [ 10.523437] [] (dump_stack+0x0/0x14) from [] (__might_sl)
    [ 10.523437] [] (__might_sleep+0x0/0xd4) from [] (mutex_l)
    [ 10.523437] r5 = C02F0DE8 r4 = C02F0DF0
    [ 10.523437] [] (mutex_lock+0x0/0x44) from [] (clk_get+0x)
    [ 10.523437] r4 = 00000000
    [ 10.523437] [] (clk_get+0x0/0x128) from [] (omap_getspee)
    [ 10.523437] r8 = 00000002 r7 = 00000000 r6 = C031DAF8 r5 = C0473980
    [ 10.523437] r4 = 00000000
    [ 10.523437] [] (omap_getspeed+0x0/0x5c) from [] (cpufreq)
    [ 10.523437] r5 = C0473980 r4 = 00000002

    Signed-off-by: Hiroshi DOYU
    Signed-off-by: Tony Lindgren

    Hiroshi DOYU
     
  • This makes parameter passing to DMA handlers uniform between non-chained
    and chained transfers and makes debugging easier. Additional data like
    chain_id can be always passed to handlers via callback data if needed.

    Signed-off-by: Jarkko Nikula
    Signed-off-by: Tony Lindgren

    Jarkko Nikula
     

09 Feb, 2008

8 commits


08 Feb, 2008

1 commit

  • This patchset adds a flags variable to reserve_bootmem() and uses the
    BOOTMEM_EXCLUSIVE flag in crashkernel reservation code to detect collisions
    between crashkernel area and already used memory.

    This patch:

    Change the reserve_bootmem() function to accept a new flag BOOTMEM_EXCLUSIVE.
    If that flag is set, the function returns with -EBUSY if the memory already
    has been reserved in the past. This is to avoid conflicts.

    Because that code runs before SMP initialisation, there's no race condition
    inside reserve_bootmem_core().

    [akpm@linux-foundation.org: coding-style fixes]
    [akpm@linux-foundation.org: fix powerpc build]
    Signed-off-by: Bernhard Walle
    Cc:
    Cc: "Eric W. Biederman"
    Cc: Vivek Goyal
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Bernhard Walle
     

29 Jan, 2008

1 commit

  • * 'blk-end-request' of git://git.kernel.dk/linux-2.6-block: (30 commits)
    blk_end_request: changing xsysace (take 4)
    blk_end_request: changing ub (take 4)
    blk_end_request: cleanup of request completion (take 4)
    blk_end_request: cleanup 'uptodate' related code (take 4)
    blk_end_request: remove/unexport end_that_request_* (take 4)
    blk_end_request: changing scsi (take 4)
    blk_end_request: add bidi completion interface (take 4)
    blk_end_request: changing ide-cd (take 4)
    blk_end_request: add callback feature (take 4)
    blk_end_request: changing ide normal caller (take 4)
    blk_end_request: changing cpqarray (take 4)
    blk_end_request: changing cciss (take 4)
    blk_end_request: changing ide-scsi (take 4)
    blk_end_request: changing s390 (take 4)
    blk_end_request: changing mmc (take 4)
    blk_end_request: changing i2o_block (take 4)
    blk_end_request: changing viocd (take 4)
    blk_end_request: changing xen-blkfront (take 4)
    blk_end_request: changing viodasd (take 4)
    blk_end_request: changing sx8 (take 4)
    ...

    Linus Torvalds
     

28 Jan, 2008

3 commits

  • * pxa-plat: (53 commits)
    [ARM] 4762/1: Basic support for Toradex Colibri module
    [ARM] pxa: fix mci_init functions returning -1
    [ARM] 4737/1: Refactor corgi_lcd to improve readability + bugfix
    [ARM] 4747/1: pcm027: support for pcm990 baseboard for phyCORE-PXA270
    [ARM] 4746/1: pcm027: network support for phyCORE-PXA270
    [ARM] 4745/1: pcm027: default configuration
    [ARM] 4744/1: pcm027: add support for phyCORE-PXA270 CPU module
    [NET] smc91x: Make smc91x use IRQ resource trigger flags
    [ARM] pxa: add default config for littleton
    [ARM] pxa: add basic support for Littleton (PXA3xx Form Factor Platform)
    [ARM] 4664/1: Add basic support for HTC Magician PDA phones
    [ARM] 4649/1: Base support for pxa-based Toshiba e-series PDAs.
    [ARM] pxa: skip registers saving/restoring if entering standby mode
    [ARM] pxa: fix PXA27x resume
    [ARM] pxa: Avoid fiddling with CKEN register on suspend
    [ARM] pxa: Add PXA3 standby code hooked into the IRQ wake scheme
    [ARM] pxa: Add zylonite MFP wakeup configurations
    [ARM] pxa: program MFPs for low power mode when suspending
    [ARM] pxa: make MFP configuration processor independent
    [ARM] pxa: remove un-used pxa3xx_mfp_set_xxx() functions
    ...

    Conflicts:

    arch/arm/mach-pxa/ssp.c

    Signed-off-by: Russell King

    Russell King
     
  • smc91x is shared between many different platforms. Each platform needs
    to specify the interrupt type, and in some cases the irq type depends
    on more than just the build configuration - it depends on runtime
    checks.

    Rather than throwing this code into the SMC_IRQ_FLAGS definition, provide
    a way for these flags to be passed via the IRQ resource itself.

    Note that IRQF_TRIGGER_* constants are intentionally defined to correspond
    with the IORESOURCE_IRQ_* interrupt type flags, in much the same way that
    the low bits of PCI iomem resources correspond with the BAR flag bits.

    Also provide a way to configure smc91x to read the IRQ flags from the
    resource. Once all platforms have been converted over (signified
    by all definitions of SMC_IRQ_FLAGS being -1) SMC_IRQ_FLAGS should
    be removed.

    Signed-off-by: Russell King
    Acked-by: Nicolas Pitre
    Acked-by: Jeff Garzik

    Russell King
     
  • This patch converts arm's OMAP mailbox driver to use
    blk_end_request interfaces.

    If the original code was converted literally, blk_end_request would
    be called with '-EIO' because end_that_request_last() were called
    with '0' (i.e. failure).
    But I think these '0's are bugs in the original code because it's
    unlikely that all requests are treated as failure.
    (The bugs should have no effect unless these requests have an end_io
    callback.)

    So I changed them to pass '0' (i.e. success) to blk_end_request.

    Cc: Toshihiro Kobayashi
    Cc: Hiroshi DOYU
    Signed-off-by: Kiyoshi Ueda
    Signed-off-by: Jun'ichi Nomura
    Signed-off-by: Jens Axboe

    Kiyoshi Ueda
     

26 Jan, 2008

2 commits


25 Jan, 2008

1 commit


06 Nov, 2007

1 commit


20 Oct, 2007

1 commit

  • * Convert files to UTF-8.

    * Also correct some people's names
    (one example is Eißfeldt, which was found in a source file.
    Given that the author used an ß at all in a source file
    indicates that the real name has in fact a 'ß' and not an 'ss',
    which is commonly used as a substitute for 'ß' when limited to
    7bit.)

    * Correct town names (Goettingen -> Göttingen)

    * Update Eberhard Mönkeberg's address (http://lkml.org/lkml/2007/1/8/313)

    Signed-off-by: Jan Engelhardt
    Signed-off-by: Adrian Bunk

    Jan Engelhardt
     

16 Oct, 2007

1 commit

  • * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (95 commits)
    [ARM] 4578/1: CM-x270: PCMCIA support
    [ARM] 4577/1: ITE 8152 PCI bridge support
    [ARM] 4576/1: CM-X270 machine support
    [ARM] pxa: Avoid pxa_gpio_mode() in gpio_direction_{in,out}put()
    [ARM] pxa: move pxa_set_mode() from pxa2xx_mainstone.c to mainstone.c
    [ARM] pxa: move pxa_set_mode() from pxa2xx_lubbock.c to lubbock.c
    [ARM] pxa: Make cpu_is_pxaXXX dependent on configuration symbols
    [ARM] pxa: PXA3xx base support
    [NET] smc91x: fix PXA DMA support code
    [SERIAL] Fix console initialisation ordering
    [ARM] pxa: tidy up arch/arm/mach-pxa/Makefile
    [ARM] Update arch/arm/Kconfig for drivers/Kconfig changes
    [ARM] 4600/1: fix kernel build failure with build-id-supporting binutils
    [ARM] 4599/1: Preserve ATAG list for use with kexec (2.6.23)
    [ARM] Rename consistent_sync() as dma_cache_maint()
    [ARM] 4572/1: ep93xx: add cirrus logic edb9307 support
    [ARM] 4596/1: S3C2412: Correct IRQs for SDI+CF and add decoding support
    [ARM] 4595/1: ns9xxx: define registers as void __iomem * instead of volatile u32
    [ARM] 4594/1: ns9xxx: use the new gpio functions
    [ARM] 4593/1: ns9xxx: implement generic clockevents
    ...

    Linus Torvalds
     

13 Oct, 2007

1 commit


05 Oct, 2007

1 commit


21 Sep, 2007

2 commits

  • The SoSSI driver should already take care of this by enabling / disabling
    its clock when necessary, so this legacy callout from the PM idle code
    is not needed any more.

    Signed-off-by: Imre Deak
    Signed-off-by: Tony Lindgren

    Imre Deak
     
  • Additional cleanup for debug boards on H2/P2/H3/H4: move the init
    code that's not board-specific into a new file where it can be easily
    shared between all the different boards (avoiding code duplication,
    and making it easier to support more devices). Make H4 use that.

    This should be easy to drop in to the OMAP1 boards using these debug
    cards; the only difference seems to be that the p2 does an extra reset
    of the smc using the fpga (probably all boards could do that, if it's
    necessary) and doesn't use the gpio mux or request APIs.

    Signed-off-by: David Brownell
    Signed-off-by: Tony Lindgren

    David Brownell
     

22 Aug, 2007

2 commits


24 Jul, 2007

1 commit

  • Some of the code has been gradually transitioned to using the proper
    struct request_queue, but there's lots left. So do a full sweet of
    the kernel and get rid of this typedef and replace its uses with
    the proper type.

    Signed-off-by: Jens Axboe

    Jens Axboe
     

22 Jul, 2007

1 commit

  • We need to make sure, that the clockevent devices are resumed, before
    the tick is resumed. The current resume logic does not guarantee this.

    Add CLOCK_EVT_MODE_RESUME and call the set mode functions of the clock
    event devices before resuming the tick / oneshot functionality.

    Fixup the existing users.

    Thanks to Nigel Cunningham for tracking down a long standing thinko,
    which affected the jinxed VAIO.

    [akpm@linux-foundation.org: xen build fix]
    Signed-off-by: Thomas Gleixner
    Cc: john stultz
    Cc: Rusty Russell
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Thomas Gleixner
     

21 May, 2007

1 commit