linux-next: manual merge of the gpio-intel-fixes tree with the gpio-brgl-fixes tree

[Mark Brown <broonie@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 2109 bytes --]

Hi all,

Today's linux-next merge of the gpio-intel-fixes tree got a conflict in:

  drivers/gpio/gpiolib-acpi-quirks.c

between commit:

  5a088d1b72662 ("gpiolib: acpi: Ignore GPIO 11 interrupt on Acer Nitro 16S AI")

from the gpio-brgl-fixes tree and commit:

  6da1f3437435c ("gpiolib: acpi: Ignore GPIO 11 interrupt on Acer Nitro V 16S AI")

from the gpio-intel-fixes tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/gpio/gpiolib-acpi-quirks.c
index c1ce4700e2a4d,dbfd82056c3e0..0000000000000
--- a/drivers/gpio/gpiolib-acpi-quirks.c
+++ b/drivers/gpio/gpiolib-acpi-quirks.c
@@@ -343,20 -343,22 +343,36 @@@ static const struct dmi_system_id gpiol
  			.ignore_interrupt = "AMDI0030:00@11",
  		},
  	},
 +	{
 +		/*
 +		 * Same camera power enable on GPIO 11 as the Acer Nitro V 16S AI
 +		 * above. It also powers the internal microphones.
 +		 * Found in BIOS V1.53
 +		 */
 +		.matches = {
 +			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
 +			DMI_MATCH(DMI_PRODUCT_FAMILY, "Acer Nitro 16S AI"),
 +		},
 +		.driver_data = &(struct acpi_gpiolib_dmi_quirk) {
 +			.ignore_interrupt = "AMDI0030:00@11",
 +		},
 +	},
+ 	{
+ 		/*
+ 		 * GPIO 11 is the power enable of the internal USB camera.
+ 		 * The firmware drives it high but also lists it in _AEI with
+ 		 * an empty handler. Requesting it as an input turns the camera
+ 		 * off, so it never enumerates.
+ 		 * Found in BIOS V1.14
+ 		 */
+ 		.matches = {
+ 			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+ 			DMI_MATCH(DMI_PRODUCT_FAMILY, "Acer Nitro V 16S AI"),
+ 		},
+ 		.driver_data = &(struct acpi_gpiolib_dmi_quirk) {
+ 			.ignore_interrupt = "AMDI0030:00@11",
+ 		},
+ 	},
  	{
  		/*
  		 * Wakeup only works when keyboard backlight is turned off

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]