On Wed, Jan 25, 2017 at 10:18 PM, Andy Shevchenko
<andriy.shevche...@linux.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....@intel.com>
> Signed-off-by: Andy Shevchenko <andriy.shevche...@linux.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

Reply via email to