Doug / smarc-fsl-linux-kernel

19 Feb, 2011

1 commit

  • 5b703683b   pcmcia vs. MECR on pxa25x/sa1111 ... Browse Code »

    After 2.6.34 changes, __pxa2xx_drv_pcmcia_probe() was replaced by
    sa1111_pcmcia_add(). That unfortunately means that configure_sockets()
    is not called, leading to MECR not being set properly, leading to
    strange crashes.

    Tested on pxa255+sa1111, I do not have lubbock board nearby. Perhaps
    cleaner solution exists?

    Signed-off-by: Pavel Machek
    Signed-off-by: Dominik Brodowski

    Pavel Machek
     

20 Dec, 2010

1 commit

16 Dec, 2010

2 commits

07 Aug, 2010

1 commit

  • 1685e633b   Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
    pcmcia: avoid buffer overflow in pcmcia_setup_isa_irq
    pcmcia: do not request windows if you don't need to
    pcmcia: insert PCMCIA device resources into resource tree
    pcmcia: export resource information to sysfs
    pcmcia: use struct resource for PCMCIA devices, part 2
    pcmcia: remove memreq_t
    pcmcia: move local definitions out of include/pcmcia/cs.h
    pcmcia: do not use io_req_t when calling pcmcia_request_io()
    pcmcia: do not use io_req_t after call to pcmcia_request_io()
    pcmcia: use struct resource for PCMCIA devices
    pcmcia: clean up cs.h
    pcmcia: use pcmica_{read,write}_config_byte
    pcmcia: remove cs_types.h
    pcmcia: remove unused flag, simplify headers
    pcmcia: remove obsolete CS_EVENT_ definitions
    pcmcia: split up central event handler
    pcmcia: simplify event callback
    pcmcia: remove obsolete ioctl

    Conflicts in:
    - drivers/staging/comedi/drivers/*
    - drivers/staging/wlags49_h2/wl_cs.c
    due to dev_info_t and whitespace changes

    Linus Torvalds
     

31 Jul, 2010

1 commit

  • ac8b42283   pcmcia: remove cs_types.h ... Browse Code »

    Remove cs_types.h which is no longer needed: Most definitions aren't
    used at all, a few can be made away with, and two remaining definitions
    (typedefs, unfortunatley) may be moved to more specific places.

    CC: linux-ide@vger.kernel.org
    CC: linux-usb@vger.kernel.org
    CC: laforge@gnumonks.org
    CC: linux-mtd@lists.infradead.org
    CC: alsa-devel@alsa-project.org
    CC: linux-serial@vger.kernel.org
    Acked-by: Marcel Holtmann (for drivers/bluetooth/)
    Acked-by: David S. Miller
    Signed-off-by: Dominik Brodowski

    Dominik Brodowski
     

13 Jul, 2010

1 commit

30 Mar, 2010

1 commit

  • 5a0e3ad6a   include cleanup: Update gfp.h and slab.h includes to prepare for breaking implic… ... Browse Code »

    …it slab.h inclusion from percpu.h

    percpu.h is included by sched.h and module.h and thus ends up being
    included when building most .c files. percpu.h includes slab.h which
    in turn includes gfp.h making everything defined by the two files
    universally available and complicating inclusion dependencies.

    percpu.h -> slab.h dependency is about to be removed. Prepare for
    this change by updating users of gfp and slab facilities include those
    headers directly instead of assuming availability. As this conversion
    needs to touch large number of source files, the following script is
    used as the basis of conversion.

    http://userweb.kernel.org/~tj/misc/slabh-sweep.py

    The script does the followings.

    * Scan files for gfp and slab usages and update includes such that
    only the necessary includes are there. ie. if only gfp is used,
    gfp.h, if slab is used, slab.h.

    * When the script inserts a new include, it looks at the include
    blocks and try to put the new include such that its order conforms
    to its surrounding. It's put in the include block which contains
    core kernel includes, in the same order that the rest are ordered -
    alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
    doesn't seem to be any matching order.

    * If the script can't find a place to put a new include (mostly
    because the file doesn't have fitting include block), it prints out
    an error message indicating which .h file needs to be added to the
    file.

    The conversion was done in the following steps.

    1. The initial automatic conversion of all .c files updated slightly
    over 4000 files, deleting around 700 includes and adding ~480 gfp.h
    and ~3000 slab.h inclusions. The script emitted errors for ~400
    files.

    2. Each error was manually checked. Some didn't need the inclusion,
    some needed manual addition while adding it to implementation .h or
    embedding .c file was more appropriate for others. This step added
    inclusions to around 150 files.

    3. The script was run again and the output was compared to the edits
    from #2 to make sure no file was left behind.

    4. Several build tests were done and a couple of problems were fixed.
    e.g. lib/decompress_*.c used malloc/free() wrappers around slab
    APIs requiring slab.h to be added manually.

    5. The script was run on all .h files but without automatically
    editing them as sprinkling gfp.h and slab.h inclusions around .h
    files could easily lead to inclusion dependency hell. Most gfp.h
    inclusion directives were ignored as stuff from gfp.h was usually
    wildly available and often used in preprocessor macros. Each
    slab.h inclusion directive was examined and added manually as
    necessary.

    6. percpu.h was updated not to include slab.h.

    7. Build test were done on the following configurations and failures
    were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
    distributed build env didn't work with gcov compiles) and a few
    more options had to be turned off depending on archs to make things
    build (like ipr on powerpc/64 which failed due to missing writeq).

    * x86 and x86_64 UP and SMP allmodconfig and a custom test config.
    * powerpc and powerpc64 SMP allmodconfig
    * sparc and sparc64 SMP allmodconfig
    * ia64 SMP allmodconfig
    * s390 SMP allmodconfig
    * alpha SMP allmodconfig
    * um on x86_64 SMP allmodconfig

    8. percpu.h modifications were reverted so that it could be applied as
    a separate patch and serve as bisection point.

    Given the fact that I had only a couple of failures from tests on step
    6, I'm fairly confident about the coverage of this conversion patch.
    If there is a breakage, it's likely to be something in one of the arch
    headers which should be easily discoverable easily on most builds of
    the specific arch.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>

    Tejun Heo
     

24 Mar, 2010

1 commit

  • d7646f763   pcmcia: use dev_pm_ops for class pcmcia_socket_class ... Browse Code »

    Instead of requiring PCMCIA socket drivers to call various functions
    during their (bus) resume and suspend functions, register an own
    dev_pm_ops for this class. This fixes several suspend/resume bugs
    seen on db1xxx-ss, and probably on some other socket drivers, too.

    With regard to the asymmetry with only _noirq suspend, but split up
    resume, please see bug 14334 and commit 9905d1b411946fb3 .

    Signed-off-by: Dominik Brodowski

    Dominik Brodowski
     

17 Dec, 2009

1 commit

  • a7a5ac58d   PCMCIA: fix pxa2xx_lubbock modular build error ... Browse Code »

    Commit d0d26c33b63c7ec10c3fdf9c7ce0aa035f0b3200 broke the driver by
    propagating a pointer to the platform_device where a pointer to the
    generic device was expected, leading to a spectacular crash...

    Signed-off-by: Marc Zyngier
    Acked-by: Dominik Brodowski
    Acked-by: Eric Miao
    Signed-off-by: Russell King

    Marc Zyngier
     

16 Dec, 2009

1 commit

14 Dec, 2009

1 commit

13 Dec, 2009

1 commit

12 Dec, 2009

1 commit

  • d0d26c33b   PCMCIA: fix pxa2xx_lubbock modular build error ... Browse Code »

    ERROR: "pxa2xx_drv_pcmcia_ops" [drivers/pcmcia/pxa2xx_lubbock_cs.ko] undefined!
    ERROR: "pxa2xx_drv_pcmcia_add_one" [drivers/pcmcia/pxa2xx_lubbock_cs.ko] undefined!

    We also remove __pxa2xx_drv_pcmcia_probe and its export, since this is
    no longer required.

    Signed-off-by: Russell King

    Russell King
     

09 Nov, 2009

5 commits

29 Sep, 2009

1 commit

10 Sep, 2009

1 commit

28 Mar, 2009

1 commit

09 Mar, 2009

2 commits

14 Oct, 2008

1 commit

  • 2be4ff2f0   Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (49 commits)
    pcmcia: ioctl-internal definitions
    pcmcia: cistpl header cleanup
    pcmcia: remove unused argument to pcmcia_parse_tuple()
    pcmcia: card services header cleanup
    pcmcia: device_id header cleanup
    pcmcia: encapsulate ioaddr_t
    pcmcia: cleanup device driver header file
    pcmcia: cleanup socket services header file
    pcmcia: merge ds_internal.h into cs_internal.h
    pcmcia: cleanup cs_internal.h
    pcmcia: cs_internal.h is internal
    pcmcia: use dev_printk for cs_error()
    pcmcia: remove CS_ error codes alltogether
    pcmcia: deprecate CS_BAD_TUPLE
    pcmcia: deprecate CS_BAD_ARGS
    pcmcia: deprecate CS_BAD_BASE, CS_BAD_IRQ, CS_BAD_OFFSET and CS_BAD_SIZE
    pcmcia: deprecate CS_BAD_ATTRIBUTE, CS_BAD_TYPE and CS_BAD_PAGE
    pcmcia: deprecate CS_NO_MORE_ITEMS
    pcmcia: deprecate CS_IN_USE
    pcmcia: deprecate CS_CONFIGURATION_LOCKED
    ...

    Fix trivial conflict in drivers/pcmcia/ds.c manually

    Linus Torvalds
     

09 Sep, 2008

1 commit

  • 20f18ff32   Add support for the Arcom/Eurotech Viper SBC CompactFlash card slot ... Browse Code »

    The Arcom/Eurotech Viper needs some extra care to run. On this board,
    the PC104 connector is actually wired to the second PCMCIA slot.
    Therefore, this second socket needs to be enabled, despite not being
    managed by the PCMCIA code.

    I'd rather have the MECR setup in the platform support code so I could,
    for example, use the PC104 bus without having the PCMCIA module loaded.

    Signed-off-by: Marc Zyngier

    Marc Zyngier
     

26 Aug, 2008

1 commit

07 Aug, 2008

2 commits

24 Jun, 2008

1 commit

  • ae49ec925   pcmcia: remove unused bulkmem.h ... Browse Code »

    The code in include/pcmcia/bulkmem.h was only kept for compatibility reasons.
    Therefore, move the remaining region_info_t definition to ds.h

    [linux@dominikbrodowski.net: do not modify the IOCTL, move definition to
    ds.h, and update changelog]
    Signed-off-by: Magnus Damm
    Signed-off-by: Dominik Brodowski

    Magnus Damm
     

16 Apr, 2008

1 commit

  • 12c2c019e   pcmcia: fix platform driver hotplug/coldplug ... Browse Code »

    Since 43cc71eed1250755986da4c0f9898f9a635cb3bf, the platform modalias is
    prefixed with "platform:". Add MODULE_ALIAS() to the hotpluggable PCMCIA
    platform drivers, to re-enable auto loading.

    [dbrownell@users.sourceforge.net: registration fixes]
    Signed-off-by: Kay Sievers
    Signed-off-by: David Brownell
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Kay Sievers
     

26 Jan, 2008

1 commit

17 Oct, 2007

1 commit

  • 24d6572b4   pxa2xx PCMCIA timing issue on iPAQ H5550 ... Browse Code »

    Recently I've been trying to get working PCMCIA interface on H5000 ipaq
    series, using dual PCMCIA sleeve. So far things work correctly, but I had
    to do one modification to drivers/pcmcia/pxa2xx_base.c to get the interface
    working with orinoco gold PCMCIA card (wired pcnet_cs ethernet card worked
    even without this modification).

    The issue has something to do with assert time on PCMCIA bus, but I'm not
    really sure what -- I found the working value just by trial&error approach.
    I'm not sure how is the assert value in pxa2xx_mcxx_asst calculated (I
    know, simple formula, but the reason why is it calculated that way is not
    obvious for me), neither that my modification is correct. It just works
    with iPAQ.

    Cc: Russell King
    Cc: Richard Purdie
    Cc: Dominik Brodowski
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Milan Plzik
     

29 Oct, 2006

1 commit

  • 9468613b2   [ARM] Fix suspend oops caused by PXA2xx PCMCIA driver ... Browse Code »

    The PXA2xx PCMCIA driver was registering a device_driver with the
    platform_bus_type. Unfortunately, this causes data outside the
    device_driver structure to be dereferenced as if it were a
    platform_driver structure, causing an oops. Convert the PXA2xx
    core driver to use the proper platform_driver structure.

    Signed-off-by: Russell King

    Russell King
     

01 Jul, 2006

1 commit

30 Oct, 2005

1 commit

29 Oct, 2005

1 commit

  • 9480e307c   [PATCH] DRIVER MODEL: Get rid of the obsolete tri-level suspend/resume callbacks ... Browse Code »

    In PM v1, all devices were called at SUSPEND_DISABLE level. Then
    all devices were called at SUSPEND_SAVE_STATE level, and finally
    SUSPEND_POWER_DOWN level. However, with PM v2, to maintain
    compatibility for platform devices, I arranged for the PM v2
    suspend/resume callbacks to call the old PM v1 suspend/resume
    callbacks three times with each level in order so that existing
    drivers continued to work.

    Since this is obsolete infrastructure which is no longer necessary,
    we can remove it. Here's an (untested) patch to do exactly that.

    Signed-off-by: Russell King
    Signed-off-by: Greg Kroah-Hartman

    Russell King
     

04 Sep, 2005

1 commit

17 Apr, 2005

2 commits

  • 8bf28030f   [PATCH] fix u32 vs. pm_message_t in pcmcia ... Browse Code »

    This fixes u32 vs. pm_message_t in pcmcia.

    Signed-off-by: Pavel Machek
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Pavel Machek
     
  • 1da177e4c   Linux-2.6.12-rc2 ... Browse Code »

    Initial git repository build. I'm not bothering with the full history,
    even though we have it. We can create a separate "historical" git
    archive of that later if we want to, and in the meantime it's about
    3.2GB when imported into git - space that would just make the early
    git days unnecessarily complicated, when we don't have a lot of good
    infrastructure for it.

    Let it rip!

    Linus Torvalds