Merge remote-tracking branches 'asoc/fix/max98371', 'asoc/fix/nau8825', 'asoc/fix...

[cascardo/linux.git] / drivers / pinctrl / pinctrl-amd.c

diff --git a/drivers/pinctrl/pinctrl-amd.c b/drivers/pinctrl/pinctrl-amd.c
index 5c025f5..b3e7723 100644 (file)
--- a/drivers/pinctrl/pinctrl-amd.c
+++ b/drivers/pinctrl/pinctrl-amd.c
@@ -43,17 +43,6 @@ static int amd_gpio_direction_input(struct gpio_chip *gc, unsigned offset)
 
        spin_lock_irqsave(&gpio_dev->lock, flags);
        pin_reg = readl(gpio_dev->base + offset * 4);
-       /*
-        * Suppose BIOS or Bootloader sets specific debounce for the
-        * GPIO. if not, set debounce to be  2.75ms and remove glitch.
-       */
-       if ((pin_reg & DB_TMR_OUT_MASK) == 0) {
-               pin_reg |= 0xf;
-               pin_reg |= BIT(DB_TMR_OUT_UNIT_OFF);
-               pin_reg |= DB_TYPE_REMOVE_GLITCH << DB_CNTRL_OFF;
-               pin_reg &= ~BIT(DB_TMR_LARGE_OFF);
-       }
-
        pin_reg &= ~BIT(OUTPUT_ENABLE_OFF);
        writel(pin_reg, gpio_dev->base + offset * 4);
        spin_unlock_irqrestore(&gpio_dev->lock, flags);
@@ -326,15 +315,6 @@ static void amd_gpio_irq_enable(struct irq_data *d)
 
        spin_lock_irqsave(&gpio_dev->lock, flags);
        pin_reg = readl(gpio_dev->base + (d->hwirq)*4);
-       /*
-               Suppose BIOS or Bootloader sets specific debounce for the
-               GPIO. if not, set debounce to be  2.75ms.
-       */
-       if ((pin_reg & DB_TMR_OUT_MASK) == 0) {
-               pin_reg |= 0xf;
-               pin_reg |= BIT(DB_TMR_OUT_UNIT_OFF);
-               pin_reg &= ~BIT(DB_TMR_LARGE_OFF);
-       }
        pin_reg |= BIT(INTERRUPT_ENABLE_OFF);
        pin_reg |= BIT(INTERRUPT_MASK_OFF);
        writel(pin_reg, gpio_dev->base + (d->hwirq)*4);
@@ -580,7 +560,7 @@ static const struct pinctrl_ops amd_pinctrl_ops = {
        .get_group_pins         = amd_get_group_pins,
 #ifdef CONFIG_OF
        .dt_node_to_map         = pinconf_generic_dt_node_to_map_group,
-       .dt_free_map            = pinctrl_utils_dt_free_map,
+       .dt_free_map            = pinctrl_utils_free_map,
 #endif
 };
 
@@ -783,8 +763,8 @@ static int amd_gpio_probe(struct platform_device *pdev)
        gpio_dev->ngroups = ARRAY_SIZE(kerncz_groups);
 
        amd_pinctrl_desc.name = dev_name(&pdev->dev);
-       gpio_dev->pctrl = pinctrl_register(&amd_pinctrl_desc,
-                                       &pdev->dev, gpio_dev);
+       gpio_dev->pctrl = devm_pinctrl_register(&pdev->dev, &amd_pinctrl_desc,
+                                               gpio_dev);
        if (IS_ERR(gpio_dev->pctrl)) {
                dev_err(&pdev->dev, "Couldn't register pinctrl driver\n");
                return PTR_ERR(gpio_dev->pctrl);
@@ -792,7 +772,7 @@ static int amd_gpio_probe(struct platform_device *pdev)
 
        ret = gpiochip_add_data(&gpio_dev->gc, gpio_dev);
        if (ret)
-               goto out1;
+               return ret;
 
        ret = gpiochip_add_pin_range(&gpio_dev->gc, dev_name(&pdev->dev),
                                0, 0, TOTAL_NUMBER_OF_PINS);
@@ -825,8 +805,6 @@ static int amd_gpio_probe(struct platform_device *pdev)
 out2:
        gpiochip_remove(&gpio_dev->gc);
 
-out1:
-       pinctrl_unregister(gpio_dev->pctrl);
        return ret;
 }
 
@@ -837,13 +815,13 @@ static int amd_gpio_remove(struct platform_device *pdev)
        gpio_dev = platform_get_drvdata(pdev);
 
        gpiochip_remove(&gpio_dev->gc);
-       pinctrl_unregister(gpio_dev->pctrl);
 
        return 0;
 }
 
 static const struct acpi_device_id amd_gpio_acpi_match[] = {
        { "AMD0030", 0 },
+       { "AMDI0030", 0},
        { },
 };
 MODULE_DEVICE_TABLE(acpi, amd_gpio_acpi_match);