[pkg-fso-commits] [SCM] linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko branch, andy-tracking, updated. upstream/20090303.gitb9de904e-140-g23b564c

[Werner Almesberger]

The following commit has been merged in the andy-tracking branch:
commit 8ce8fdbdb2d1ea30109aa816b9557dbf37ea58ad
Author: Werner Almesberger <werner at openmoko.org>
Date:   Tue Mar 31 04:16:32 2009 -0300

    AR6000: Corrected 'vendor/device IDs'.
    
    IDs 0 and 1 are AR6002, not AR6001. This is based on a patch by
    Ivan Petrov, but it differs in leaving the IDs in
    include/linux/mmc/sdio_ids.h
    
    Signed-off-by: Werner Almesberger <werner at openmoko.org>
    Reported-by: Ivan Petrov <ivan_p at hotbox.ru>

diff --git a/drivers/ar6000/hif/hif2.c b/drivers/ar6000/hif/hif2.c
index fddd2af..56981af 100644
--- a/drivers/ar6000/hif/hif2.c
+++ b/drivers/ar6000/hif/hif2.c
@@ -660,12 +660,12 @@ static void sdio_ar6000_remove(struct sdio_func *func)
     SDIO_DEVICE(SDIO_VENDOR_ID_ATHEROS, SDIO_DEVICE_ID_ATHEROS_##id | (offset))
 
 static const struct sdio_device_id sdio_ar6000_ids[] = {
-	{ ATHEROS_SDIO_DEVICE(AR6000, 0)	},
-	{ ATHEROS_SDIO_DEVICE(AR6000, 0x1)	},
-	{ ATHEROS_SDIO_DEVICE(AR6000, 0x8)	},
-	{ ATHEROS_SDIO_DEVICE(AR6000, 0x9)	},
-	{ ATHEROS_SDIO_DEVICE(AR6000, 0xa)	},
-	{ ATHEROS_SDIO_DEVICE(AR6000, 0xb)	},
+	{ ATHEROS_SDIO_DEVICE(AR6002, 0)	},
+	{ ATHEROS_SDIO_DEVICE(AR6002, 0x1)	},
+	{ ATHEROS_SDIO_DEVICE(AR6001, 0x8)	},
+	{ ATHEROS_SDIO_DEVICE(AR6001, 0x9)	},
+	{ ATHEROS_SDIO_DEVICE(AR6001, 0xa)	},
+	{ ATHEROS_SDIO_DEVICE(AR6001, 0xb)	},
 	{ /* end: all zeroes */			},
 };
 
diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
index 2706190..1ee06df 100644
--- a/include/linux/mmc/sdio_ids.h
+++ b/include/linux/mmc/sdio_ids.h
@@ -27,6 +27,7 @@
 #define SDIO_DEVICE_ID_MARVELL_LIBERTAS		0x9103
 #define SDIO_DEVICE_ID_MARVELL_88W8688		0x9104
 #define SDIO_VENDOR_ID_ATHEROS			0x0271
-#define SDIO_DEVICE_ID_ATHEROS_AR6000		0x0100
+#define SDIO_DEVICE_ID_ATHEROS_AR6001		0x0100
+#define SDIO_DEVICE_ID_ATHEROS_AR6002		0x0200
 
 #endif

-- 
linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko