On Thu, Oct 24, 2019 at 11:57:21PM +0200, Hans de Goede wrote:
> So far on Bay Trail (BYT) we only have been adding a device_link adding
> the iGPU (LNXVIDEO) device as consumer for the I2C controller for the
> PMIC for I2C5, but the PMIC only uses I2C5 on BYT CR (cost reduced) on
> regular BYT platforms I2C7 is used and we were not adding the device_link
> sometimes causing resume ordering issues.
>
> This commit adds LNXVIDEO -> BYT I2C7 to the lpss_device_links table,
> fixing this.
Reviewed-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Couple of nits below.
>
> Cc: stable@xxxxxxxxxxxxxxx
> Fixes: 2d71ee0ce72f ("ACPI / LPSS: Add a device link from the GPU to the BYT I2C5 controller")
> Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
> ---
> Changes in v2:
> -Add Fixes: tag
>
> Changes in v3:
> -Point Fixes tag to a more apropriate commit
> ---
> drivers/acpi/acpi_lpss.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
> index 60bbc5090abe..e7a4504f0fbf 100644
> --- a/drivers/acpi/acpi_lpss.c
> +++ b/drivers/acpi/acpi_lpss.c
> @@ -473,9 +473,14 @@ struct lpss_device_links {
> * the supplier is not enumerated until after the consumer is probed.
> */
> static const struct lpss_device_links lpss_device_links[] = {
> + /* CHT External sdcard slot controller depends on PMIC I2C ctrl */
sdcard -> SD card
> {"808622C1", "7", "80860F14", "3", DL_FLAG_PM_RUNTIME},
> + /* CHT iGPU depends on PMIC I2C controller */
> {"808622C1", "7", "LNXVIDEO", NULL, DL_FLAG_PM_RUNTIME},
> + /* BYT CR iGPU depends on PMIC I2C controller (UID 5 on CR) */
> {"80860F41", "5", "LNXVIDEO", NULL, DL_FLAG_PM_RUNTIME},
> + /* BYT iGPU depends on PMIC I2C controller (UID 7 on non CR) */
non CR -> non-CR
> + {"80860F41", "7", "LNXVIDEO", NULL, DL_FLAG_PM_RUNTIME},
> };
>
> static bool hid_uid_match(struct acpi_device *adev,
> --
> 2.23.0
>
--
With Best Regards,
Andy Shevchenko
