[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAHp75VfS=YRVpJKme1XWw=VJcaBBcnr8DjwT-WNvk3yspZnnkQ@mail.gmail.com>
Date: Thu, 26 Jan 2017 04:04:31 +0200
From: Andy Shevchenko <andy.shevchenko@...il.com>
To: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
Cc: "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
Mika Westerberg <mika.westerberg@...ux.intel.com>,
Lee Jones <lee.jones@...aro.org>,
Tan Jui Nee <jui.nee.tan@...el.com>
Subject: Re: [PATCH v1 1/2] mfd: lpc_ich: Add Device IDs for Intel Apollo Lake PCH
On Wed, Jan 25, 2017 at 10:18 PM, Andy Shevchenko
<andriy.shevchenko@...ux.intel.com> wrote:
> Adding Intel codename Apollo Lake platform device IDs for PCH.
>
Ah, now this is in conflict with Mika's SPI-NOR patchset.
It's strange I have no such conflict locally. Seems linux-next missed
that series / tree somehow.
> Signed-off-by: Tan Jui Nee <jui.nee.tan@...el.com>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
> ---
> drivers/mfd/lpc_ich.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/drivers/mfd/lpc_ich.c b/drivers/mfd/lpc_ich.c
> index 1ef7575547e6..262ddd9330b7 100644
> --- a/drivers/mfd/lpc_ich.c
> +++ b/drivers/mfd/lpc_ich.c
> @@ -216,6 +216,7 @@ enum lpc_chipsets {
> LPC_BRASWELL, /* Braswell SoC */
> LPC_LEWISBURG, /* Lewisburg */
> LPC_9S, /* 9 Series */
> + LPC_APL, /* Apollo Lake SoC */
> };
>
> static struct lpc_ich_info lpc_chipset_info[] = {
> @@ -533,6 +534,10 @@ static struct lpc_ich_info lpc_chipset_info[] = {
> .iTCO_version = 2,
> .gpio_version = ICH_V5_GPIO,
> },
> + [LPC_APL] = {
> + .name = "Apollo Lake SoC",
> + .iTCO_version = 5,
> + },
> };
>
> /*
> @@ -681,6 +686,7 @@ static const struct pci_device_id lpc_ich_ids[] = {
> { PCI_VDEVICE(INTEL, 0x3b14), LPC_3420},
> { PCI_VDEVICE(INTEL, 0x3b16), LPC_3450},
> { PCI_VDEVICE(INTEL, 0x5031), LPC_EP80579},
> + { PCI_VDEVICE(INTEL, 0x5ae8), LPC_APL},
> { PCI_VDEVICE(INTEL, 0x8c40), LPC_LPT},
> { PCI_VDEVICE(INTEL, 0x8c41), LPC_LPT},
> { PCI_VDEVICE(INTEL, 0x8c42), LPC_LPT},
> --
> 2.11.0
>
--
With Best Regards,
Andy Shevchenko
Powered by blists - more mailing lists