diff mbox series

[v2,1/1] mtd: intel-spi: Add Intel Lewisburg PCH SPI super SKU PCI ID

Message ID 77788f0c0cf55ee9fc0087364827da28c6951180.1509315023.git.sathyanarayanan.kuppuswamy@linux.intel.com
State Accepted
Delegated to: Cyrille Pitchen
Headers show
Series [v2,1/1] mtd: intel-spi: Add Intel Lewisburg PCH SPI super SKU PCI ID | expand

Commit Message

Kuppuswamy Sathyanarayanan Oct. 29, 2017, 10:17 p.m. UTC 
From: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>

This patch adds Intel Lewisburg PCH SPI serial flash controller super
SKU PCI ID.

Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
---
 drivers/mtd/spi-nor/intel-spi-pci.c | 1 +
 1 file changed, 1 insertion(+)

Changes since v1:
 * Rebased on top of Mika's SPI support patch.
 * Fixed the commit header to reflect the changes made.

Comments

Mika Westerberg Oct. 30, 2017, 7:32 a.m. UTC | #1 
On Sun, Oct 29, 2017 at 03:17:35PM -0700, sathyanarayanan.kuppuswamy@linux.intel.com wrote:
> From: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
> 
> This patch adds Intel Lewisburg PCH SPI serial flash controller super
> SKU PCI ID.
> 
> Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>

Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Cyrille Pitchen Oct. 30, 2017, 10:58 a.m. UTC | #2 
Le 30/10/2017 à 08:32, Mika Westerberg a écrit :
> On Sun, Oct 29, 2017 at 03:17:35PM -0700, sathyanarayanan.kuppuswamy@linux.intel.com wrote:
>> From: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
>>
>> This patch adds Intel Lewisburg PCH SPI serial flash controller super
>> SKU PCI ID.
>>
>> Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
> 
> Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
> 

Applied to the spi-nor/next branch of l2-mtd

Just for info, this patch didn't apply directly, it misses a line in the list of
PCI IDS:

 	{ PCI_VDEVICE(INTEL, 0x18e0), (unsigned long)&bxt_info },

Best regards,

Cyrille
Andy Shevchenko Oct. 30, 2017, 2:16 p.m. UTC | #3 
On Mon, Oct 30, 2017 at 12:58 PM, Cyrille Pitchen
<cyrille.pitchen@wedev4u.fr> wrote:
> Le 30/10/2017 à 08:32, Mika Westerberg a écrit :
>> On Sun, Oct 29, 2017 at 03:17:35PM -0700, sathyanarayanan.kuppuswamy@linux.intel.com wrote:

> Just for info, this patch didn't apply directly, it misses a line in the list of
> PCI IDS:
>
>         { PCI_VDEVICE(INTEL, 0x18e0), (unsigned long)&bxt_info },

Just in case, you might use
git am -C1 which will ignore such context mistake.
Though it requires to look at the result to be sure it's correct.
Kuppuswamy Sathyanarayanan Oct. 30, 2017, 10:28 p.m. UTC | #4 
Hi,


On 10/30/2017 03:58 AM, Cyrille Pitchen wrote:
> Applied to the spi-nor/next branch of l2-mtd
>
> Just for info, this patch didn't apply directly, it misses a line in the list of
> PCI IDS:
>
>   	{ PCI_VDEVICE(INTEL, 0x18e0), (unsigned long)&bxt_info },
I re-based my patch on top of Mika's SPI support patch. And it applied 
cleanly on top of 4.14-rc6 kernel. Not sure where the problem was?

http://git.infradead.org/l2-mtd.git/commitdiff/d92b0f18a2039ff736b4296ad3cf3d505512051e
Mika Westerberg Oct. 31, 2017, 7:48 a.m. UTC | #5 
On Mon, Oct 30, 2017 at 03:28:46PM -0700, sathyanarayanan kuppuswamy wrote:
> Hi,
> 
> 
> On 10/30/2017 03:58 AM, Cyrille Pitchen wrote:
> > Applied to the spi-nor/next branch of l2-mtd
> > 
> > Just for info, this patch didn't apply directly, it misses a line in the list of
> > PCI IDS:
> > 
> >   	{ PCI_VDEVICE(INTEL, 0x18e0), (unsigned long)&bxt_info },
> I re-based my patch on top of Mika's SPI support patch. And it applied
> cleanly on top of 4.14-rc6 kernel. Not sure where the problem was?
> 
> http://git.infradead.org/l2-mtd.git/commitdiff/d92b0f18a2039ff736b4296ad3cf3d505512051e

There is another patch adding Cedar Fork PCI ID in the l2-mtd tree. You
rebased only on top of Lewisburg patch so you missed that. Anyway,
Cyrille applied this patch already so everything should be fine :-)
diff mbox series

Patch

diff --git a/drivers/mtd/spi-nor/intel-spi-pci.c b/drivers/mtd/spi-nor/intel-spi-pci.c
index 7fa5b81..048c007 100644
--- a/drivers/mtd/spi-nor/intel-spi-pci.c
+++ b/drivers/mtd/spi-nor/intel-spi-pci.c
@@ -65,6 +65,7 @@  static void intel_spi_pci_remove(struct pci_dev *pdev)
 static const struct pci_device_id intel_spi_pci_ids[] = {
 	{ PCI_VDEVICE(INTEL, 0x19e0), (unsigned long)&bxt_info },
 	{ PCI_VDEVICE(INTEL, 0xa1a4), (unsigned long)&bxt_info },
+	{ PCI_VDEVICE(INTEL, 0xa224), (unsigned long)&bxt_info },
 	{ },
 };
 MODULE_DEVICE_TABLE(pci, intel_spi_pci_ids);