lkml.org 
[lkml]   [2008]   [Jun]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 3/4] SM501: GPIO dynamic registration for PCI devices
    From: Arnaud Patard <apatard@mandriva.com>

    The SM501 PCI card requires a dyanmic gpio allocation as
    the number of cards is not known at compile time. Fixup
    the platform data and registration to deal with this.

    Acked-by: Ben Dooks <ben-linux@fluff.org>
    Signed-off-by: Arnaud Patard <apatard@mandriva.com>

    Index: linux-2.6.26-rc6-quilt3/drivers/mfd/sm501.c
    ===================================================================
    --- linux-2.6.26-rc6-quilt3.orig/drivers/mfd/sm501.c 2008-06-20 16:34:02.000000000 +0100
    +++ linux-2.6.26-rc6-quilt3/drivers/mfd/sm501.c 2008-06-20 16:35:11.000000000 +0100
    @@ -996,12 +996,13 @@ static int __devinit sm501_gpio_register
    {
    struct sm501_platdata *pdata = sm->platdata;
    struct gpio_chip *gchip = &chip->gpio;
    - unsigned base = pdata->gpio_base;
    + int base = pdata->gpio_base;

    memcpy(chip, &gpio_chip_template, sizeof(struct gpio_chip));

    if (chip == &gpio->high) {
    - base += 32;
    + if (base > 0)
    + base += 32;
    chip->regbase = gpio->regs + SM501_GPIO_DATA_HIGH;
    gchip->label = "SM501-HIGH";
    } else {
    @@ -1452,6 +1453,7 @@ static struct sm501_platdata_fb sm501_fb
    static struct sm501_platdata sm501_pci_platdata = {
    .init = &sm501_pci_initdata,
    .fb = &sm501_fb_pdata,
    + .gpio_base = -1,
    };

    static int sm501_pci_probe(struct pci_dev *dev,
    Index: linux-2.6.26-rc6-quilt3/include/linux/sm501.h
    ===================================================================
    --- linux-2.6.26-rc6-quilt3.orig/include/linux/sm501.h 2008-06-20 16:34:02.000000000 +0100
    +++ linux-2.6.26-rc6-quilt3/include/linux/sm501.h 2008-06-20 16:35:11.000000000 +0100
    @@ -156,7 +156,7 @@ struct sm501_platdata {
    struct sm501_platdata_fb *fb;

    int flags;
    - unsigned gpio_base;
    + int gpio_base;

    int (*get_power)(struct device *dev);
    int (*set_power)(struct device *dev, unsigned int on);
    --
    Ben (ben@fluff.org, http://www.fluff.org/)

    'a smiley only costs 4 bytes'


    \
     
     \ /
      Last update: 2008-06-22 23:19    [W:0.020 / U:3.964 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site