Merge branches 'acpi-utils', 'acpi-video', 'acpi-soc' and 'acpi-button'

* acpi-utils:
  gpio: merrifield: Fix build err without CONFIG_ACPI
  ACPI / utils: Remove deprecated function since no user left
  ASoC: Intel: cht_bsw_rt5672: Convert to use acpi_dev_get_first_match_dev()
  ASoC: Intel: cht_bsw_rt5645: Convert to use acpi_dev_get_first_match_dev()
  ASoC: Intel: bytcr_rt5651: Convert to use acpi_dev_get_first_match_dev()
  ASoC: Intel: bytcr_rt5640: Convert to use acpi_dev_get_first_match_dev()
  ASoC: Intel: bytcht_es8316: Convert to use acpi_dev_get_first_match_dev()
  ASoC: Intel: bytcht_da7213: Convert to use acpi_dev_get_first_match_dev()
  gpio: merrifield: Convert to use acpi_dev_get_first_match_dev()
  extcon: axp288: Convert to use acpi_dev_get_first_match_dev()
  ACPI / utils: Introduce acpi_dev_get_first_match_dev() helper

* acpi-video:
  ACPI: video: Use vendor backlight on Sony VPCEH3U1E

* acpi-soc:
  ACPI / LPSS: Use acpi_lpss_* instead of acpi_subsys_* functions for hibernate

* acpi-button:
  ACPI: button: reinitialize button state upon resume

diff --combined drivers/acpi/video_detect.c
index cc2888930fe97991d3a7bcadee5ff044ac5dfcf2,43587ac680e472afe6ac5cbb0bbbfa3b0c9f93e7,0e0a3929e34e25112f0822bf70244962195598e7,43587ac680e472afe6ac5cbb0bbbfa3b0c9f93e7,43587ac680e472afe6ac5cbb0bbbfa3b0c9f93e7..31014c7d3793906be9ee4eeba48c48f199a7f57d
--- 1/drivers/acpi/video_detect.c
--- 2/drivers/acpi/video_detect.c
--- 3/drivers/acpi/video_detect.c
--- 4/drivers/acpi/video_detect.c
--- 5/drivers/acpi/video_detect.c
+++ b/drivers/acpi/video_detect.c
@@@@@@ -112,7 -112,7 -112,7 -112,7 -112,7 +112,7 @@@@@@ static int video_detect_force_none(cons
     static const struct dmi_system_id video_detect_dmi_table[] = {
        /* On Samsung X360, the BIOS will set a flag (VDRV) if generic
         * ACPI backlight device is used. This flag will definitively break
 ----    * the backlight interface (even the vendor interface) untill next
 ++++    * the backlight interface (even the vendor interface) until next
         * reboot. It's why we should prevent video.ko from being used here
         * and we can't rely on a later call to acpi_video_unregister().
         */
@@@@@@ -141,6 -141,6 -141,14 -141,6 -141,6 +141,14 @@@@@@
                DMI_MATCH(DMI_PRODUCT_NAME, "UL30A"),
                },
        },
++ ++   {
++ ++   .callback = video_detect_force_vendor,
++ ++   .ident = "Sony VPCEH3U1E",
++ ++   .matches = {
++ ++           DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
++ ++           DMI_MATCH(DMI_PRODUCT_NAME, "VPCEH3U1E"),
++ ++           },
++ ++   },
     
        /*
         * These models have a working acpi_video backlight control, and using