diff options
| author | Barna Csorogi | 2017-04-30 11:15:08 +0200 |
|---|---|---|
| committer | Barna Csorogi | 2017-04-30 11:15:08 +0200 |
| commit | 51ded71f80afcd62057db9db11945717c456e293 (patch) | |
| tree | 9ab5731c71fcd27dd467c6e5c33cec231493844d | |
| parent | ec30f155f5db1acbfc1be9dd25783d5244dca40a (diff) | |
| download | aur-51ded71f80afcd62057db9db11945717c456e293.tar.gz | |
update pinctrl-cherryview patch
Should now work for all Intel Strago boards
| -rw-r--r-- | cherryview-pinctrl.diff | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/cherryview-pinctrl.diff b/cherryview-pinctrl.diff index e1c45ea905d1..04bc7429b227 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 5e66860a5..4c20e9200 100644 +index 5e66860a5..3db36726c 100644 --- a/drivers/pinctrl/intel/pinctrl-cherryview.c +++ b/drivers/pinctrl/intel/pinctrl-cherryview.c @@ -13,6 +13,7 @@ @@ -10,7 +10,7 @@ index 5e66860a5..4c20e9200 100644 #include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h> -@@ -1524,10 +1525,49 @@ static void chv_gpio_irq_handler(struct irq_desc *desc) +@@ -1524,10 +1525,37 @@ static void chv_gpio_irq_handler(struct irq_desc *desc) chained_irq_exit(chip, desc); } @@ -23,31 +23,19 @@ index 5e66860a5..4c20e9200 100644 + * is not listed below. + */ +static const struct dmi_system_id chv_no_valid_mask[] = { ++ /* See https://bugzilla.kernel.org/show_bug.cgi?id=194945 */ + { -+ /* See https://bugzilla.kernel.org/show_bug.cgi?id=194945 */ -+ .ident = "Acer Chromebook (CYAN)", ++ .ident = "Intel_Strago based Chromebooks", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "GOOGLE"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "Edgar"), -+ DMI_MATCH(DMI_BIOS_DATE, "05/21/2016"), ++ DMI_MATCH(DMI_PRODUCT_FAMILY, "Intel_Strago"), + }, + }, + { -+ /* 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"), -+ }, -+ }, -+ { -+ /* See https://bugzilla.kernel.org/show_bug.cgi?id=194945 */ + .ident = "Samsung Chromebook 3 (CELES)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "GOOGLE"), + DMI_MATCH(DMI_PRODUCT_NAME, "Celes"), -+ DMI_MATCH(DMI_BIOS_DATE, "01/19/2017"), + }, + } +}; @@ -60,7 +48,7 @@ index 5e66860a5..4c20e9200 100644 int ret, i, offset; *chip = chv_gpio_chip; -@@ -1536,7 +1576,7 @@ static int chv_gpio_probe(struct chv_pinctrl *pctrl, int irq) +@@ -1536,7 +1564,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; @@ -69,7 +57,7 @@ index 5e66860a5..4c20e9200 100644 ret = devm_gpiochip_add_data(pctrl->dev, chip, pctrl); if (ret) { -@@ -1567,7 +1607,7 @@ static int chv_gpio_probe(struct chv_pinctrl *pctrl, int irq) +@@ -1567,7 +1595,7 @@ static int chv_gpio_probe(struct chv_pinctrl *pctrl, int irq) intsel &= CHV_PADCTRL0_INTSEL_MASK; intsel >>= CHV_PADCTRL0_INTSEL_SHIFT; |