Message ID | 20211203092609.8502-1-Richard_Hsu@asmedia.com.tw |
---|---|
State | New |
Headers | show |
Series | gpio Add my driver new id | expand |
On Fri, Dec 3, 2021 at 10:26 AM Richard Hsu <saraon640529@gmail.com> wrote: > > drivers/gpio/gpio-amdpt.c | 12 ++++++++++-- > 1 files changed, 11 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpio/gpio-amdpt.c b/drivers/gpio/gpio-amdpt.c > index bbf53e289141..4d01d4341a67 100644 > --- a/drivers/gpio/gpio-amdpt.c > +++ b/drivers/gpio/gpio-amdpt.c > @@ -14,6 +14,7 @@ > #include <linux/platform_device.h> > > #define PT_TOTAL_GPIO 8 > +#define PT_TOTAL_GPIO_EX 24 > > /* PCI-E MMIO register offsets */ > #define PT_DIRECTION_REG 0x00 > @@ -72,10 +73,12 @@ static void pt_gpio_free(struct gpio_chip *gc, unsigned offset) > static int pt_gpio_probe(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > + struct acpi_device *acpi_dev; > + acpi_handle handle = ACPI_HANDLE(dev); > struct pt_gpio_chip *pt_gpio; > int ret = 0; > > - if (!ACPI_COMPANION(dev)) { > + if (acpi_bus_get_device(handle, &acpi_dev)) { > dev_err(dev, "PT GPIO device node not found\n"); > return -ENODEV; > } > @@ -100,10 +103,14 @@ static int pt_gpio_probe(struct platform_device *pdev) > return ret; > } > > + if (!strncmp(acpi_dev_name(acpi_dev), "AMDIF031", 8)) > + pt_gpio->gc.ngpio = PT_TOTAL_GPIO_EX; > + else > + pt_gpio->gc.ngpio = PT_TOTAL_GPIO; > + > pt_gpio->gc.owner = THIS_MODULE; > pt_gpio->gc.request = pt_gpio_request; > pt_gpio->gc.free = pt_gpio_free; > - pt_gpio->gc.ngpio = PT_TOTAL_GPIO; > #if defined(CONFIG_OF_GPIO) > pt_gpio->gc.of_node = dev->of_node; > #endif > @@ -135,6 +142,7 @@ static int pt_gpio_remove(struct platform_device *pdev) > static const struct acpi_device_id pt_gpio_acpi_match[] = { > { "AMDF030", 0 }, > { "AMDIF030", 0 }, > + { "AMDIF031", 0 }, > { }, > }; > MODULE_DEVICE_TABLE(acpi, pt_gpio_acpi_match); > -- > 2.30.2 > Hi Richard, Please Cc Andy next time on any GPIO stuff related to ACPI. I'll let him comment on the code. Your commit message must be more descriptive - the title should say "gpio: <driver name>: <do this and that>". Please also add a commit message explaining what the code does in detail. Bart
On Fri, Dec 03, 2021 at 11:15:46AM +0100, Bartosz Golaszewski wrote: > On Fri, Dec 3, 2021 at 10:26 AM Richard Hsu <saraon640529@gmail.com> wrote: Thanks, Bart, for pointing out to this. > > #define PT_TOTAL_GPIO 8 > > +#define PT_TOTAL_GPIO_EX 24 ... > > + struct acpi_device *acpi_dev; > > + acpi_handle handle = ACPI_HANDLE(dev); > > - if (!ACPI_COMPANION(dev)) { > > + if (acpi_bus_get_device(handle, &acpi_dev)) { What you are doing here is open coding the ACPI_COMPANION(). But see below. ... > > + if (!strncmp(acpi_dev_name(acpi_dev), "AMDIF031", 8)) > > + pt_gpio->gc.ngpio = PT_TOTAL_GPIO_EX; > > + else > > + pt_gpio->gc.ngpio = PT_TOTAL_GPIO; Instead of doing this... > > static const struct acpi_device_id pt_gpio_acpi_match[] = { > > { "AMDF030", 0 }, > > { "AMDIF030", 0 }, > > + { "AMDIF031", 0 }, Just use .driver_data here and if needed in the other ID tables and then simply retrieve it (w/o any conditions) in the code above: pt_gpio->gc.ngpio = (uintptr_t)device_get_match_data(dev); > > { }, > > }; > Please Cc Andy next time on any GPIO stuff related to ACPI. I'll let > him comment on the code. Your commit message must be more descriptive > - the title should say "gpio: <driver name>: <do this and that>". > Please also add a commit message explaining what the code does in > detail.
Hi Andy & Bartosz! Sorry for the late reply. New acpi device AMDIF031 have 24 gpio pins and older AMDF030/AMDIF030 have 8 gpio pins, I use acpi_bus_get_device() that check acpi device and gain acpi_dev info to replace the original. Then we check and compare device name from acpi_dev_name(acpi_dev). If AMDIF031(pt_gpio->gc.ngpio = 24) or AMDF030/AMDIF030 (pt_gpio->gc.ngpio = 8). I will try to use .driver_data, and add commit messages on title and code that explain what the code does in detail later Thanks Richard > > #define PT_TOTAL_GPIO 8 > > +#define PT_TOTAL_GPIO_EX 24 ... > > + struct acpi_device *acpi_dev; > > + acpi_handle handle = ACPI_HANDLE(dev); > > - if (!ACPI_COMPANION(dev)) { > > + if (acpi_bus_get_device(handle, &acpi_dev)) { What you are doing here is open coding the ACPI_COMPANION(). But see below. ... > > + if (!strncmp(acpi_dev_name(acpi_dev), "AMDIF031", 8)) > > + pt_gpio->gc.ngpio = PT_TOTAL_GPIO_EX; > > + else > > + pt_gpio->gc.ngpio = PT_TOTAL_GPIO; Instead of doing this... > > static const struct acpi_device_id pt_gpio_acpi_match[] = { > > { "AMDF030", 0 }, > > { "AMDIF030", 0 }, > > + { "AMDIF031", 0 }, -----Original Message----- From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Sent: Saturday, December 4, 2021 5:21 AM To: Bartosz Golaszewski <brgl@bgdev.pl> Cc: Richard Hsu <saraon640529@gmail.com>; Linus Walleij <linus.walleij@linaro.org>; Richard Hsu(許育彰) <Richard_Hsu@asmedia.com.tw>; open list:GPIO SUBSYSTEM <linux-gpio@vger.kernel.org>; Linux Kernel Mailing List <linux-kernel@vger.kernel.org>; Yd Tseng(曾裕達) <Yd_Tseng@asmedia.com.tw>; Cindy1 Hsu(許凱茵) <Cindy1_Hsu@asmedia.com.tw>; Andrew Su(蘇俊源) <Andrew_Su@asmedia.com.tw> Subject: Re: [PATCH] gpio Add my driver new id On Fri, Dec 03, 2021 at 11:15:46AM +0100, Bartosz Golaszewski wrote: > On Fri, Dec 3, 2021 at 10:26 AM Richard Hsu <saraon640529@gmail.com> wrote: Thanks, Bart, for pointing out to this. > > #define PT_TOTAL_GPIO 8 > > +#define PT_TOTAL_GPIO_EX 24 ... > > + struct acpi_device *acpi_dev; > > + acpi_handle handle = ACPI_HANDLE(dev); > > - if (!ACPI_COMPANION(dev)) { > > + if (acpi_bus_get_device(handle, &acpi_dev)) { What you are doing here is open coding the ACPI_COMPANION(). But see below. ... > > + if (!strncmp(acpi_dev_name(acpi_dev), "AMDIF031", 8)) > > + pt_gpio->gc.ngpio = PT_TOTAL_GPIO_EX; > > + else > > + pt_gpio->gc.ngpio = PT_TOTAL_GPIO; Instead of doing this... > > static const struct acpi_device_id pt_gpio_acpi_match[] = { > > { "AMDF030", 0 }, > > { "AMDIF030", 0 }, > > + { "AMDIF031", 0 }, Just use .driver_data here and if needed in the other ID tables and then simply retrieve it (w/o any conditions) in the code above: pt_gpio->gc.ngpio = (uintptr_t)device_get_match_data(dev); > > { }, > > }; > Please Cc Andy next time on any GPIO stuff related to ACPI. I'll let > him comment on the code. Your commit message must be more descriptive > - the title should say "gpio: <driver name>: <do this and that>". > Please also add a commit message explaining what the code does in > detail. -- With Best Regards, Andy Shevchenko <p></p>
diff --git a/drivers/gpio/gpio-amdpt.c b/drivers/gpio/gpio-amdpt.c index bbf53e289141..4d01d4341a67 100644 --- a/drivers/gpio/gpio-amdpt.c +++ b/drivers/gpio/gpio-amdpt.c @@ -14,6 +14,7 @@ #include <linux/platform_device.h> #define PT_TOTAL_GPIO 8 +#define PT_TOTAL_GPIO_EX 24 /* PCI-E MMIO register offsets */ #define PT_DIRECTION_REG 0x00 @@ -72,10 +73,12 @@ static void pt_gpio_free(struct gpio_chip *gc, unsigned offset) static int pt_gpio_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; + struct acpi_device *acpi_dev; + acpi_handle handle = ACPI_HANDLE(dev); struct pt_gpio_chip *pt_gpio; int ret = 0; - if (!ACPI_COMPANION(dev)) { + if (acpi_bus_get_device(handle, &acpi_dev)) { dev_err(dev, "PT GPIO device node not found\n"); return -ENODEV; } @@ -100,10 +103,14 @@ static int pt_gpio_probe(struct platform_device *pdev) return ret; } + if (!strncmp(acpi_dev_name(acpi_dev), "AMDIF031", 8)) + pt_gpio->gc.ngpio = PT_TOTAL_GPIO_EX; + else + pt_gpio->gc.ngpio = PT_TOTAL_GPIO; + pt_gpio->gc.owner = THIS_MODULE; pt_gpio->gc.request = pt_gpio_request; pt_gpio->gc.free = pt_gpio_free; - pt_gpio->gc.ngpio = PT_TOTAL_GPIO; #if defined(CONFIG_OF_GPIO) pt_gpio->gc.of_node = dev->of_node; #endif @@ -135,6 +142,7 @@ static int pt_gpio_remove(struct platform_device *pdev) static const struct acpi_device_id pt_gpio_acpi_match[] = { { "AMDF030", 0 }, { "AMDIF030", 0 }, + { "AMDIF031", 0 }, { }, }; MODULE_DEVICE_TABLE(acpi, pt_gpio_acpi_match);