]> git.kernelconcepts.de Git - karo-tx-uboot.git/blobdiff - drivers/spi/atmel_dataflash_spi.c
spi: atmel_dataflash: Simplify AT91F_SpiEnable implementation
[karo-tx-uboot.git] / drivers / spi / atmel_dataflash_spi.c
index 3a648e619027f7fb0399f54078f9fc6e00756e26..a2e9c00ea660733758f8f5d768932b1ad50a655d 100644 (file)
@@ -2,28 +2,35 @@
  * Driver 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.
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+/*
+ * This driver desperately needs rework:
  *
- * 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
+ * - use structure SoC access
+ * - get rid of including asm/arch/at91_spi.h
+ * - remove asm/arch/at91_spi.h
+ * - get rid of all CONFIG_ATMEL_LEGACY defines and uses
  *
+ * 02-Aug-2010 Reinhard Meyer <uboot@emk-elektronik.de>
  */
 
 #include <common.h>
-#include <asm/arch/hardware.h>
+#ifndef CONFIG_ATMEL_LEGACY
+# define CONFIG_ATMEL_LEGACY
+#endif
+#include <spi.h>
+#include <malloc.h>
+
+#include <asm/io.h>
+
 #include <asm/arch/clk.h>
+#include <asm/arch/hardware.h>
+
+#include "atmel_spi.h"
+
 #include <asm/arch/gpio.h>
-#include <asm/arch/io.h>
 #include <asm/arch/at91_pio.h>
 #include <asm/arch/at91_spi.h>
 
 void AT91F_SpiInit(void)
 {
        /* Reset the SPI */
-       writel(AT91_SPI_SWRST, AT91_BASE_SPI + AT91_SPI_CR);
+       writel(AT91_SPI_SWRST, ATMEL_BASE_SPI0 + AT91_SPI_CR);
 
        /* Configure SPI in Master Mode with No CS selected !!! */
        writel(AT91_SPI_MSTR | AT91_SPI_MODFDIS | AT91_SPI_PCS,
-              AT91_BASE_SPI + AT91_SPI_MR);
+              ATMEL_BASE_SPI0 + AT91_SPI_MR);
 
        /* Configure CS0 */
        writel(AT91_SPI_NCPHA |
               (AT91_SPI_DLYBS & DATAFLASH_TCSS) |
               (AT91_SPI_DLYBCT & DATAFLASH_TCHS) |
               ((get_mck_clk_rate() / AT91_SPI_CLK) << 8),
-              AT91_BASE_SPI + AT91_SPI_CSR(0));
+              ATMEL_BASE_SPI0 + AT91_SPI_CSR(0));
 
 #ifdef CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1
        /* Configure CS1 */
@@ -56,7 +63,7 @@ void AT91F_SpiInit(void)
               (AT91_SPI_DLYBS & DATAFLASH_TCSS) |
               (AT91_SPI_DLYBCT & DATAFLASH_TCHS) |
               ((get_mck_clk_rate() / AT91_SPI_CLK) << 8),
-              AT91_BASE_SPI + AT91_SPI_CSR(1));
+              ATMEL_BASE_SPI0 + AT91_SPI_CSR(1));
 #endif
 #ifdef CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS2
        /* Configure CS2 */
@@ -64,7 +71,7 @@ void AT91F_SpiInit(void)
               (AT91_SPI_DLYBS & DATAFLASH_TCSS) |
               (AT91_SPI_DLYBCT & DATAFLASH_TCHS) |
               ((get_mck_clk_rate() / AT91_SPI_CLK) << 8),
-              AT91_BASE_SPI + AT91_SPI_CSR(2));
+              ATMEL_BASE_SPI0 + AT91_SPI_CSR(2));
 #endif
 #ifdef CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3
        /* Configure CS3 */
@@ -72,21 +79,22 @@ void AT91F_SpiInit(void)
               (AT91_SPI_DLYBS & DATAFLASH_TCSS) |
               (AT91_SPI_DLYBCT & DATAFLASH_TCHS) |
               ((get_mck_clk_rate() / AT91_SPI_CLK) << 8),
-              AT91_BASE_SPI + AT91_SPI_CSR(3));
+              ATMEL_BASE_SPI0 + AT91_SPI_CSR(3));
 #endif
 
        /* SPI_Enable */
-       writel(AT91_SPI_SPIEN, AT91_BASE_SPI + AT91_SPI_CR);
+       writel(AT91_SPI_SPIEN, ATMEL_BASE_SPI0 + AT91_SPI_CR);
 
-       while (!(readl(AT91_BASE_SPI + AT91_SPI_SR) & AT91_SPI_SPIENS));
+       while (!(readl(ATMEL_BASE_SPI0 + AT91_SPI_SR) & AT91_SPI_SPIENS))
+               ;
 
        /*
         * Add tempo to get SPI in a safe state.
         * Should not be needed for new silicon (Rev B)
         */
        udelay(500000);
-       readl(AT91_BASE_SPI + AT91_SPI_SR);
-       readl(AT91_BASE_SPI + AT91_SPI_RDR);
+       readl(ATMEL_BASE_SPI0 + AT91_SPI_SR);
+       readl(ATMEL_BASE_SPI0 + AT91_SPI_RDR);
 
 }
 
@@ -94,35 +102,28 @@ void AT91F_SpiEnable(int cs)
 {
        unsigned long mode;
 
+       mode = readl(ATMEL_BASE_SPI0 + AT91_SPI_MR);
+       mode &= ~AT91_SPI_PCS;
+
        switch (cs) {
-       case 0: /* Configure SPI CS0 for Serial DataFlash AT45DBxx */
-               mode = readl(AT91_BASE_SPI + AT91_SPI_MR);
-               mode &= 0xFFF0FFFF;
-               writel(mode | ((AT91_SPI_PCS0_DATAFLASH_CARD<<16) & AT91_SPI_PCS),
-                      AT91_BASE_SPI + AT91_SPI_MR);
+       case 0:
+               mode |= AT91_SPI_PCS0_DATAFLASH_CARD << 16;
                break;
-       case 1: /* Configure SPI CS1 for Serial DataFlash AT45DBxx */
-               mode = readl(AT91_BASE_SPI + AT91_SPI_MR);
-               mode &= 0xFFF0FFFF;
-               writel(mode | ((AT91_SPI_PCS1_DATAFLASH_CARD<<16) & AT91_SPI_PCS),
-                      AT91_BASE_SPI + AT91_SPI_MR);
+       case 1:
+               mode |= AT91_SPI_PCS1_DATAFLASH_CARD << 16;
                break;
-       case 2: /* Configure SPI CS2 for Serial DataFlash AT45DBxx */
-               mode = readl(AT91_BASE_SPI + AT91_SPI_MR);
-               mode &= 0xFFF0FFFF;
-               writel(mode | ((AT91_SPI_PCS2_DATAFLASH_CARD<<16) & AT91_SPI_PCS),
-                      AT91_BASE_SPI + AT91_SPI_MR);
+       case 2:
+               mode |= AT91_SPI_PCS2_DATAFLASH_CARD << 16;
                break;
        case 3:
-               mode = readl(AT91_BASE_SPI + AT91_SPI_MR);
-               mode &= 0xFFF0FFFF;
-               writel(mode | ((AT91_SPI_PCS3_DATAFLASH_CARD<<16) & AT91_SPI_PCS),
-                      AT91_BASE_SPI + AT91_SPI_MR);
+               mode |= AT91_SPI_PCS3_DATAFLASH_CARD << 16;
                break;
        }
 
+       writel(mode, ATMEL_BASE_SPI0 + AT91_SPI_MR);
+
        /* SPI_Enable */
-       writel(AT91_SPI_SPIEN, AT91_BASE_SPI + AT91_SPI_CR);
+       writel(AT91_SPI_SPIEN, ATMEL_BASE_SPI0 + AT91_SPI_CR);
 }
 
 unsigned int AT91F_SpiWrite1(AT91PS_DataflashDesc pDesc);
@@ -130,37 +131,48 @@ unsigned int AT91F_SpiWrite1(AT91PS_DataflashDesc pDesc);
 unsigned int AT91F_SpiWrite(AT91PS_DataflashDesc pDesc)
 {
        unsigned int timeout;
+       unsigned int timebase;
 
        pDesc->state = BUSY;
 
-       writel(AT91_SPI_TXTDIS + AT91_SPI_RXTDIS, AT91_BASE_SPI + AT91_SPI_PTCR);
+       writel(AT91_SPI_TXTDIS + AT91_SPI_RXTDIS,
+               ATMEL_BASE_SPI0 + AT91_SPI_PTCR);
 
        /* Initialize the Transmit and Receive Pointer */
-       writel((unsigned int)pDesc->rx_cmd_pt, AT91_BASE_SPI + AT91_SPI_RPR);
-       writel((unsigned int)pDesc->tx_cmd_pt, AT91_BASE_SPI + AT91_SPI_TPR);
+       writel((unsigned int)pDesc->rx_cmd_pt,
+               ATMEL_BASE_SPI0 + AT91_SPI_RPR);
+       writel((unsigned int)pDesc->tx_cmd_pt,
+               ATMEL_BASE_SPI0 + AT91_SPI_TPR);
 
        /* Intialize the Transmit and Receive Counters */
-       writel(pDesc->rx_cmd_size, AT91_BASE_SPI + AT91_SPI_RCR);
-       writel(pDesc->tx_cmd_size, AT91_BASE_SPI + AT91_SPI_TCR);
+       writel(pDesc->rx_cmd_size, ATMEL_BASE_SPI0 + AT91_SPI_RCR);
+       writel(pDesc->tx_cmd_size, ATMEL_BASE_SPI0 + AT91_SPI_TCR);
 
        if (pDesc->tx_data_size != 0) {
                /* Initialize the Next Transmit and Next Receive Pointer */
-               writel((unsigned int)pDesc->rx_data_pt, AT91_BASE_SPI + AT91_SPI_RNPR);
-               writel((unsigned int)pDesc->tx_data_pt, AT91_BASE_SPI + AT91_SPI_TNPR);
+               writel((unsigned int)pDesc->rx_data_pt,
+                       ATMEL_BASE_SPI0 + AT91_SPI_RNPR);
+               writel((unsigned int)pDesc->tx_data_pt,
+                       ATMEL_BASE_SPI0 + AT91_SPI_TNPR);
 
                /* Intialize the Next Transmit and Next Receive Counters */
-               writel(pDesc->rx_data_size, AT91_BASE_SPI + AT91_SPI_RNCR);
-               writel(pDesc->tx_data_size, AT91_BASE_SPI + AT91_SPI_TNCR);
+               writel(pDesc->rx_data_size,
+                       ATMEL_BASE_SPI0 + AT91_SPI_RNCR);
+               writel(pDesc->tx_data_size,
+                       ATMEL_BASE_SPI0 + AT91_SPI_TNCR);
        }
 
        /* arm simple, non interrupt dependent timer */
-       reset_timer_masked();
+       timebase = get_timer(0);
        timeout = 0;
 
-       writel(AT91_SPI_TXTEN + AT91_SPI_RXTEN, AT91_BASE_SPI + AT91_SPI_PTCR);
-       while (!(readl(AT91_BASE_SPI + AT91_SPI_SR) & AT91_SPI_RXBUFF) &&
-               ((timeout = get_timer_masked()) < CONFIG_SYS_SPI_WRITE_TOUT));
-       writel(AT91_SPI_TXTDIS + AT91_SPI_RXTDIS, AT91_BASE_SPI + AT91_SPI_PTCR);
+       writel(AT91_SPI_TXTEN + AT91_SPI_RXTEN,
+               ATMEL_BASE_SPI0 + AT91_SPI_PTCR);
+       while (!(readl(ATMEL_BASE_SPI0 + AT91_SPI_SR) & AT91_SPI_RXBUFF) &&
+               ((timeout = get_timer(timebase)) < CONFIG_SYS_SPI_WRITE_TOUT))
+               ;
+       writel(AT91_SPI_TXTDIS + AT91_SPI_RXTDIS,
+               ATMEL_BASE_SPI0 + AT91_SPI_PTCR);
        pDesc->state = IDLE;
 
        if (timeout >= CONFIG_SYS_SPI_WRITE_TOUT) {