summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBarna Csorogi2017-04-17 02:46:50 +0200
committerBarna Csorogi2017-04-17 02:46:50 +0200
commit2f9c7e92761c3205938c8d69a2c327d16b8cd495 (patch)
tree392dfa750daa341cacd5aaf274b8d6f1b48c5d82
parent63c5b41dbbd3e762bba7c284438e5ba368b4d1d6 (diff)
downloadaur-2f9c7e92761c3205938c8d69a2c327d16b8cd495.tar.gz
alter irq patch to include Asus C301SA
-rw-r--r--cherryview-pinctrl.diff17
1 files changed, 13 insertions, 4 deletions
diff --git a/cherryview-pinctrl.diff b/cherryview-pinctrl.diff
index 716584bcb3da..623ff410bf35 100644
--- a/cherryview-pinctrl.diff
+++ b/cherryview-pinctrl.diff
@@ -1,5 +1,5 @@
diff --git a/drivers/pinctrl/intel/pinctrl-cherryview.c b/drivers/pinctrl/intel/pinctrl-cherryview.c
-index f80134e3e0b6..9ff790174906 100644
+index 5e66860a5..5aaf1cff9 100644
--- a/drivers/pinctrl/intel/pinctrl-cherryview.c
+++ b/drivers/pinctrl/intel/pinctrl-cherryview.c
@@ -13,6 +13,7 @@
@@ -10,7 +10,7 @@ index f80134e3e0b6..9ff790174906 100644
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
-@@ -1524,10 +1525,31 @@ static void chv_gpio_irq_handler(struct irq_desc *desc)
+@@ -1524,10 +1525,40 @@ static void chv_gpio_irq_handler(struct irq_desc *desc)
chained_irq_exit(chip, desc);
}
@@ -31,6 +31,15 @@ index f80134e3e0b6..9ff790174906 100644
+ DMI_MATCH(DMI_PRODUCT_NAME, "Edgar"),
+ DMI_MATCH(DMI_BIOS_DATE, "05/21/2016"),
+ },
++ },
++ {
++ /* See https://bugzilla.kernel.org/show_bug.cgi?id=194945 */
++ .ident = "Asus C301SA",
++ .matches = {
++ DMI_MATCH(DMI_SYS_VENDOR, "GOOGLE"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "Terra"),
++ DMI_MATCH(DMI_BIOS_DATE, "05/26/2016"),
++ },
+ }
+};
+
@@ -42,7 +51,7 @@ index f80134e3e0b6..9ff790174906 100644
int ret, i, offset;
*chip = chv_gpio_chip;
-@@ -1536,7 +1558,7 @@ static int chv_gpio_probe(struct chv_pinctrl *pctrl, int irq)
+@@ -1536,7 +1567,7 @@ static int chv_gpio_probe(struct chv_pinctrl *pctrl, int irq)
chip->label = dev_name(pctrl->dev);
chip->parent = pctrl->dev;
chip->base = -1;
@@ -51,7 +60,7 @@ index f80134e3e0b6..9ff790174906 100644
ret = devm_gpiochip_add_data(pctrl->dev, chip, pctrl);
if (ret) {
-@@ -1567,7 +1589,7 @@ static int chv_gpio_probe(struct chv_pinctrl *pctrl, int irq)
+@@ -1567,7 +1598,7 @@ static int chv_gpio_probe(struct chv_pinctrl *pctrl, int irq)
intsel &= CHV_PADCTRL0_INTSEL_MASK;
intsel >>= CHV_PADCTRL0_INTSEL_SHIFT;