Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp3435302imu; Sun, 11 Nov 2018 15:03:07 -0800 (PST) X-Google-Smtp-Source: AJdET5cxY4DDJCgdIScuv2DzCCuz8ZfyOEmDXwCsDS8Ga0CtUm40p2d9poqEeO9W3JtS9KfXQq1F X-Received: by 2002:a17:902:5ac6:: with SMTP id g6-v6mr1805063plm.212.1541977387002; Sun, 11 Nov 2018 15:03:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541977386; cv=none; d=google.com; s=arc-20160816; b=d5wEnstwsML682Vh6vYMFaEwaRIYqASYlzYA/Hzza8mhkUPxajIXfWZNYDN6tvOvEo LRjh+KgGsvFQwSm4xOCe4XybU4oY/TVvPee0547w/R6NvLdx6wt9psakTavv0UJ+O/6i H/erphdN0RLHITfJM5g6ql2RyLCTaKG4zgNDfCApMNLKB9qBzaifhXKejAVo6pG/y2lV WCF1V+k07IrBcr1IskSezL8J16hDSZTs3hJjuSIjxeI1kN78WggVW0jgYqKKAys45SAs Vj2AS0jUpaKWdPvLtt5N7GFBo4SIOsYqinDm6396BkLI/xMFSVTvYwnT0gH/E9rCaDO2 ddFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=IRFl2k1sBekHb0tBs6dgtz9J42TTY+QSlvgep4+QbYA=; b=j0gqnNo0PDVKha06EOIJW2T28cgNswVj6vLjmQGbdtOqwNcbpBoi7fLSi6EYB2mYi+ gpotw1B1N109HJNEYKZHRDWAw4rZ1hHOfnmdFBPePNPrKpBddt/A3Txw6K6iB/cfiW3o or+6F8RNEE3jxbJwU3AgHsS7XiBoEiQ9uaAp+Pblg+2fWSiBp+VRlSpG8P16+mi7N9j5 CR+G2+yEfh3u/P9SwaXVzFYgyXIPmKboFhEJjowVz7UNrpcCl9KZMBaal5q+B8GbcDDb 9TWTjaIEqEcB43TbSrPZlDyUtLoqh9oZENbMziIxPG04tU/cmci87uaj7nT9nnDQ6MVV oCNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=oHdiQBtu; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a6-v6si13595289pgc.578.2018.11.11.15.02.51; Sun, 11 Nov 2018 15:03:06 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=oHdiQBtu; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390903AbeKLIvY (ORCPT + 99 others); Mon, 12 Nov 2018 03:51:24 -0500 Received: from mail.kernel.org ([198.145.29.99]:52752 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390669AbeKLIWb (ORCPT ); Mon, 12 Nov 2018 03:22:31 -0500 Received: from localhost (unknown [206.108.79.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E4F112241B; Sun, 11 Nov 2018 22:32:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1541975554; bh=fbwTREHeaR4JjaQHbg0lPJCPIlQaqBN9ySgUBolpQTI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oHdiQBtutnQpOYiPsjPBbfsbomiuNp5uvoZ6uQnHqnGgK1tj/Ea0Tu7Atk5OH1vB/ Oi06fNf2N424L09REvgwSbnzJhwq+GF9LFKbGw4GcPeixP5W98fe6QCIhnVOO4qgGe H5VjqQwgHvP+u0S8ONuDNXMefu7zP0AwaDafqknY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hans de Goede , Andy Shevchenko , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 4.14 067/222] ACPI / LPSS: Add alternative ACPI HIDs for Cherry Trail DMA controllers Date: Sun, 11 Nov 2018 14:22:44 -0800 Message-Id: <20181111221653.928930048@linuxfoundation.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181111221647.665769131@linuxfoundation.org> References: <20181111221647.665769131@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Hans de Goede [ Upstream commit 240714061c58e6b1abfb3322398a7634151c06cb ] Bay and Cherry Trail DSTDs represent a different set of devices depending on which OS the device think it is booting. One set of decices for Windows and another set of devices for Android which targets the Android-x86 Linux kernel fork (which e.g. used to have its own display driver instead of using the i915 driver). Which set of devices we are actually going to get is out of our control, this is controlled by the ACPI OSID variable, which gets either set through an EFI setup option, or sometimes is autodetected. So we need to support both. This commit adds support for the 80862286 and 808622C0 ACPI HIDs which we get for the first resp. second DMA controller on Cherry Trail devices when OSID is set to Android. Signed-off-by: Hans de Goede Reviewed-by: Andy Shevchenko Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/acpi/acpi_lpss.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/acpi/acpi_lpss.c +++ b/drivers/acpi/acpi_lpss.c @@ -326,9 +326,11 @@ static const struct acpi_device_id acpi_ { "INT33FC", }, /* Braswell LPSS devices */ + { "80862286", LPSS_ADDR(lpss_dma_desc) }, { "80862288", LPSS_ADDR(bsw_pwm_dev_desc) }, { "8086228A", LPSS_ADDR(bsw_uart_dev_desc) }, { "8086228E", LPSS_ADDR(bsw_spi_dev_desc) }, + { "808622C0", LPSS_ADDR(lpss_dma_desc) }, { "808622C1", LPSS_ADDR(bsw_i2c_dev_desc) }, /* Broadwell LPSS devices */