lkml.org 
[lkml]   [2007]   [May]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] different values for OHCI_QUIRK_ZFMICRO
    On Thu, 29 Mar 2007 15:24:00 -0700 David Brownell wrote:

    > On Thursday 29 March 2007 3:06 pm, Randy Dunlap wrote:
    > > On Tue, 20 Feb 2007 01:06:54 +0100 Adrian Bunk wrote:
    > >
    > > > On Sun, Jan 14, 2007 at 06:36:10AM -0800, David Brownell wrote:
    > > > > On Sunday 14 January 2007 1:10 am, Adrian Bunk wrote:
    > > > > > <-- snip -->
    > > > >
    > > > > Waiting for Tony to submit bugfixes to his driver...
    > > >
    > > > Still unfixed as of 2.6.20-mm1.
    > >
    > > so is there a patch around for this yet?
    > >
    > > or shall someone other than Tony (??) make one?
    >
    > ISTR posting the appended patch back in January; it's been
    > refreshed since then. Presumably it still works.
    >
    > - Dave

    Oh, Greg, can we get this merged some day soon, please?
    David posted this patch on 2007-FEB-08.


    From: David Brownell <dbrownell@users.sourceforge.net>

    Partial fix for bogosity in the ftdi-elan and u13-hcd drivers ... these
    have no business including with the internals of other drivers, much less
    doing so in a broken way!!

    Updated for 2.6.21-git10.

    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    ---
    drivers/usb/host/u132-hcd.c | 12 +++++++-----
    drivers/usb/misc/ftdi-elan.c | 12 ++++++++----
    2 files changed, 15 insertions(+), 9 deletions(-)

    --- linux-2.6.21-git10.orig/drivers/usb/host/u132-hcd.c
    +++ linux-2.6.21-git10/drivers/usb/host/u132-hcd.c
    @@ -57,6 +57,13 @@
    #include <asm/system.h>
    #include <asm/byteorder.h>
    #include "../core/hcd.h"
    +
    + /* FIXME ohci.h is ONLY for internal use by the OHCI driver.
    + * If you're going to try crap like this, you need to split
    + * out the common stuff (register declarations?) into a
    + * sharable file, maybe name <linux/usb/ohci.h>
    + */
    +
    #include "ohci.h"
    #define OHCI_CONTROL_INIT OHCI_CTRL_CBSR
    #define OHCI_INTR_INIT (OHCI_INTR_MIE | OHCI_INTR_UE | OHCI_INTR_RD | \
    @@ -173,11 +180,6 @@ struct u132_ring {
    struct u132_endp *curr_endp;
    struct delayed_work scheduler;
    };
    -#define OHCI_QUIRK_AMD756 0x01
    -#define OHCI_QUIRK_SUPERIO 0x02
    -#define OHCI_QUIRK_INITRESET 0x04
    -#define OHCI_BIG_ENDIAN 0x08
    -#define OHCI_QUIRK_ZFMICRO 0x10
    struct u132 {
    struct kref kref;
    struct list_head u132_list;
    --- linux-2.6.21-git10.orig/drivers/usb/misc/ftdi-elan.c
    +++ linux-2.6.21-git10/drivers/usb/misc/ftdi-elan.c
    @@ -73,6 +73,13 @@ static struct list_head ftdi_static_list
    #include "usb_u132.h"
    #include <asm/io.h>
    #include "../core/hcd.h"
    +
    + /* FIXME ohci.h is ONLY for internal use by the OHCI driver.
    + * If you're going to try crap like this, you need to split
    + * out the common stuff (register declarations?) into a
    + * sharable file, maybe name <linux/usb/ohci.h>
    + */
    +
    #include "../host/ohci.h"
    /* Define these values to match your devices*/
    #define USB_FTDI_ELAN_VENDOR_ID 0x0403
    @@ -2300,10 +2307,7 @@ static int ftdi_elan_checkingPCI(struct
    offsetof(struct ohci_regs, member), 0, data);
    #define ftdi_write_pcimem(ftdi, member, data) ftdi_elan_write_pcimem(ftdi, \
    offsetof(struct ohci_regs, member), 0, data);
    -#define OHCI_QUIRK_AMD756 0x01
    -#define OHCI_QUIRK_SUPERIO 0x02
    -#define OHCI_QUIRK_INITRESET 0x04
    -#define OHCI_BIG_ENDIAN 0x08
    +
    #define OHCI_CONTROL_INIT OHCI_CTRL_CBSR
    #define OHCI_INTR_INIT (OHCI_INTR_MIE | OHCI_INTR_UE | OHCI_INTR_RD | \
    OHCI_INTR_WDH)
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-05-09 00:15    [W:0.043 / U:30.640 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site