Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934163AbcCJIcN (ORCPT ); Thu, 10 Mar 2016 03:32:13 -0500 Received: from mga03.intel.com ([134.134.136.65]:62409 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750902AbcCJIcJ (ORCPT ); Thu, 10 Mar 2016 03:32:09 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,314,1455004800"; d="scan'208";a="761498306" Subject: Re: [PATCH] i2c: designware: Add device HID for future AMD I2C controller To: Xiangliang Yu , rjw@rjwysocki.net, lenb@kernel.org, andriy.shevchenko@linux.intel.com, mika.westerberg@linux.intel.com, wsa@the-dreams.de References: <1457609692-25903-1-git-send-email-Xiangliang.Yu@amd.com> Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org, SPG_Linux_Kernel@amd.com From: Jarkko Nikula Message-ID: <56E13104.8050307@linux.intel.com> Date: Thu, 10 Mar 2016 10:32:04 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Icedove/38.6.0 MIME-Version: 1.0 In-Reply-To: <1457609692-25903-1-git-send-email-Xiangliang.Yu@amd.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1648 Lines: 41 On 03/10/2016 01:34 PM, Xiangliang Yu wrote: > Add device HID AMDI0010 to match the AMD ACPI Vendor ID (AMDI) that > was registered in http://www.uefi.org/acpi_id_list, and the I2C > controller on future AMD paltform will use the HID instead of AMD0010. > > Signed-off-by: Xiangliang Yu > --- > drivers/acpi/acpi_apd.c | 1 + > drivers/i2c/busses/i2c-designware-platdrv.c | 1 + > 2 files changed, 2 insertions(+) > > diff --git a/drivers/acpi/acpi_apd.c b/drivers/acpi/acpi_apd.c > index d507cf6..d0aad06 100644 > --- a/drivers/acpi/acpi_apd.c > +++ b/drivers/acpi/acpi_apd.c > @@ -143,6 +143,7 @@ static const struct acpi_device_id acpi_apd_device_ids[] = { > /* Generic apd devices */ > #ifdef CONFIG_X86_AMD_PLATFORM_DEVICE > { "AMD0010", APD_ADDR(cz_i2c_desc) }, > + { "AMDI0010", APD_ADDR(cz_i2c_desc) }, > { "AMD0020", APD_ADDR(cz_uart_desc) }, > { "AMD0030", }, > #endif > diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c > index 438f1b4..d656657 100644 > --- a/drivers/i2c/busses/i2c-designware-platdrv.c > +++ b/drivers/i2c/busses/i2c-designware-platdrv.c > @@ -123,6 +123,7 @@ static const struct acpi_device_id dw_i2c_acpi_match[] = { > { "80860F41", 0 }, > { "808622C1", 0 }, > { "AMD0010", ACCESS_INTR_MASK }, > + { "AMDI0010", ACCESS_INTR_MASK }, > { "AMDI0510", 0 }, > { "APMC0D0F", 0 }, > { } > -- I guess these changes don't necessarily need to go together? Although I think chances to get a conflict is pretty low. For i2c-designware: Acked-by: Jarkko Nikula