Merge branch 'master' of git://git.denx.de/u-boot-at91

diff --git a/drivers/mtd/dataflash.c b/drivers/mtd/dataflash.c
index 0ad48cd..049da69 100644 (file)
--- a/drivers/mtd/dataflash.c
+++ b/drivers/mtd/dataflash.c
@@ -56,7 +56,7 @@ int AT91F_DataflashInit (void)
                switch (dfcode) {
                case AT45DB021:
                        dataflash_info[i].Device.pages_number = 1024;
-                       dataflash_info[i].Device.pages_size = 263;
+                       dataflash_info[i].Device.pages_size = 264;
                        dataflash_info[i].Device.page_offset = 9;
                        dataflash_info[i].Device.byte_mask = 0x300;
                        dataflash_info[i].Device.cs = cs[i].cs;
@@ -65,6 +65,19 @@ int AT91F_DataflashInit (void)
                        dataflash_info[i].id = dfcode;
                        found[i] += dfcode;;
                        break;
+
+               case AT45DB081:
+                       dataflash_info[i].Device.pages_number = 4096;
+                       dataflash_info[i].Device.pages_size = 264;
+                       dataflash_info[i].Device.page_offset = 9;
+                       dataflash_info[i].Device.byte_mask = 0x300;
+                       dataflash_info[i].Device.cs = cs[i].cs;
+                       dataflash_info[i].Desc.DataFlash_state = IDLE;
+                       dataflash_info[i].logical_address = cs[i].addr;
+                       dataflash_info[i].id = dfcode;
+                       found[i] += dfcode;;
+                       break;
+
                case AT45DB161:
                        dataflash_info[i].Device.pages_number = 4096;
                        dataflash_info[i].Device.pages_size = 528;

diff --git a/include/dataflash.h b/include/dataflash.h
index 80f0633..de04139 100644 (file)
--- a/include/dataflash.h
+++ b/include/dataflash.h
@@ -135,9 +135,9 @@ struct dataflash_addr {
        int cs;
 };
 /*-------------------------------------------------------------------------------------------------*/
-
 #define AT45DB161      0x2c
 #define AT45DB021      0x14
+#define AT45DB081      0x24
 #define AT45DB321      0x34
 #define AT45DB642      0x3c
 #define AT45DB128      0x10