* [PATCH] i2c: designware: Add device HID for future AMD I2C controller
@ 2016-03-10 11:34 Xiangliang Yu
2016-03-10 8:32 ` Jarkko Nikula
0 siblings, 1 reply; 4+ messages in thread
From: Xiangliang Yu @ 2016-03-10 11:34 UTC (permalink / raw)
To: rjw, lenb, andriy.shevchenko, jarkko.nikula, mika.westerberg, wsa
Cc: linux-acpi, linux-kernel, linux-i2c, SPG_Linux_Kernel,
Xiangliang Yu
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 <Xiangliang.Yu@amd.com>
---
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 },
{ }
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] i2c: designware: Add device HID for future AMD I2C controller
2016-03-10 11:34 [PATCH] i2c: designware: Add device HID for future AMD I2C controller Xiangliang Yu
@ 2016-03-10 8:32 ` Jarkko Nikula
2016-03-10 22:48 ` Rafael J. Wysocki
2016-03-12 16:03 ` Wolfram Sang
0 siblings, 2 replies; 4+ messages in thread
From: Jarkko Nikula @ 2016-03-10 8:32 UTC (permalink / raw)
To: Xiangliang Yu, rjw, lenb, andriy.shevchenko, mika.westerberg, wsa
Cc: linux-acpi, linux-kernel, linux-i2c, SPG_Linux_Kernel
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 <Xiangliang.Yu@amd.com>
> ---
> 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 <jarkko.nikula@linux.intel.com>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] i2c: designware: Add device HID for future AMD I2C controller
2016-03-10 8:32 ` Jarkko Nikula
@ 2016-03-10 22:48 ` Rafael J. Wysocki
2016-03-12 16:03 ` Wolfram Sang
1 sibling, 0 replies; 4+ messages in thread
From: Rafael J. Wysocki @ 2016-03-10 22:48 UTC (permalink / raw)
To: Jarkko Nikula
Cc: Xiangliang Yu, lenb, andriy.shevchenko, mika.westerberg, wsa,
linux-acpi, linux-kernel, linux-i2c, SPG_Linux_Kernel
On Thursday, March 10, 2016 10:32:04 AM Jarkko Nikula wrote:
> 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 <Xiangliang.Yu@amd.com>
> > ---
> > 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 <jarkko.nikula@linux.intel.com>
OK, queued up for 4.6, thanks!
Rafael
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] i2c: designware: Add device HID for future AMD I2C controller
2016-03-10 8:32 ` Jarkko Nikula
2016-03-10 22:48 ` Rafael J. Wysocki
@ 2016-03-12 16:03 ` Wolfram Sang
1 sibling, 0 replies; 4+ messages in thread
From: Wolfram Sang @ 2016-03-12 16:03 UTC (permalink / raw)
To: Jarkko Nikula
Cc: Xiangliang Yu, rjw, lenb, andriy.shevchenko, mika.westerberg,
linux-acpi, linux-kernel, linux-i2c, SPG_Linux_Kernel
[-- Attachment #1: Type: text/plain, Size: 1866 bytes --]
On Thu, Mar 10, 2016 at 10:32:04AM +0200, Jarkko Nikula wrote:
> 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 <Xiangliang.Yu@amd.com>
> >---
> > 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.
I would have preferred seperate patches, too.
> For i2c-designware:
> Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
For the record:
Acked-by: Wolfram Sang <wsa@the-dreams.de>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-03-12 16:03 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-10 11:34 [PATCH] i2c: designware: Add device HID for future AMD I2C controller Xiangliang Yu
2016-03-10 8:32 ` Jarkko Nikula
2016-03-10 22:48 ` Rafael J. Wysocki
2016-03-12 16:03 ` Wolfram Sang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).