Eric Lee / smarc-fsl-linux-kernel

17 Jun, 2009

4 commits

  • 517d08699   Merge branch 'akpm' ... Browse Code »

    * akpm: (182 commits)
    fbdev: bf54x-lq043fb: use kzalloc over kmalloc/memset
    fbdev: *bfin*: fix __dev{init,exit} markings
    fbdev: *bfin*: drop unnecessary calls to memset
    fbdev: bfin-t350mcqb-fb: drop unused local variables
    fbdev: blackfin has __raw I/O accessors, so use them in fb.h
    fbdev: s1d13xxxfb: add accelerated bitblt functions
    tcx: use standard fields for framebuffer physical address and length
    fbdev: add support for handoff from firmware to hw framebuffers
    intelfb: fix a bug when changing video timing
    fbdev: use framebuffer_release() for freeing fb_info structures
    radeon: P2G2CLK_ALWAYS_ONb tested twice, should 2nd be P2G2CLK_DAC_ALWAYS_ONb?
    s3c-fb: CPUFREQ frequency scaling support
    s3c-fb: fix resource releasing on error during probing
    carminefb: fix possible access beyond end of carmine_modedb[]
    acornfb: remove fb_mmap function
    mb862xxfb: use CONFIG_OF instead of CONFIG_PPC_OF
    mb862xxfb: restrict compliation of platform driver to PPC
    Samsung SoC Framebuffer driver: add Alpha Channel support
    atmel-lcdc: fix pixclock upper bound detection
    offb: use framebuffer_alloc() to allocate fb_info struct
    ...

    Manually fix up conflicts due to kmemcheck in mm/slab.c

    Linus Torvalds
     
  • 08604bd99   time: move PIT_TICK_RATE to linux/timex.h ... Browse Code »

    PIT_TICK_RATE is currently defined in four architectures, but in three
    different places. While linux/timex.h is not the perfect place for it, it
    is still a reasonable replacement for those drivers that traditionally use
    asm/timex.h to get CLOCK_TICK_RATE and expect it to be the PIT frequency.

    Note that for Alpha, the actual value changed from 1193182UL to 1193180UL.
    This is unlikely to make a difference, and probably can only improve
    accuracy. There was a discussion on the correct value of CLOCK_TICK_RATE
    a few years ago, after which every existing instance was getting changed
    to 1193182. According to the specification, it should be
    1193181.818181...

    Signed-off-by: Arnd Bergmann
    Cc: Richard Henderson
    Cc: Ivan Kokshaysky
    Cc: Ralf Baechle
    Cc: Benjamin Herrenschmidt
    Cc: Ingo Molnar
    Cc: Thomas Gleixner
    Cc: "H. Peter Anvin"
    Cc: Len Brown
    Cc: john stultz
    Cc: Dmitry Torokhov
    Cc: Takashi Iwai
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Arnd Bergmann
     
  • 6fd03301d   Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (64 commits)
    debugfs: use specified mode to possibly mark files read/write only
    debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.
    xen: remove driver_data direct access of struct device from more drivers
    usb: gadget: at91_udc: remove driver_data direct access of struct device
    uml: remove driver_data direct access of struct device
    block/ps3: remove driver_data direct access of struct device
    s390: remove driver_data direct access of struct device
    parport: remove driver_data direct access of struct device
    parisc: remove driver_data direct access of struct device
    of_serial: remove driver_data direct access of struct device
    mips: remove driver_data direct access of struct device
    ipmi: remove driver_data direct access of struct device
    infiniband: ehca: remove driver_data direct access of struct device
    ibmvscsi: gadget: at91_udc: remove driver_data direct access of struct device
    hvcs: remove driver_data direct access of struct device
    xen block: remove driver_data direct access of struct device
    thermal: remove driver_data direct access of struct device
    scsi: remove driver_data direct access of struct device
    pcmcia: remove driver_data direct access of struct device
    PCIE: remove driver_data direct access of struct device
    ...

    Manually fix up trivial conflicts due to different direct driver_data
    direct access fixups in drivers/block/{ps3disk.c,ps3vram.c}

    Linus Torvalds
     
  • 661adc423   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 ... Browse Code »

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
    ALSA: ctxfi - Fix deadlock with xfi-timer
    ALSA: intel8x0 - Fix PCM position craziness
    ALSA: usb-audio - rework quirk for TerraTec Aureon USB 5.1 MkII
    ASoC: magician: fix PXA SSP clock polarity
    ASoC: Instantiate any forgotten DAPM widgets
    ASoC: Revert duplicated code in SSM2602 driver
    ALSA: hda - Add quirk for Acer Aspire 6935G
    ALSA: ctxfi - Replace atc lock to mutex
    ASoC: Remove odd bit clock ratios for WM8903

    Linus Torvalds
     

16 Jun, 2009

6 commits

15 Jun, 2009

5 commits

  • 8dca41972   ALSA: ctxfi - Fix deadlock with xfi-timer ... Browse Code »

    The PCM x-fi native update routine can cause deadlocks when the
    trigger(START) is called while the stream is running.

    This patch fixes the deadlock by just postponing the pcm period update
    to the next possible wake-up. Also it adds the flip of ti->running
    flag (just to be sure as now).

    Signed-off-by: Takashi Iwai

    Takashi Iwai
     
  • f708eb1d7   ALSA: intel8x0 - Fix PCM position craziness ... Browse Code »

    The PCM pointer callback sometimes returns invalid positions and this
    screws up the hw_ptr updater in PCM core. Especially since now the
    jiffies check is optional with xrun_debug, the invalid position is
    handled as is, and causes serious sound skips, etc.

    This patch simplifies the position-fix strategy in intel8x0 to be more
    robust:
    - just falls back to the last position if bogus position is detected
    - another sanity check for the backward move of the position due to
    a race of register update and the base-index update

    This patch is applicable also for 2.6.30.

    Tested-by: David Miller
    Cc:
    Signed-off-by: Takashi Iwai

    Takashi Iwai
     
  • d9e89bf0c   ALSA: usb-audio - rework quirk for TerraTec Aureon USB 5.1 MkII ... Browse Code »

    This patch changes yet again the ID for the TTA cards, resulting in a
    more reasonable name:
    1 [Aureon51MkII ]: USB-Audio - Aureon5.1MkII
    TerraTec Aureon5.1MkII at usb-0000:00:03.0-2, full speed

    Signed-off-by: Andrea Borgia
    Signed-off-by: Takashi Iwai

    Andrea Borgia
     
  • 489f7ab6c   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial ... Browse Code »

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (31 commits)
    trivial: remove the trivial patch monkey's name from SubmittingPatches
    trivial: Fix a typo in comment of addrconf_dad_start()
    trivial: usb: fix missing space typo in doc
    trivial: pci hotplug: adding __init/__exit macros to sgi_hotplug
    trivial: Remove the hyphen from git commands
    trivial: fix ETIMEOUT -> ETIMEDOUT typos
    trivial: Kconfig: .ko is normally not included in module names
    trivial: SubmittingPatches: fix typo
    trivial: Documentation/dell_rbu.txt: fix typos
    trivial: Fix Pavel's address in MAINTAINERS
    trivial: ftrace:fix description of trace directory
    trivial: unnecessary (void*) cast removal in sound/oss/msnd.c
    trivial: input/misc: Fix typo in Kconfig
    trivial: fix grammo in bus_for_each_dev() kerneldoc
    trivial: rbtree.txt: fix rb_entry() parameters in sample code
    trivial: spelling fix in ppc code comments
    trivial: fix typo in bio_alloc kernel doc
    trivial: Documentation/rbtree.txt: cleanup kerneldoc of rbtree.txt
    trivial: Miscellaneous documentation typo fixes
    trivial: fix typo milisecond/millisecond for documentation and source comments.
    ...

    Linus Torvalds
     
  • 2cf4d4514   Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm ... Browse Code »

    * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (417 commits)
    MAINTAINERS: EB110ATX is not ebsa110
    MAINTAINERS: update Eric Miao's email address and status
    fb: add support of LCD display controller on pxa168/910 (base layer)
    [ARM] 5552/1: ep93xx get_uart_rate(): use EP93XX_SYSCON_PWRCNT and EP93XX_SYSCON_PWRCN
    [ARM] pxa/sharpsl_pm: zaurus needs generic pxa suspend/resume routines
    [ARM] 5544/1: Trust PrimeCell resource sizes
    [ARM] pxa/sharpsl_pm: cleanup of gpio-related code.
    [ARM] pxa/sharpsl_pm: drop set_irq_type calls
    [ARM] pxa/sharpsl_pm: merge pxa-specific code into generic one
    [ARM] pxa/sharpsl_pm: merge the two sharpsl_pm.c since it's now pxa specific
    [ARM] sa1100: remove unused collie_pm.c
    [ARM] pxa: fix the conflicting non-static declarations of global_gpios[]
    [ARM] 5550/1: Add default configure file for w90p910 platform
    [ARM] 5549/1: Add clock api for w90p910 platform.
    [ARM] 5548/1: Add gpio api for w90p910 platform
    [ARM] 5551/1: Add multi-function pin api for w90p910 platform.
    [ARM] Make ARM_VIC_NR depend on ARM_VIC
    [ARM] 5546/1: ARM PL022 SSP/SPI driver v3
    ARM: OMAP4: SMP: Update defconfig for OMAP4430
    ARM: OMAP4: SMP: Enable SMP support for OMAP4430
    ...

    Linus Torvalds
     

14 Jun, 2009

4 commits

13 Jun, 2009

15 commits

11 Jun, 2009

6 commits