Eric Lee / linux-smarc-t335x-v3.2

02 Dec, 2008

2 commits

24 Oct, 2008

1 commit

22 Oct, 2008

1 commit

17 Oct, 2008

1 commit

  • 6bb7a9354   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: us122l: fix missing unlock in usb_stream_hwdep_vm_fault()
    ALSA: hda - Fix quirk lists for realtek codecs
    ALSA: hda - Add support of ALC272
    ALSA: hda - Add ALC887 support
    ALSA: hda - Add ALC1200 support
    ALSA: hda - Fix PCI SSID of ASUS M90V
    ALSA: hda - Add auto mic switch in realtek auto-probe mode
    ALSA: Fix pxa2xx-ac97-lib.c compilation
    ALSA: ASoC: Hide TLV320AIC26 configuration option for non-OpenFirwmare users
    ALSA: hda: fix nid variable warning
    ALSA: ASoC: Fix compile-time warning for tlv320aic23.c

    Linus Torvalds
     

14 Oct, 2008

1 commit

  • 8825e8e8d   ALSA: Fix pxa2xx-ac97-lib.c compilation ... Browse Code »

    The last ALSA merge broke pxa2xx-ac97-lib.c, as it brought back
    references to cpu_is_pxa21x that Eric Miao removed in commit
    0ffcbfd54ea81ca24c0749f55ca4fcf3e2bdc23e:

    [ARM] pxa: make cpu_is_pxa2* macros more consistent

    This patch gets rid of those references, and only keeps cpu_is_pxa25x().

    Signed-off-by: Marc Zyngier
    Acked-by: Eric Miao
    Signed-off-by: Mark Brown
    Signed-off-by: Takashi Iwai

    Marc Zyngier
     

12 Oct, 2008

1 commit

  • 7cc4e87f9   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: (236 commits)
    [ARM] 5300/1: fixup spitz reset during boot
    [ARM] 5295/1: make ZONE_DMA optional
    [ARM] 5239/1: Palm Zire 72 power management support
    [ARM] 5298/1: Drop desc_handle_irq()
    [ARM] 5297/1: [KS8695] Fix two compile-time warnings
    [ARM] 5296/1: [KS8695] Replace macro's with trailing underscores.
    [ARM] pxa: allow multi-machine PCMCIA builds
    [ARM] pxa: add preliminary CPUFREQ support for PXA3xx
    [ARM] pxa: add missing ACCR bit definitions to pxa3xx-regs.h
    [ARM] pxa: rename cpu-pxa.c to cpufreq-pxa2xx.c
    [ARM] pxa/zylonite: add support for USB OHCI
    [ARM] ohci-pxa27x: use ioremap() and offset for register access
    [ARM] ohci-pxa27x: introduce pxa27x_clear_otgph()
    [ARM] ohci-pxa27x: use platform_get_{irq,resource} for the resource
    [ARM] ohci-pxa27x: move OHCI controller specific registers into the driver
    [ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registers
    [ARM] pxa: move I2S register and bit definitions into pxa2xx-i2s.c
    [ARM] pxa: simplify DMA register definitions
    [ARM] pxa: make additional DCSR bits valid for PXA3xx
    [ARM] pxa: move i2c register and bit definitions into i2c-pxa.c
    ...

    Fixed up conflicts in
    arch/arm/mach-versatile/core.c
    sound/soc/pxa/pxa2xx-ac97.c
    sound/soc/pxa/pxa2xx-i2s.c
    manually.

    Linus Torvalds
     

08 Oct, 2008

1 commit

  • 87f3dd779   [ARM] pxa: simplify DMA register definitions ... Browse Code »

    1. DRCMRxx is no longer recommended, use DRCMR(xx) instead, and
    pass DRCMR index by "struct resource" if possible

    2. DCSRxx, DDADRxx, DSADRxx, DTADRxx, DCMDxx is never used, use
    DCSR(), DDADR(), DSADR(), DTADR(), DCMD() instead

    Signed-off-by: Eric Miao
    Acked-by: Nicolas Pitre
    Signed-off-by: Russell King

    Eric Miao
     

23 Sep, 2008

3 commits

10 Sep, 2008

1 commit

  • e8f18ae55   ALSA: fix section for sa11xx-uda1341 platform driver ... Browse Code »

    Don't use __init but __devinit to define probe function. A pointer to
    sa11xx_uda1341_probe is passed to the core via platform_driver_register
    and so the function must not disappear after the module is loaded. Using
    __init and having HOTPLUG=y and SND_SA11XX_UDA1341=m the following
    probably oopses:

    echo -n sa11xx_uda1341.1 > /sys/bus/platform/driver/sa11xx_uda1341/unbind
    echo -n sa11xx_uda1341.1 > /sys/bus/platform/driver/sa11xx_uda1341/bind

    Signed-off-by: Uwe Kleine-König
    Cc: Russell King
    Cc: Brian Avery
    Signed-off-by: Andrew Morton
    Signed-off-by: Takashi Iwai
    Signed-off-by: Jaroslav Kysela

    Uwe Kleine-König
     

04 Sep, 2008

1 commit

13 Aug, 2008

1 commit

07 Aug, 2008

2 commits

27 May, 2008

2 commits

24 Apr, 2008

3 commits

19 Apr, 2008

2 commits

01 Feb, 2008

2 commits

  • 9004acc70   [ALSA] Remove sound/driver.h ... Browse Code »

    This header file exists only for some hacks to adapt alsa-driver
    tree. It's useless for building in the kernel. Let's move a few
    lines in it to sound/core.h and remove it.
    With this patch, sound/driver.h isn't removed but has just a single
    compile warning to include it. This should be really killed in
    future.

    Signed-off-by: Takashi Iwai
    Signed-off-by: Jaroslav Kysela

    Takashi Iwai
     
  • f78dfac90   [ALSA] Add missing device link ... Browse Code »

    Added the missing link to struct device from the card instance.

    Signed-off-by: Takashi Iwai
    Signed-off-by: Jaroslav Kysela

    Takashi Iwai
     

08 Dec, 2007

1 commit

  • 03d14a553   [ARM] 4690/1: PXA: fix CKEN corruption in PXA27x AC97 cold reset code ... Browse Code »

    Fix CKEN register corruption in the PXA27x cold reset code
    located in sound/arm/pxa27x-ac97.c. The problem has been
    introduced with a pxa_set_cken() function change in linux 2.6.23.
    This patch is based on patch 4527/1 that fixes the same problem in
    the ASoC PXA-AC97 driver. Additionally a definition for the CKEN
    index value is added and applied to both PXA AC97 drivers.

    Signed-off-by: Michael Brunner
    Signed-off-by: Russell King

    Michael Brunner
     

19 Oct, 2007

1 commit

  • 898eb71cb   Add missing newlines to some uses of dev_<level> messages ... Browse Code »

    Found these while looking at printk uses.

    Add missing newlines to dev_ uses
    Add missing KERN_ prefixes to multiline dev_s
    Fixed a wierd->weird spelling typo
    Added a newline to a printk

    Signed-off-by: Joe Perches
    Cc: "Luck, Tony"
    Cc: Jens Axboe
    Cc: Mark M. Hoffman
    Cc: Roland Dreier
    Cc: Tilman Schmidt
    Cc: David Woodhouse
    Cc: Jeff Garzik
    Cc: Stephen Hemminger
    Cc: Greg KH
    Cc: Jeremy Fitzhardinge
    Cc: Geert Uytterhoeven
    Cc: Alessandro Zummo
    Cc: David Brownell
    Cc: James Smart
    Cc: Andrew Vasquez
    Cc: "Antonino A. Daplas"
    Cc: Evgeniy Polyakov
    Cc: Russell King
    Cc: Jaroslav Kysela
    Cc: Takashi Iwai
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     

16 Oct, 2007

1 commit

  • 350a29b45   [ALSA] Get rid of dead code in sound/arm/sa11xx-uda1341.c ... Browse Code »

    File /home/devel/linux-rdc/sound/arm/sa11xx-uda1341.c line 82
    Unknown CONFIG option! CONFIG_H3600_HAL
    File /home/devel/linux-rdc/sound/arm/sa11xx-uda1341.c line 103
    Unknown CONFIG option! CONFIG_H3600_HAL
    File /home/devel/linux-rdc/sound/arm/sa11xx-uda1341.c line 241
    Unknown CONFIG option! CONFIG_H3600_HAL
    File /home/devel/linux-rdc/sound/arm/sa11xx-uda1341.c line 310
    Unknown CONFIG option! CONFIG_H3600_HAL
    File /home/devel/linux-rdc/sound/arm/sa11xx-uda1341.c line 334
    Unknown CONFIG option! CONFIG_H3600_HAL
    File /home/devel/linux-rdc/sound/arm/sa11xx-uda1341.c line 344
    Unknown CONFIG option! CONFIG_H3600_HAL
    File /home/devel/linux-rdc/sound/arm/sa11xx-uda1341.c line 357
    Unknown CONFIG option! CONFIG_H3600_HAL

    Signed-off-by: Michal Piotrowski
    Signed-off-by: Takashi Iwai
    Signed-off-by: Jaroslav Kysela

    Michal Piotrowski
     

02 Jul, 2007

1 commit

01 Jun, 2007

1 commit

  • 632155e65   potential parse error in ifdef ... Browse Code »

    I have made a tool to parse the kernel that does not pre-process the
    source. That means that my parser tries to parse all the code, including
    code in the #else branch or code that is not often compiled because the
    driver is not very used (or not used at all). So, my parser sometimes
    reports parse error not originally detected by gcc. Here is my (first)
    patch.

    [akpm@linux-foundation.org: fix amd8111e.c]
    Signed-off-by: Yoann Padioleau
    Acked-by: Matthew Wilcox
    Acked-by: Wim Van Sebroeck
    Acked-by: David Woodhouse
    Acked-by: Jeff Garzik
    Acked-by: James Bottomley
    Cc: Russell King
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Yoann Padioleau
     

22 Apr, 2007

1 commit

  • 7053acbd7   [ARM] 4304/1: removes the unnecessary bit number from CKENnn_XXXX ... Browse Code »

    This patch removes the unnecessary bit number from CKENnn_XXXX
    definitions for PXA, so that

    CKEN0_PWM0 --> CKEN_PWM0
    CKEN1_PWM1 --> CKEN_PWM1
    ...
    CKEN24_CAMERA --> CKEN_CAMERA

    The reasons for the change of these defitions are:

    1. they do not scale - they are currently valid for pxa2xx, but
    definitely not valid for pxa3xx, e.g., pxa3xx has bit 3 for camera
    instead of bit 24

    2. they are unnecessary - the peripheral name within the definition
    has already announced its usage, we don't need those bit numbers
    to know which peripheral we are going to enable/disable clock for

    3. they are inconvenient - think about this: a driver programmer
    for pxa has to remember which bit in the CKEN register to turn
    on/off

    Another change in the patch is to make the definitions equal to its
    clock bit index, so that

    #define CKEN_CAMERA (24)

    instead of

    #define CKEN_CAMERA (1 << 24)

    this change, however, will add a run-time bit shift operation in
    pxa_set_cken(), but the benefit of this change is that it scales
    when bit index exceeds 32, e.g., pxa3xx has two registers CKENA
    and CKENB, totally 64 bit for this, suppose CAMERA clock enabling
    bit is CKENB:10, one can simply define CKEN_CAMERA to be (32 + 10)
    and so that pxa_set_cken() need minimum change to adapt to that.

    Signed-off-by: eric miao
    Signed-off-by: Russell King

    Eric Miao
     

20 Feb, 2007

2 commits

  • 8a371840f   [ARM] Fix ARM AACI ALSA driver ... Browse Code »

    CC [M] sound/arm/aaci.o
    sound/arm/aaci.c:729: error: parse error before '*' token
    sound/arm/aaci.c:731: warning: function declaration isn't a prototype
    ...
    sound/arm/aaci.c:786: error: parse error before '*' token
    sound/arm/aaci.c:786: warning: function declaration isn't a prototype
    ...
    sound/arm/aaci.c:827: error: parse error before '*' token
    sound/arm/aaci.c:828: warning: function declaration isn't a prototype
    ...
    sound/arm/aaci.c:845: error: parse error before "aaci_capture_ops"
    sound/arm/aaci.c:845: warning: type defaults to `int' in declaration of `aaci_capture_ops'

    Signed-off-by: Russell King

    Russell King
     
  • 59b8175c7   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: (117 commits)
    [ARM] 4058/2: iop32x: set ->broken_parity_status on n2100 onboard r8169 ports
    [ARM] 4140/1: AACI stability add ac97 timeout and retries
    [ARM] 4139/1: AACI record support
    [ARM] 4138/1: AACI: multiple channel support for IRQ handling
    [ARM] 4211/1: Provide a defconfig for ns9xxx
    [ARM] 4210/1: base for new machine type "NetSilicon NS9360"
    [ARM] 4222/1: S3C2443: Remove reference to missing S3C2443_PM
    [ARM] 4221/1: S3C2443: DMA support
    [ARM] 4220/1: S3C24XX: DMA system initialised from sysdev
    [ARM] 4219/1: S3C2443: DMA source definitions
    [ARM] 4218/1: S3C2412: fix CONFIG_CPU_S3C2412_ONLY wrt to S3C2443
    [ARM] 4217/1: S3C24XX: remove the dma channel show at startup
    [ARM] 4090/2: avoid clash between PXA and SA1111 defines
    [ARM] 4216/1: add .gitignore entries for ARM specific files
    [ARM] 4214/2: S3C2410: Add Armzone QT2410
    [ARM] 4215/1: s3c2410 usb device: per-platform vbus_draw
    [ARM] 4213/1: S3C2410 - Update definition of ADCTSC_XY_PST
    [ARM] 4098/1: ARM: rtc_lock only used with rtc_cmos
    [ARM] 4137/1: Add kexec support
    [ARM] 4201/1: SMP barriers pair needed for the secondary boot process
    ...

    Fix up conflict due to typedef removal in sound/arm/aaci.h

    Linus Torvalds
     

18 Feb, 2007

3 commits

14 Feb, 2007

1 commit

  • 788c60433   [ALSA] Fix __devinit and __devexit issues with sound drivers ... Browse Code »

    Fix __devinit and __devexit issues with sound drivers.
    Resolves MODPOST warnings similar to:
    WARNING: sound/drivers/snd-dummy.o - Section mismatch: reference to .init.text:snd_dummy_probe from .data.rel.local between 'snd_dummy_driver' (at offset 0x0) and 'snd_dummy_controls'
    WARNING: sound/drivers/snd-mtpav.o - Section mismatch: reference to .init.text:snd_mtpav_probe from .data.rel.local between 'snd_mtpav_driver' (at offset 0x0) and 'snd_mtpav_input'
    WARNING: sound/drivers/snd-virmidi.o - Section mismatch: reference to .init.text:snd_virmidi_probe from .data.rel.local after 'snd_virmidi_driver' (at offset 0x0)

    Signed-off-by: Prarit Bhargava
    Signed-off-by: Takashi Iwai
    Signed-off-by: Jaroslav Kysela

    Prarit Bhargava
     

09 Feb, 2007

1 commit

08 Dec, 2006

1 commit

05 Oct, 2006

1 commit

  • 7d12e780e   IRQ: Maintain regs pointer globally rather than passing to IRQ handlers ... Browse Code »

    Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
    of passing regs around manually through all ~1800 interrupt handlers in the
    Linux kernel.

    The regs pointer is used in few places, but it potentially costs both stack
    space and code to pass it around. On the FRV arch, removing the regs parameter
    from all the genirq function results in a 20% speed up of the IRQ exit path
    (ie: from leaving timer_interrupt() to leaving do_IRQ()).

    Where appropriate, an arch may override the generic storage facility and do
    something different with the variable. On FRV, for instance, the address is
    maintained in GR28 at all times inside the kernel as part of general exception
    handling.

    Having looked over the code, it appears that the parameter may be handed down
    through up to twenty or so layers of functions. Consider a USB character
    device attached to a USB hub, attached to a USB controller that posts its
    interrupts through a cascaded auxiliary interrupt controller. A character
    device driver may want to pass regs to the sysrq handler through the input
    layer which adds another few layers of parameter passing.

    I've build this code with allyesconfig for x86_64 and i386. I've runtested the
    main part of the code on FRV and i386, though I can't test most of the drivers.
    I've also done partial conversion for powerpc and MIPS - these at least compile
    with minimal configurations.

    This will affect all archs. Mostly the changes should be relatively easy.
    Take do_IRQ(), store the regs pointer at the beginning, saving the old one:

    struct pt_regs *old_regs = set_irq_regs(regs);

    And put the old one back at the end:

    set_irq_regs(old_regs);

    Don't pass regs through to generic_handle_irq() or __do_IRQ().

    In timer_interrupt(), this sort of change will be necessary:

    - update_process_times(user_mode(regs));
    - profile_tick(CPU_PROFILING, regs);
    + update_process_times(user_mode(get_irq_regs()));
    + profile_tick(CPU_PROFILING);

    I'd like to move update_process_times()'s use of get_irq_regs() into itself,
    except that i386, alone of the archs, uses something other than user_mode().

    Some notes on the interrupt handling in the drivers:

    (*) input_dev() is now gone entirely. The regs pointer is no longer stored in
    the input_dev struct.

    (*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
    something different depending on whether it's been supplied with a regs
    pointer or not.

    (*) Various IRQ handler function pointers have been moved to type
    irq_handler_t.

    Signed-Off-By: David Howells
    (cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)

    David Howells