[kernel] r14933 - in dists/trunk/linux-2.6/debian: . patches/features/all patches/features/arm patches/features/powerpc patches/series
Ben Hutchings
benh at alioth.debian.org
Sun Jan 10 17:47:03 UTC 2010
Author: benh
Date: Sun Jan 10 17:47:00 2010
New Revision: 14933
Log:
Add new hardware ids to various drivers, as included in 2.6.33-rc3
Added:
dists/trunk/linux-2.6/debian/patches/features/all/SCSI-mpt2sas-New-device-SAS2208-support-is-added.patch
dists/trunk/linux-2.6/debian/patches/features/all/ar9170-Add-support-for-D-Link-DWA-160-A2.patc
dists/trunk/linux-2.6/debian/patches/features/all/be2net-Add-support-for-next-generation-of-BladeEngine.patch
dists/trunk/linux-2.6/debian/patches/features/all/be2net-Add-the-new-PCI-IDs-to-PCI_DEVICE_TABLE.patch
dists/trunk/linux-2.6/debian/patches/features/arm/davinci-dm646x-Add-support-for-3.x-silicon-revision.patch
dists/trunk/linux-2.6/debian/patches/features/powerpc/
dists/trunk/linux-2.6/debian/patches/features/powerpc/fsl-Add-PCI-device-ids-for-new-QoirQ-chips.patch
dists/trunk/linux-2.6/debian/patches/series/6
Modified:
dists/trunk/linux-2.6/debian/changelog
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog Sun Jan 10 15:04:21 2010 (r14932)
+++ dists/trunk/linux-2.6/debian/changelog Sun Jan 10 17:47:00 2010 (r14933)
@@ -1,3 +1,14 @@
+linux-2.6 (2.6.32-6) UNRELEASED; urgency=low
+
+ [ Ben Hutchings ]
+ * be2net: Add device ids for ServerEngines BladeEngine3
+ * mpt2sas: Add device ids for LSI SAS2208
+ * ar9170: Add device id for D-Link DWA 160 A2
+ * powerpc/fsl: Add device ids for new QoirQ chips
+ * arm/dm646x: Add hardware id for DM6467 rev 3.x
+
+ -- Ben Hutchings <ben at decadent.org.uk> Sun, 10 Jan 2010 17:38:50 +0000
+
linux-2.6 (2.6.32-5) unstable; urgency=low
[ Ben Hutchings ]
Added: dists/trunk/linux-2.6/debian/patches/features/all/SCSI-mpt2sas-New-device-SAS2208-support-is-added.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/SCSI-mpt2sas-New-device-SAS2208-support-is-added.patch Sun Jan 10 17:47:00 2010 (r14933)
@@ -0,0 +1,71 @@
+From db27136a89d061bf9dceb28953a61a8ef862ca7f Mon Sep 17 00:00:00 2001
+From: Kashyap, Desai <kashyap.desai at lsi.com>
+Date: Wed, 23 Sep 2009 17:24:27 +0530
+Subject: [PATCH] [SCSI] mpt2sas: New device SAS2208 support is added
+
+Added device ids range for { 0x80 - 87 } , modified mpi/mpi2_cnfg.h containing
+MPI2_MFGPAGE_DEVID_SAS2208_X.
+
+Signed-off-by: Kashyap Desai <kashyap.desai at lsi.com>
+Signed-off-by: Eric Moore <Eric.moore at lsi.com>
+Signed-off-by: James Bottomley <James.Bottomley at suse.de>
+---
+ drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h | 8 ++++++++
+ drivers/scsi/mpt2sas/mpt2sas_scsih.c | 18 ++++++++++++++++++
+ 2 files changed, 26 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h b/drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h
+index ab47c46..5af66db 100644
+--- a/drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h
++++ b/drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h
+@@ -348,6 +348,14 @@ typedef struct _MPI2_CONFIG_REPLY
+ #define MPI2_MFGPAGE_DEVID_SAS2108_3 (0x0077)
+ #define MPI2_MFGPAGE_DEVID_SAS2116_1 (0x0064)
+ #define MPI2_MFGPAGE_DEVID_SAS2116_2 (0x0065)
++#define MPI2_MFGPAGE_DEVID_SAS2208_1 (0x0080)
++#define MPI2_MFGPAGE_DEVID_SAS2208_2 (0x0081)
++#define MPI2_MFGPAGE_DEVID_SAS2208_3 (0x0082)
++#define MPI2_MFGPAGE_DEVID_SAS2208_4 (0x0083)
++#define MPI2_MFGPAGE_DEVID_SAS2208_5 (0x0084)
++#define MPI2_MFGPAGE_DEVID_SAS2208_6 (0x0085)
++#define MPI2_MFGPAGE_DEVID_SAS2208_7 (0x0086)
++#define MPI2_MFGPAGE_DEVID_SAS2208_8 (0x0087)
+
+
+ /* Manufacturing Page 0 */
+diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
+index efb6270..91d6115 100644
+--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
++++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
+@@ -196,10 +196,28 @@ static struct pci_device_id scsih_pci_table[] = {
+ PCI_ANY_ID, PCI_ANY_ID },
+ { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2108_3,
+ PCI_ANY_ID, PCI_ANY_ID },
++ /* Meteor ~ 2116 */
+ { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2116_1,
+ PCI_ANY_ID, PCI_ANY_ID },
+ { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2116_2,
+ PCI_ANY_ID, PCI_ANY_ID },
++ /* Thunderbolt ~ 2208 */
++ { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_1,
++ PCI_ANY_ID, PCI_ANY_ID },
++ { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_2,
++ PCI_ANY_ID, PCI_ANY_ID },
++ { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_3,
++ PCI_ANY_ID, PCI_ANY_ID },
++ { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_4,
++ PCI_ANY_ID, PCI_ANY_ID },
++ { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_5,
++ PCI_ANY_ID, PCI_ANY_ID },
++ { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_6,
++ PCI_ANY_ID, PCI_ANY_ID },
++ { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_7,
++ PCI_ANY_ID, PCI_ANY_ID },
++ { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_8,
++ PCI_ANY_ID, PCI_ANY_ID },
+ {0} /* Terminating entry */
+ };
+ MODULE_DEVICE_TABLE(pci, scsih_pci_table);
+--
+1.6.5.7
+
Added: dists/trunk/linux-2.6/debian/patches/features/all/ar9170-Add-support-for-D-Link-DWA-160-A2.patc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/ar9170-Add-support-for-D-Link-DWA-160-A2.patc Sun Jan 10 17:47:00 2010 (r14933)
@@ -0,0 +1,41 @@
+From 15295380f45aa0d35665f6e5596ac98c081d95b9 Mon Sep 17 00:00:00 2001
+From: Thomas Klute <thomas2.klute at uni-dortmund.de>
+Date: Tue, 17 Nov 2009 11:58:18 +0100
+Subject: [PATCH] ar9170: Add support for D-Link DWA 160 A2
+
+At least two revisions of the D-Link DWA 160 exist, called A1 and A2. A1
+(USB-ID 07d1:3c10) is already listed in usb.c as D-Link DWA 160A. A2
+(USB-ID 07d1:3a09) works if added to ar9170_usb_ids. I didn't do much
+testing until now, but I was able to connect to APs using WPA or WEP and
+transmit data.
+
+Summary:
+
+* Add model revision number to the comment for D-Link DWA 160 A1 (07d1:3c10)
+* Add support for D-Link DWA 160 A2 (07d1:3a09)
+
+Signed-off-by: Thomas Klute <thomas2.klute at uni-dortmund.de>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+---
+ drivers/net/wireless/ath/ar9170/usb.c | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/net/wireless/ath/ar9170/usb.c b/drivers/net/wireless/ath/ar9170/usb.c
+index 6bdcdf6..e0799d9 100644
+--- a/drivers/net/wireless/ath/ar9170/usb.c
++++ b/drivers/net/wireless/ath/ar9170/usb.c
+@@ -68,8 +68,10 @@ static struct usb_device_id ar9170_usb_ids[] = {
+ { USB_DEVICE(0x0cf3, 0x1002) },
+ /* Cace Airpcap NX */
+ { USB_DEVICE(0xcace, 0x0300) },
+- /* D-Link DWA 160A */
++ /* D-Link DWA 160 A1 */
+ { USB_DEVICE(0x07d1, 0x3c10) },
++ /* D-Link DWA 160 A2 */
++ { USB_DEVICE(0x07d1, 0x3a09) },
+ /* Netgear WNDA3100 */
+ { USB_DEVICE(0x0846, 0x9010) },
+ /* Netgear WN111 v2 */
+--
+1.6.5.7
+
Added: dists/trunk/linux-2.6/debian/patches/features/all/be2net-Add-support-for-next-generation-of-BladeEngine.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/be2net-Add-support-for-next-generation-of-BladeEngine.patch Sun Jan 10 17:47:00 2010 (r14933)
@@ -0,0 +1,54 @@
+From 12d7ea2c5a5c87834daf9fcd920aab80ff6248b1 Mon Sep 17 00:00:00 2001
+From: Ajit Khaparde <ajitk at serverengines.com>
+Date: Fri, 16 Oct 2009 18:02:12 -0700
+Subject: [PATCH] be2net: Add support for next generation of BladeEngine device.
+
+Add new PCI ids to support next generation of BladeEngine device.
+
+Signed-off-by: Ajit Khaparde <ajitk at serverengines.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ drivers/net/benet/be.h | 15 +++++++++++++--
+ 1 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/benet/be.h b/drivers/net/benet/be.h
+index 4b61a91..ce75631 100644
+--- a/drivers/net/benet/be.h
++++ b/drivers/net/benet/be.h
+@@ -35,20 +35,31 @@
+ #define DRV_VER "2.101.205"
+ #define DRV_NAME "be2net"
+ #define BE_NAME "ServerEngines BladeEngine2 10Gbps NIC"
++#define BE3_NAME "ServerEngines BladeEngine3 10Gbps NIC"
+ #define OC_NAME "Emulex OneConnect 10Gbps NIC"
++#define OC_NAME1 "Emulex OneConnect 10Gbps NIC (be3)"
+ #define DRV_DESC BE_NAME "Driver"
+
+ #define BE_VENDOR_ID 0x19a2
+ #define BE_DEVICE_ID1 0x211
++#define BE_DEVICE_ID2 0x221
+ #define OC_DEVICE_ID1 0x700
+ #define OC_DEVICE_ID2 0x701
++#define OC_DEVICE_ID3 0x710
+
+ static inline char *nic_name(struct pci_dev *pdev)
+ {
+- if (pdev->device == OC_DEVICE_ID1 || pdev->device == OC_DEVICE_ID2)
++ switch (pdev->device) {
++ case OC_DEVICE_ID1:
++ case OC_DEVICE_ID2:
+ return OC_NAME;
+- else
++ case OC_DEVICE_ID3:
++ return OC_NAME1;
++ case BE_DEVICE_ID2:
++ return BE3_NAME;
++ default:
+ return BE_NAME;
++ }
+ }
+
+ /* Number of bytes of an RX frame that are copied to skb->data */
+--
+1.6.5.7
+
Added: dists/trunk/linux-2.6/debian/patches/features/all/be2net-Add-the-new-PCI-IDs-to-PCI_DEVICE_TABLE.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/be2net-Add-the-new-PCI-IDs-to-PCI_DEVICE_TABLE.patch Sun Jan 10 17:47:00 2010 (r14933)
@@ -0,0 +1,32 @@
+From 59fd5d87a4243a992f3a3e69f3627cf4c509608e Mon Sep 17 00:00:00 2001
+From: Ajit Khaparde <ajitk at serverengines.com>
+Date: Thu, 29 Oct 2009 01:11:06 -0700
+Subject: [PATCH] be2net: Add the new PCI IDs to PCI_DEVICE_TABLE.
+
+This patch adds the PCI IDs for the next generation chip to the
+PCI_DEVICE_ID table.
+
+Signed-off-by: Ajit Khaparde <ajitk at serverengines.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ drivers/net/benet/be_main.c | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
+index 4520db7..43180dc 100644
+--- a/drivers/net/benet/be_main.c
++++ b/drivers/net/benet/be_main.c
+@@ -31,8 +31,10 @@ MODULE_PARM_DESC(rx_frag_size, "Size of a fragment that holds rcvd data.");
+
+ static DEFINE_PCI_DEVICE_TABLE(be_dev_ids) = {
+ { PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID1) },
++ { PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID2) },
+ { PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID1) },
+ { PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID2) },
++ { PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID3) },
+ { 0 }
+ };
+ MODULE_DEVICE_TABLE(pci, be_dev_ids);
+--
+1.6.5.7
+
Added: dists/trunk/linux-2.6/debian/patches/features/arm/davinci-dm646x-Add-support-for-3.x-silicon-revision.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/arm/davinci-dm646x-Add-support-for-3.x-silicon-revision.patch Sun Jan 10 17:47:00 2010 (r14933)
@@ -0,0 +1,40 @@
+From f63dd12da29f47c37bbc093abec098538e04357c Mon Sep 17 00:00:00 2001
+From: Hemant Pedanekar <hemantp at ti.com>
+Date: Wed, 2 Sep 2009 16:49:35 +0530
+Subject: [PATCH] davinci: dm646x: Add support for 3.x silicon revision
+
+DM6467 silicon revisions 3.x have variant field in JTAGID register as '1'.
+This path adds entry for the same in dm646x_ids to be able to boot on boards
+with 3.x revision chips.
+
+Also modifies name for 'variant=0' (revisions 1.0, 1.1).
+
+Signed-off-by: Hemant Pedanekar <hemantp at ti.com>
+Signed-off-by: Kevin Hilman <khilman at deeprootsystems.com>
+---
+ arch/arm/mach-davinci/dm646x.c | 9 ++++++++-
+ 1 files changed, 8 insertions(+), 1 deletions(-)
+
+diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
+index 0976049..36e4fb4 100644
+--- a/arch/arm/mach-davinci/dm646x.c
++++ b/arch/arm/mach-davinci/dm646x.c
+@@ -789,7 +789,14 @@ static struct davinci_id dm646x_ids[] = {
+ .part_no = 0xb770,
+ .manufacturer = 0x017,
+ .cpu_id = DAVINCI_CPU_ID_DM6467,
+- .name = "dm6467",
++ .name = "dm6467_rev1.x",
++ },
++ {
++ .variant = 0x1,
++ .part_no = 0xb770,
++ .manufacturer = 0x017,
++ .cpu_id = DAVINCI_CPU_ID_DM6467,
++ .name = "dm6467_rev3.x",
+ },
+ };
+
+--
+1.6.5.7
+
Added: dists/trunk/linux-2.6/debian/patches/features/powerpc/fsl-Add-PCI-device-ids-for-new-QoirQ-chips.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/powerpc/fsl-Add-PCI-device-ids-for-new-QoirQ-chips.patch Sun Jan 10 17:47:00 2010 (r14933)
@@ -0,0 +1,53 @@
+Based on:
+
+From: Kumar Gala <galak at kernel.crashing.org>
+Subject: [PATCH] powerpc/fsl: Add PCI device ids for new QoirQ chips
+
+--- a/arch/powerpc/sysdev/fsl_pci.c
++++ b/arch/powerpc/sysdev/fsl_pci.c
+@@ -392,8 +392,22 @@ DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8536, quirk_fsl_pcie_header);
+ DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8641, quirk_fsl_pcie_header);
+ DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8641D, quirk_fsl_pcie_header);
+ DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8610, quirk_fsl_pcie_header);
++DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P1011E, quirk_fsl_pcie_header);
++DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P1011, quirk_fsl_pcie_header);
++DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P1013E, quirk_fsl_pcie_header);
++DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P1013, quirk_fsl_pcie_header);
++DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P1020E, quirk_fsl_pcie_header);
++DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P1020, quirk_fsl_pcie_header);
++DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P1022E, quirk_fsl_pcie_header);
++DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P1022, quirk_fsl_pcie_header);
++DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P2010E, quirk_fsl_pcie_header);
++DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P2010, quirk_fsl_pcie_header);
+ DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P2020E, quirk_fsl_pcie_header);
+ DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P2020, quirk_fsl_pcie_header);
++DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P4040E, quirk_fsl_pcie_header);
++DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P4040, quirk_fsl_pcie_header);
++DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P4080E, quirk_fsl_pcie_header);
++DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P4080, quirk_fsl_pcie_header);
+ #endif /* CONFIG_PPC_85xx || CONFIG_PPC_86xx */
+
+ #if defined(CONFIG_PPC_83xx) || defined(CONFIG_PPC_MPC512x)
+--- a/include/linux/pci_ids.h
++++ b/include/linux/pci_ids.h
+@@ -2288,6 +2288,20 @@
+ #define PCI_DEVICE_ID_MPC8536 0x0051
+ #define PCI_DEVICE_ID_P2020E 0x0070
+ #define PCI_DEVICE_ID_P2020 0x0071
++#define PCI_DEVICE_ID_P2010E 0x0078
++#define PCI_DEVICE_ID_P2010 0x0079
++#define PCI_DEVICE_ID_P1020E 0x0100
++#define PCI_DEVICE_ID_P1020 0x0101
++#define PCI_DEVICE_ID_P1011E 0x0108
++#define PCI_DEVICE_ID_P1011 0x0109
++#define PCI_DEVICE_ID_P1022E 0x0110
++#define PCI_DEVICE_ID_P1022 0x0111
++#define PCI_DEVICE_ID_P1013E 0x0118
++#define PCI_DEVICE_ID_P1013 0x0119
++#define PCI_DEVICE_ID_P4080E 0x0400
++#define PCI_DEVICE_ID_P4080 0x0401
++#define PCI_DEVICE_ID_P4040E 0x0408
++#define PCI_DEVICE_ID_P4040 0x0409
+ #define PCI_DEVICE_ID_MPC8641 0x7010
+ #define PCI_DEVICE_ID_MPC8641D 0x7011
+ #define PCI_DEVICE_ID_MPC8610 0x7018
Added: dists/trunk/linux-2.6/debian/patches/series/6
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/series/6 Sun Jan 10 17:47:00 2010 (r14933)
@@ -0,0 +1,6 @@
++ features/all/be2net-Add-support-for-next-generation-of-BladeEngine.patch
++ features/all/be2net-Add-the-new-PCI-IDs-to-PCI_DEVICE_TABLE.patch
++ features/all/SCSI-mpt2sas-New-device-SAS2208-support-is-added.patch
++ features/all/ar9170-Add-support-for-D-Link-DWA-160-A2.patc
++ features/powerpc/fsl-Add-PCI-device-ids-for-new-QoirQ-chips.patch
++ features/arm/davinci-dm646x-Add-support-for-3.x-silicon-revision.patch
More information about the Kernel-svn-changes
mailing list