]> git.kernelconcepts.de Git - karo-tx-uboot.git/blobdiff - drivers/mtd/dataflash.c
sunxi_nand_spl: Remove NAND_SUNXI_SPL_SYNDROME_PARTITIONS_END
[karo-tx-uboot.git] / drivers / mtd / dataflash.c
index 242140745e19b4ee26b7d937f50b51d0a2a44a7b..3fb6ed6df7cdcc6e65f34105756c765828be98ea 100644 (file)
@@ -1,98 +1,16 @@
-/* LowLevel function for ATMEL DataFlash support
+/*
+ * LowLevel function for ATMEL DataFlash support
  * Author : Hamid Ikdoumi (Atmel)
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 #include <common.h>
 #include <config.h>
-#ifdef CONFIG_HAS_DATAFLASH
 #include <asm/hardware.h>
 #include <dataflash.h>
 
-AT91S_DATAFLASH_INFO dataflash_info[CFG_MAX_DATAFLASH_BANKS];
 static AT91S_DataFlash DataFlashInst;
 
-struct dataflash_addr {
-       unsigned long addr;
-       int cs;
-};
-
-#ifdef CONFIG_AT91SAM9260EK
-struct dataflash_addr cs[CFG_MAX_DATAFLASH_BANKS] = {
-       {CFG_DATAFLASH_LOGIC_ADDR_CS0, 0},      /* Logical adress, CS */
-       {CFG_DATAFLASH_LOGIC_ADDR_CS1, 1}
-};
-#elif defined(CONFIG_AT91SAM9263EK)
-struct dataflash_addr cs[CFG_MAX_DATAFLASH_BANKS] = {
-       {CFG_DATAFLASH_LOGIC_ADDR_CS0, 0},      /* Logical adress, CS */
-};
-#else
-struct dataflash_addr cs[CFG_MAX_DATAFLASH_BANKS] = {
-       {CFG_DATAFLASH_LOGIC_ADDR_CS0, 0},      /* Logical adress, CS */
-       {CFG_DATAFLASH_LOGIC_ADDR_CS3, 3}
-};
-#endif
-
-/*define the area offsets*/
-#if defined(CONFIG_AT91SAM9261EK) || defined(CONFIG_AT91SAM9260EK) || defined(CONFIG_AT91SAM9263EK)
-#if    defined(CONFIG_NEW_PARTITION)
-dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
-       {0x00000000,    0x00003FFF,     FLAG_PROTECT_SET,       0,              "Bootstrap"},   /* ROM code */
-       {0x00004200,    0x000083FF,     FLAG_PROTECT_CLEAR,     0,              "Environment"}, /* u-boot environment */
-       {0x00008400,    0x0003DDFF,     FLAG_PROTECT_SET,       0,              "U-Boot"},      /* u-boot code */
-       {0x0003DE00,    0x00041FFF,     FLAG_PROTECT_CLEAR,     FLAG_SETENV,    "MON"},         /* Room for alternative boot monitor */
-       {0x00042000,    0x0018BFFF,     FLAG_PROTECT_CLEAR,     FLAG_SETENV,    "OS"},          /* data area size to tune */
-       {0x0018C000,    0xFFFFFFFF,     FLAG_PROTECT_CLEAR,     FLAG_SETENV,    "FS"},          /* data area size to tune */
-};
-#else
-dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
-       {0, 0x3fff, FLAG_PROTECT_SET},                  /* ROM code */
-       {0x4000, 0x7fff, FLAG_PROTECT_CLEAR},           /* u-boot environment */
-       {0x8000, 0x37fff, FLAG_PROTECT_SET},            /* u-boot code */
-       {0x38000, 0x1fffff, FLAG_PROTECT_CLEAR},        /* data area size to tune */
-};
-#endif
-#elif defined(CONFIG_NEW_PARTITION)
-/*define the area offsets*/
-/* Invalid partitions should be defined with start > end */
-dataflash_protect_t area_list[NB_DATAFLASH_AREA*CFG_MAX_DATAFLASH_BANKS] = {
-       {0x00000000, 0x000083ff, FLAG_PROTECT_SET,      0,              "Bootstrap"},   /* ROM code */
-       {0x00008400, 0x00020fff, FLAG_PROTECT_SET,      0,              "U-Boot"},      /* u-boot code */
-       {0x00021000, 0x000293ff, FLAG_PROTECT_CLEAR,    0,              "Environment"}, /* u-boot environment 8Kb */
-       {0x00029400, 0x00041fff, FLAG_PROTECT_INVALID,  0,              "<Unused>"},    /* Rest of Sector 1 */
-       {0x00042000, 0x0018Bfff, FLAG_PROTECT_CLEAR,    FLAG_SETENV,    "OS"},  /* data area size to tune */
-       {0x0018C000, 0xffffffff, FLAG_PROTECT_CLEAR,    FLAG_SETENV,    "FS"},  /* data area size to tune */
-
-       {0x00000000, 0xffffffff, FLAG_PROTECT_CLEAR,    FLAG_SETENV,    "Data"},        /* data area */
-       {0xffffffff, 0x00000000, FLAG_PROTECT_INVALID,  0,              "<Invalid>"},   /* Invalid */
-       {0xffffffff, 0x00000000, FLAG_PROTECT_INVALID,  0,              "<Invalid>"},   /* Invalid */
-       {0xffffffff, 0x00000000, FLAG_PROTECT_INVALID,  0,              "<Invalid>"},   /* Invalid */
-       {0xffffffff, 0x00000000, FLAG_PROTECT_INVALID,  0,              "<Invalid>"},   /* Invalid */
-       {0xffffffff, 0x00000000, FLAG_PROTECT_INVALID,  0,              "<Invalid>"},   /* Invalid */
-};
-#else
-dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
-       {0, 0x7fff, FLAG_PROTECT_SET},                  /* ROM code */
-       {0x8000, 0x1ffff, FLAG_PROTECT_SET},            /* u-boot code */
-       {0x20000, 0x27fff, FLAG_PROTECT_CLEAR},         /* u-boot environment */
-       {0x28000, 0x1fffff, FLAG_PROTECT_CLEAR},        /* data area size to tune */
-};
-#endif
-
 extern void AT91F_SpiInit (void);
 extern int AT91F_DataflashProbe (int i, AT91PS_DataflashDesc pDesc);
 extern int AT91F_DataFlashRead (AT91PS_DataFlash pDataFlash,
@@ -107,14 +25,13 @@ int AT91F_DataflashInit (void)
 {
        int i, j;
        int dfcode;
-       int part = 0;
-       int last_part;
-       int found[CFG_MAX_DATAFLASH_BANKS];
+       int part;
+       int found[CONFIG_SYS_MAX_DATAFLASH_BANKS];
        unsigned char protected;
 
        AT91F_SpiInit ();
 
-       for (i = 0; i < CFG_MAX_DATAFLASH_BANKS; i++) {
+       for (i = 0; i < CONFIG_SYS_MAX_DATAFLASH_BANKS; i++) {
                found[i] = 0;
                dataflash_info[i].Desc.state = IDLE;
                dataflash_info[i].id = 0;
@@ -123,6 +40,30 @@ int AT91F_DataflashInit (void)
                                &dataflash_info[i].Desc);
 
                switch (dfcode) {
+               case AT45DB021:
+                       dataflash_info[i].Device.pages_number = 1024;
+                       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 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;
@@ -176,13 +117,13 @@ int AT91F_DataflashInit (void)
                        break;
                }
                /* set the last area end to the dataflash size*/
-               area_list[NB_DATAFLASH_AREA -1].end =
+               dataflash_info[i].end_address =
                                (dataflash_info[i].Device.pages_number *
-                               dataflash_info[i].Device.pages_size)-1;
+                               dataflash_info[i].Device.pages_size) - 1;
 
-               last_part=0;
+               part = 0;
                /* set the area addresses */
-               for(j = 0; j<NB_DATAFLASH_AREA; j++) {
+               for(j = 0; j < NB_DATAFLASH_AREA; j++) {
                        if(found[i]!=0) {
                                dataflash_info[i].Device.area_list[j].start =
                                        area_list[part].start +
@@ -190,8 +131,7 @@ int AT91F_DataflashInit (void)
                                if(area_list[part].end == 0xffffffff) {
                                        dataflash_info[i].Device.area_list[j].end =
                                                dataflash_info[i].end_address +
-                                               dataflash_info  [i].logical_address;
-                                       last_part = 1;
+                                               dataflash_info[i].logical_address;
                                } else {
                                        dataflash_info[i].Device.area_list[j].end =
                                                area_list[part].end +
@@ -215,38 +155,39 @@ int AT91F_DataflashInit (void)
        return found[0];
 }
 
-#ifdef CONFIG_NEW_DF_PARTITION
-int AT91F_DataflashSetEnv (void)
+void AT91F_DataflashSetEnv (void)
 {
        int i, j;
        int part;
        unsigned char env;
        unsigned char s[32];    /* Will fit a long int in hex */
        unsigned long start;
-       for (i = 0, part= 0; i < CFG_MAX_DATAFLASH_BANKS; i++) {
-               for(j = 0; j<NB_DATAFLASH_AREA; j++) {
+
+       for (i = 0, part= 0; i < CONFIG_SYS_MAX_DATAFLASH_BANKS; i++) {
+               for(j = 0; j < NB_DATAFLASH_AREA; j++) {
                        env = area_list[part].setenv;
                        /* Set the environment according to the label...*/
                        if((env & FLAG_SETENV) == FLAG_SETENV) {
-                               start =
-                               dataflash_info[i].Device.area_list[j].start;
-                               sprintf(s,"%X",start);
-                               setenv(area_list[part].label,s);
+                               start = dataflash_info[i].Device.area_list[j].start;
+                               sprintf((char*) s,"%lX",start);
+                               setenv((char*) area_list[part].label,(char*) s);
                        }
                        part++;
                }
        }
 }
-#endif
 
 void dataflash_print_info (void)
 {
        int i, j;
 
-       for (i = 0; i < CFG_MAX_DATAFLASH_BANKS; i++) {
+       for (i = 0; i < CONFIG_SYS_MAX_DATAFLASH_BANKS; i++) {
                if (dataflash_info[i].id != 0) {
                        printf("DataFlash:");
                        switch (dataflash_info[i].id) {
+                       case AT45DB021:
+                               printf("AT45DB021\n");
+                               break;
                        case AT45DB161:
                                printf("AT45DB161\n");
                                break;
@@ -272,7 +213,7 @@ void dataflash_print_info (void)
                                (unsigned int) dataflash_info[i].Device.pages_number *
                                dataflash_info[i].Device.pages_size,
                                (unsigned int) dataflash_info[i].logical_address);
-                       for (j=0; j< NB_DATAFLASH_AREA; j++) {
+                       for (j = 0; j < NB_DATAFLASH_AREA; j++) {
                                switch(dataflash_info[i].Device.area_list[j].protected) {
                                case    FLAG_PROTECT_SET:
                                case    FLAG_PROTECT_CLEAR:
@@ -280,25 +221,18 @@ void dataflash_print_info (void)
                                                dataflash_info[i].Device.area_list[j].start,
                                                dataflash_info[i].Device.area_list[j].end,
                                                (dataflash_info[i].Device.area_list[j].protected==FLAG_PROTECT_SET) ? "(RO)" : "    ");
-#ifdef CONFIG_NEW_DF_PARTITION
                                                printf(" %s\n", dataflash_info[i].Device.area_list[j].label);
-#else
-                                               printf("\n");
-#endif
                                        break;
-#ifdef CONFIG_NEW_DF_PARTITION
                                case    FLAG_PROTECT_INVALID:
                                        break;
-#endif
                                }
                        }
                }
        }
 }
 
-
 /*---------------------------------------------------------------------------*/
-/* Function Name       : AT91F_DataflashSelect                                      */
+/* Function Name       : AT91F_DataflashSelect                              */
 /* Object              : Select the correct device                          */
 /*---------------------------------------------------------------------------*/
 AT91PS_DataFlash AT91F_DataflashSelect (AT91PS_DataFlash pFlash,
@@ -307,7 +241,7 @@ AT91PS_DataFlash AT91F_DataflashSelect (AT91PS_DataFlash pFlash,
        char addr_valid = 0;
        int i;
 
-       for (i = 0; i < CFG_MAX_DATAFLASH_BANKS; i++)
+       for (i = 0; i < CONFIG_SYS_MAX_DATAFLASH_BANKS; i++)
                if ( dataflash_info[i].id
                        && ((((int) *addr) & 0xFF000000) ==
                        dataflash_info[i].logical_address)) {
@@ -325,7 +259,7 @@ AT91PS_DataFlash AT91F_DataflashSelect (AT91PS_DataFlash pFlash,
 }
 
 /*---------------------------------------------------------------------------*/
-/* Function Name       : addr_dataflash                                     */
+/* Function Name       : addr_dataflash                                             */
 /* Object              : Test if address is valid                           */
 /*---------------------------------------------------------------------------*/
 int addr_dataflash (unsigned long addr)
@@ -333,7 +267,7 @@ int addr_dataflash (unsigned long addr)
        int addr_valid = 0;
        int i;
 
-       for (i = 0; i < CFG_MAX_DATAFLASH_BANKS; i++) {
+       for (i = 0; i < CONFIG_SYS_MAX_DATAFLASH_BANKS; i++) {
                if ((((int) addr) & 0xFF000000) ==
                        dataflash_info[i].logical_address) {
                        addr_valid = 1;
@@ -343,8 +277,9 @@ int addr_dataflash (unsigned long addr)
 
        return addr_valid;
 }
+
 /*---------------------------------------------------------------------------*/
-/* Function Name       : size_dataflash                                     */
+/* Function Name       : size_dataflash                                             */
 /* Object              : Test if address is valid regarding the size        */
 /*---------------------------------------------------------------------------*/
 int size_dataflash (AT91PS_DataFlash pdataFlash, unsigned long addr,
@@ -360,15 +295,17 @@ int size_dataflash (AT91PS_DataFlash pdataFlash, unsigned long addr,
 
        return 1;
 }
+
 /*---------------------------------------------------------------------------*/
-/* Function Name       : prot_dataflash                                     */
+/* Function Name       : prot_dataflash                                             */
 /* Object              : Test if destination area is protected              */
 /*---------------------------------------------------------------------------*/
 int prot_dataflash (AT91PS_DataFlash pdataFlash, unsigned long addr)
 {
-int area;
+       int area;
+
        /* find area */
-       for (area=0; area < NB_DATAFLASH_AREA; area++) {
+       for (area = 0; area < NB_DATAFLASH_AREA; area++) {
                if ((addr >= pdataFlash->pDevice->area_list[area].start) &&
                        (addr < pdataFlash->pDevice->area_list[area].end))
                        break;
@@ -384,6 +321,7 @@ int area;
 
        return 1;
 }
+
 /*--------------------------------------------------------------------------*/
 /* Function Name       : dataflash_real_protect                                    */
 /* Object              : protect/unprotect area                                    */
@@ -391,9 +329,10 @@ int area;
 int dataflash_real_protect (int flag, unsigned long start_addr,
                                unsigned long end_addr)
 {
-int i,j, area1, area2, addr_valid = 0;
+       int i,j, area1, area2, addr_valid = 0;
+
        /* find dataflash */
-       for (i = 0; i < CFG_MAX_DATAFLASH_BANKS; i++) {
+       for (i = 0; i < CONFIG_SYS_MAX_DATAFLASH_BANKS; i++) {
                if ((((int) start_addr) & 0xF0000000) ==
                        dataflash_info[i].logical_address) {
                                addr_valid = 1;
@@ -404,13 +343,13 @@ int i,j, area1, area2, addr_valid = 0;
                return -1;
        }
        /* find start area */
-       for (area1=0; area1 < NB_DATAFLASH_AREA; area1++) {
+       for (area1 = 0; area1 < NB_DATAFLASH_AREA; area1++) {
                if (start_addr == dataflash_info[i].Device.area_list[area1].start)
                        break;
        }
        if (area1 == NB_DATAFLASH_AREA) return -1;
        /* find end area */
-       for (area2=0; area2 < NB_DATAFLASH_AREA; area2++) {
+       for (area2 = 0; area2 < NB_DATAFLASH_AREA; area2++) {
                if (end_addr == dataflash_info[i].Device.area_list[area2].end)
                        break;
        }
@@ -418,7 +357,7 @@ int i,j, area1, area2, addr_valid = 0;
                return -1;
 
        /*set protection value*/
-       for(j = area1; j < area2+1 ; j++)
+       for(j = area1; j < area2 + 1 ; j++)
                if(dataflash_info[i].Device.area_list[j].protected
                                != FLAG_PROTECT_INVALID) {
                        if (flag == 0) {
@@ -430,11 +369,11 @@ int i,j, area1, area2, addr_valid = 0;
                        }
                }
 
-       return (area2-area1+1);
+       return (area2 - area1 + 1);
 }
 
 /*---------------------------------------------------------------------------*/
-/* Function Name       : read_dataflash                                     */
+/* Function Name       : read_dataflash                                             */
 /* Object              : dataflash memory read                              */
 /*---------------------------------------------------------------------------*/
 int read_dataflash (unsigned long addr, unsigned long size, char *result)
@@ -453,9 +392,8 @@ int read_dataflash (unsigned long addr, unsigned long size, char *result)
        return (AT91F_DataFlashRead (pFlash, AddrToRead, size, result));
 }
 
-
 /*---------------------------------------------------------------------------*/
-/* Function Name       : write_dataflash                                    */
+/* Function Name       : write_dataflash                                    */
 /* Object              : write a block in dataflash                         */
 /*---------------------------------------------------------------------------*/
 int write_dataflash (unsigned long addr_dest, unsigned long addr_src,
@@ -482,7 +420,6 @@ int write_dataflash (unsigned long addr_dest, unsigned long addr_src,
                                                AddrToWrite, size);
 }
 
-
 void dataflash_perror (int err)
 {
        switch (err) {
@@ -508,5 +445,3 @@ void dataflash_perror (int err)
                break;
        }
 }
-
-#endif