* [PATCH 1/3] Use PCI_DEVICE_ID_88ALP01 for CAFÉ chip, rather than PCI_DEVICE_ID_CAFE.
[not found] <1220438625.patch@pmac.infradead.org>
@ 2008-09-03 10:48 ` David Woodhouse
2008-09-03 14:05 ` Pierre Ossman
2008-09-03 10:48 ` [PATCH 2/3] [MTD] [NAND] Define and use PCI_DEVICE_ID_MARVELL_88ALP01_NAND for CAFÉ David Woodhouse
2008-09-03 10:48 ` [PATCH 3/3] Define and use PCI_DEVICE_ID_MARVELL_88ALP01_CCIC for CAFÉ camera driver David Woodhouse
2 siblings, 1 reply; 5+ messages in thread
From: David Woodhouse @ 2008-09-03 10:48 UTC (permalink / raw)
To: linux-kernel; +Cc: Pierre Ossman, devel
Probably better to use the official designation.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---
(Carried in git://git.infradead.org/~dwmw2/random-2.6.git)
drivers/mmc/host/sdhci-pci.c | 2 +-
include/linux/pci_ids.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index fcb14c2..0341cfb 100644
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -326,7 +326,7 @@ static const struct pci_device_id pci_ids[] __devinitdata = {
{
.vendor = PCI_VENDOR_ID_MARVELL,
- .device = PCI_DEVICE_ID_MARVELL_CAFE_SD,
+ .device = PCI_DEVICE_ID_MARVELL_88ALP01_SD,
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
.driver_data = (kernel_ulong_t)&sdhci_cafe,
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index f1624b3..ef6ef64 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1521,7 +1521,7 @@
#define PCI_DEVICE_ID_MARVELL_GT64260 0x6430
#define PCI_DEVICE_ID_MARVELL_MV64360 0x6460
#define PCI_DEVICE_ID_MARVELL_MV64460 0x6480
-#define PCI_DEVICE_ID_MARVELL_CAFE_SD 0x4101
+#define PCI_DEVICE_ID_MARVELL_88ALP01_SD 0x4101
#define PCI_VENDOR_ID_V3 0x11b0
#define PCI_DEVICE_ID_V3_V960 0x0001
--
1.5.5.1
--
David Woodhouse Open Source Technology Centre
David.Woodhouse@intel.com Intel Corporation
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 2/3] [MTD] [NAND] Define and use PCI_DEVICE_ID_MARVELL_88ALP01_NAND for CAFÉ
[not found] <1220438625.patch@pmac.infradead.org>
2008-09-03 10:48 ` [PATCH 1/3] Use PCI_DEVICE_ID_88ALP01 for CAFÉ chip, rather than PCI_DEVICE_ID_CAFE David Woodhouse
@ 2008-09-03 10:48 ` David Woodhouse
2008-09-03 10:48 ` [PATCH 3/3] Define and use PCI_DEVICE_ID_MARVELL_88ALP01_CCIC for CAFÉ camera driver David Woodhouse
2 siblings, 0 replies; 5+ messages in thread
From: David Woodhouse @ 2008-09-03 10:48 UTC (permalink / raw)
To: linux-kernel; +Cc: devel
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---
(Carried in git://git.infradead.org/~dwmw2/random-2.6.git)
drivers/mtd/nand/cafe_nand.c | 6 +++++-
include/linux/pci_ids.h | 1 +
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c
index 95345d0..b8064bf 100644
--- a/drivers/mtd/nand/cafe_nand.c
+++ b/drivers/mtd/nand/cafe_nand.c
@@ -1,6 +1,9 @@
/*
* Driver for One Laptop Per Child ‘CAFÉ’ controller, aka Marvell 88ALP01
*
+ * The data sheet for this device can be found at:
+ * http://www.marvell.com/products/pcconn/88ALP01.jsp
+ *
* Copyright © 2006 Red Hat, Inc.
* Copyright © 2006 David Woodhouse <dwmw2@infradead.org>
*/
@@ -842,7 +845,8 @@ static void __devexit cafe_nand_remove(struct pci_dev *pdev)
}
static struct pci_device_id cafe_nand_tbl[] = {
- { 0x11ab, 0x4100, PCI_ANY_ID, PCI_ANY_ID },
+ { PCI_VENDOR_ID_MARVELL, PCI_DEVICE_ID_MARVELL_88ALP01_NAND,
+ PCI_ANY_ID, PCI_ANY_ID },
{ }
};
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index ef6ef64..e6240b7 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1521,6 +1521,7 @@
#define PCI_DEVICE_ID_MARVELL_GT64260 0x6430
#define PCI_DEVICE_ID_MARVELL_MV64360 0x6460
#define PCI_DEVICE_ID_MARVELL_MV64460 0x6480
+#define PCI_DEVICE_ID_MARVELL_88ALP01_NAND 0x4100
#define PCI_DEVICE_ID_MARVELL_88ALP01_SD 0x4101
#define PCI_VENDOR_ID_V3 0x11b0
--
1.5.5.1
--
David Woodhouse Open Source Technology Centre
David.Woodhouse@intel.com Intel Corporation
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 3/3] Define and use PCI_DEVICE_ID_MARVELL_88ALP01_CCIC for CAFÉ camera driver
[not found] <1220438625.patch@pmac.infradead.org>
2008-09-03 10:48 ` [PATCH 1/3] Use PCI_DEVICE_ID_88ALP01 for CAFÉ chip, rather than PCI_DEVICE_ID_CAFE David Woodhouse
2008-09-03 10:48 ` [PATCH 2/3] [MTD] [NAND] Define and use PCI_DEVICE_ID_MARVELL_88ALP01_NAND for CAFÉ David Woodhouse
@ 2008-09-03 10:48 ` David Woodhouse
2008-09-03 15:54 ` Jonathan Corbet
2 siblings, 1 reply; 5+ messages in thread
From: David Woodhouse @ 2008-09-03 10:48 UTC (permalink / raw)
To: linux-kernel; +Cc: corbet, devel
Also, stop looking at the NAND controller (0x4100) and checking the
device class. For a while during development, all three functions on the
chip had the same ID. We made them fix that fairly promptly, and we can
forget about it now.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---
(Carried in git://git.infradead.org/~dwmw2/random-2.6.git)
drivers/media/video/cafe_ccic.c | 13 +++----------
include/linux/pci_ids.h | 1 +
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c
index c149b7d..ea0db81 100644
--- a/drivers/media/video/cafe_ccic.c
+++ b/drivers/media/video/cafe_ccic.c
@@ -2091,15 +2091,8 @@ static int cafe_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *id)
{
int ret;
- u16 classword;
struct cafe_camera *cam;
- /*
- * Make sure we have a camera here - we'll get calls for
- * the other cafe devices as well.
- */
- pci_read_config_word(pdev, PCI_CLASS_DEVICE, &classword);
- if (classword != PCI_CLASS_MULTIMEDIA_VIDEO)
- return -ENODEV;
+
/*
* Start putting together one of our big camera structures.
*/
@@ -2287,8 +2280,8 @@ static int cafe_pci_resume(struct pci_dev *pdev)
static struct pci_device_id cafe_ids[] = {
- { PCI_DEVICE(0x11ab, 0x4100) }, /* Eventual real ID */
- { PCI_DEVICE(0x11ab, 0x4102) }, /* Really eventual real ID */
+ { PCI_DEVICE(PCI_VENDOR_ID_MARVELL,
+ PCI_DEVICE_ID_MARVELL_88ALP01_CCIC) },
{ 0, }
};
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index e6240b7..6cf53f4 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1523,6 +1523,7 @@
#define PCI_DEVICE_ID_MARVELL_MV64460 0x6480
#define PCI_DEVICE_ID_MARVELL_88ALP01_NAND 0x4100
#define PCI_DEVICE_ID_MARVELL_88ALP01_SD 0x4101
+#define PCI_DEVICE_ID_MARVELL_88ALP01_CCIC 0x4102
#define PCI_VENDOR_ID_V3 0x11b0
#define PCI_DEVICE_ID_V3_V960 0x0001
--
1.5.5.1
--
David Woodhouse Open Source Technology Centre
David.Woodhouse@intel.com Intel Corporation
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 3/3] Define and use PCI_DEVICE_ID_MARVELL_88ALP01_CCIC for CAFÉ camera driver
2008-09-03 10:48 ` [PATCH 3/3] Define and use PCI_DEVICE_ID_MARVELL_88ALP01_CCIC for CAFÉ camera driver David Woodhouse
@ 2008-09-03 15:54 ` Jonathan Corbet
0 siblings, 0 replies; 5+ messages in thread
From: Jonathan Corbet @ 2008-09-03 15:54 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-kernel, devel
On Wed, 03 Sep 2008 11:48:22 +0100
David Woodhouse <dwmw2@infradead.org> wrote:
> Also, stop looking at the NAND controller (0x4100) and checking the
> device class. For a while during development, all three functions on
> the chip had the same ID. We made them fix that fairly promptly, and
> we can forget about it now.
I see no harm in having the driver check the device to ensure it's what
it thinks it is - we can probably afford the runtime overhead. But
whatever, I'm not that concerned; toss in an
Acked-by: Jonathan Corbet <corbet@lwn.net>
if you wish.
jon
^ permalink raw reply [flat|nested] 5+ messages in thread