]> git.kernelconcepts.de Git - karo-tx-uboot.git/blobdiff - board/esd/meesc/meesc.c
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
[karo-tx-uboot.git] / board / esd / meesc / meesc.c
index efba60df9948879c7ee41272b89b2d949d990740..c5994e0a4ae5e1a315ef6c1d32c66084c279bf8f 100644 (file)
@@ -1,42 +1,25 @@
 /*
  * (C) Copyright 2007-2008
- * Stelian Pop <stelian.pop@leadtechdesign.com>
+ * Stelian Pop <stelian@popies.net>
  * Lead Tech Design <www.leadtechdesign.com>
  *
- * (C) Copyright 2009
+ * (C) Copyright 2009-2011
  * Daniel Gorsulowski <daniel.gorsulowski@esd.eu>
  * esd electronic system design gmbh <www.esd.eu>
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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 <asm/arch/at91sam9263.h>
-#include <asm/arch/at91sam9_matrix.h>
+#include <asm/io.h>
+#include <asm/gpio.h>
 #include <asm/arch/at91sam9_smc.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91_pmc.h>
 #include <asm/arch/at91_rstc.h>
+#include <asm/arch/at91_matrix.h>
+#include <asm/arch/at91_pio.h>
 #include <asm/arch/clk.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/io.h>
 #include <netdev.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -52,10 +35,10 @@ int get_hw_rev(void)
        if (hw_rev >= 0)
                return hw_rev;
 
-       hw_rev = at91_get_gpio_value(AT91_PIN_PB19);
-       hw_rev |= at91_get_gpio_value(AT91_PIN_PB20) << 1;
-       hw_rev |= at91_get_gpio_value(AT91_PIN_PB21) << 2;
-       hw_rev |= at91_get_gpio_value(AT91_PIN_PB22) << 3;
+       hw_rev = at91_get_pio_value(AT91_PIO_PORTB, 19);
+       hw_rev |= at91_get_pio_value(AT91_PIO_PORTB, 20) << 1;
+       hw_rev |= at91_get_pio_value(AT91_PIO_PORTB, 21) << 2;
+       hw_rev |= at91_get_pio_value(AT91_PIO_PORTB, 22) << 3;
 
        if (hw_rev == 15)
                hw_rev = 0;
@@ -67,44 +50,44 @@ int get_hw_rev(void)
 static void meesc_nand_hw_init(void)
 {
        unsigned long csa;
+       at91_smc_t      *smc    = (at91_smc_t *) ATMEL_BASE_SMC0;
+       at91_matrix_t   *matrix = (at91_matrix_t *) ATMEL_BASE_MATRIX;
 
        /* Enable CS3 */
-       csa = at91_sys_read(AT91_MATRIX_EBI0CSA);
-       at91_sys_write(AT91_MATRIX_EBI0CSA,
-               csa | AT91_MATRIX_EBI0_CS3A_SMC_SMARTMEDIA);
+       csa = readl(&matrix->csa[0]) | AT91_MATRIX_CSA_EBI_CS3A;
+       writel(csa, &matrix->csa[0]);
 
        /* Configure SMC CS3 for NAND/SmartMedia */
-       at91_sys_write(AT91_SMC_SETUP(3),
-               AT91_SMC_NWESETUP_(1) | AT91_SMC_NCS_WRSETUP_(0) |
-               AT91_SMC_NRDSETUP_(1) | AT91_SMC_NCS_RDSETUP_(0));
-       at91_sys_write(AT91_SMC_PULSE(3),
-               AT91_SMC_NWEPULSE_(3) | AT91_SMC_NCS_WRPULSE_(3) |
-               AT91_SMC_NRDPULSE_(3) | AT91_SMC_NCS_RDPULSE_(3));
-       at91_sys_write(AT91_SMC_CYCLE(3),
-               AT91_SMC_NWECYCLE_(5) | AT91_SMC_NRDCYCLE_(5));
-       at91_sys_write(AT91_SMC_MODE(3),
-               AT91_SMC_READMODE | AT91_SMC_WRITEMODE |
-               AT91_SMC_EXNWMODE_DISABLE |
-#ifdef CONFIG_SYS_NAND_DBW_16
-               AT91_SMC_DBW_16 |
-#else /* CONFIG_SYS_NAND_DBW_8 */
-               AT91_SMC_DBW_8 |
-#endif
-               AT91_SMC_TDF_(2));
+       writel(AT91_SMC_SETUP_NWE(1) | AT91_SMC_SETUP_NCS_WR(1) |
+               AT91_SMC_SETUP_NRD(2) | AT91_SMC_SETUP_NCS_RD(2),
+               &smc->cs[3].setup);
+
+       writel(AT91_SMC_PULSE_NWE(3) | AT91_SMC_PULSE_NCS_WR(3) |
+               AT91_SMC_PULSE_NRD(3) | AT91_SMC_PULSE_NCS_RD(3),
+               &smc->cs[3].pulse);
+
+       writel(AT91_SMC_CYCLE_NWE(6) | AT91_SMC_CYCLE_NRD(6),
+               &smc->cs[3].cycle);
+       writel(AT91_SMC_MODE_RM_NRD | AT91_SMC_MODE_WM_NWE |
+               AT91_SMC_MODE_EXNW_DISABLE |
+               AT91_SMC_MODE_DBW_8 |
+               AT91_SMC_MODE_TDF_CYCLE(12),
+               &smc->cs[3].mode);
 
        /* Configure RDY/BSY */
-       at91_set_gpio_input(CONFIG_SYS_NAND_READY_PIN, 1);
+       gpio_direction_input(CONFIG_SYS_NAND_READY_PIN);
 
        /* Enable NandFlash */
-       at91_set_gpio_output(CONFIG_SYS_NAND_ENABLE_PIN, 1);
+       gpio_direction_output(CONFIG_SYS_NAND_ENABLE_PIN, 1);
 }
 #endif /* CONFIG_CMD_NAND */
 
 #ifdef CONFIG_MACB
 static void meesc_macb_hw_init(void)
 {
+       at91_pmc_t      *pmc    = (at91_pmc_t *) ATMEL_BASE_PMC;
        /* Enable clock */
-       at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9263_ID_EMAC);
+       writel(1 << ATMEL_ID_EMAC, &pmc->pcer);
        at91_macb_hw_init();
 }
 #endif
@@ -117,32 +100,34 @@ static void meesc_macb_hw_init(void)
  */
 static void meesc_ethercat_hw_init(void)
 {
+       at91_smc_t      *smc1   = (at91_smc_t *) ATMEL_BASE_SMC1;
+
        /* Configure SMC EBI1_CS0 for EtherCAT */
-       at91_sys_write(AT91_SMC1_SETUP(0),
-               AT91_SMC_NWESETUP_(0) | AT91_SMC_NCS_WRSETUP_(0) |
-               AT91_SMC_NRDSETUP_(0) | AT91_SMC_NCS_RDSETUP_(0));
-       at91_sys_write(AT91_SMC1_PULSE(0),
-               AT91_SMC_NWEPULSE_(4) | AT91_SMC_NCS_WRPULSE_(9) |
-               AT91_SMC_NRDPULSE_(4) | AT91_SMC_NCS_RDPULSE_(9));
-       at91_sys_write(AT91_SMC1_CYCLE(0),
-               AT91_SMC_NWECYCLE_(10) | AT91_SMC_NRDCYCLE_(5));
+       writel(AT91_SMC_SETUP_NWE(0) | AT91_SMC_SETUP_NCS_WR(0) |
+               AT91_SMC_SETUP_NRD(0) | AT91_SMC_SETUP_NCS_RD(0),
+               &smc1->cs[0].setup);
+       writel(AT91_SMC_PULSE_NWE(4) | AT91_SMC_PULSE_NCS_WR(9) |
+               AT91_SMC_PULSE_NRD(5) | AT91_SMC_PULSE_NCS_RD(9),
+               &smc1->cs[0].pulse);
+       writel(AT91_SMC_CYCLE_NWE(10) | AT91_SMC_CYCLE_NRD(6),
+               &smc1->cs[0].cycle);
        /*
         * Configure behavior at external wait signal, byte-select mode, 16 bit
         * data bus width, none data float wait states and TDF optimization
         */
-       at91_sys_write(AT91_SMC1_MODE(0),
-               AT91_SMC_READMODE | AT91_SMC_EXNWMODE_READY |
-               AT91_SMC_BAT_SELECT | AT91_SMC_DBW_16 | AT91_SMC_TDF_(0) |
-               AT91_SMC_TDFMODE);
+       writel(AT91_SMC_MODE_RM_NRD | AT91_SMC_MODE_EXNW_READY |
+               AT91_SMC_MODE_DBW_16 | AT91_SMC_MODE_TDF_CYCLE(0) |
+               AT91_SMC_MODE_TDF, &smc1->cs[0].mode);
 
        /* Configure RDY/BSY */
-       at91_set_B_periph(AT91_PIN_PE20, 0);    /* EBI1_NWAIT */
+       at91_set_b_periph(AT91_PIO_PORTE, 20, 0);       /* EBI1_NWAIT */
 }
 
 int dram_init(void)
 {
-       gd->bd->bi_dram[0].start = PHYS_SDRAM;
-       gd->bd->bi_dram[0].size = get_ram_size((long *) PHYS_SDRAM, (1 << 27));
+       gd->ram_size = get_ram_size(
+               (void *)CONFIG_SYS_SDRAM_BASE,
+               CONFIG_SYS_SDRAM_SIZE);
        return 0;
 }
 
@@ -150,7 +135,7 @@ int board_eth_init(bd_t *bis)
 {
        int rc = 0;
 #ifdef CONFIG_MACB
-       rc = macb_eth_initialize(0, (void *)AT91SAM9263_BASE_EMAC, 0x00);
+       rc = macb_eth_initialize(0, (void *)ATMEL_BASE_EMAC, 0x00);
 #endif
        return rc;
 }
@@ -175,7 +160,7 @@ int checkboard(void)
                gd->bd->bi_arch_number = MACH_TYPE_ETHERCAN2;
                puts("Board: EtherCAN/2 Gateway");
                /* switch on LED1D */
-               at91_set_gpio_output(AT91_PIN_PB12, 1);
+               at91_set_pio_output(AT91_PIO_PORTB, 12, 1);
                break;
        default:
                /* assume, no ET1100 present, arch number of EtherCAN/2-Board */
@@ -184,7 +169,7 @@ int checkboard(void)
                puts("Board: EtherCAN/2 Gateway");
                break;
        }
-       if (getenv_r("serial#", str, sizeof(str)) > 0) {
+       if (getenv_f("serial#", str, sizeof(str)) > 0) {
                puts(", serial# ");
                puts(str);
        }
@@ -219,20 +204,54 @@ u32 get_board_rev(void)
 }
 #endif
 
-int board_init(void)
+#ifdef CONFIG_MISC_INIT_R
+int misc_init_r(void)
 {
-       /* Peripheral Clock Enable Register */
-       at91_sys_write(AT91_PMC_PCER,   1 << AT91SAM9263_ID_PIOA |
-                                       1 << AT91SAM9263_ID_PIOB |
-                                       1 << AT91SAM9263_ID_PIOCDE);
+       char            *str;
+       char            buf[32];
+       at91_pmc_t      *pmc = (at91_pmc_t *) ATMEL_BASE_PMC;
+
+       /*
+        * Normally the processor clock has a divisor of 2.
+        * In some cases this this needs to be set to 4.
+        * Check the user has set environment mdiv to 4 to change the divisor.
+        */
+       if ((str = getenv("mdiv")) && (strcmp(str, "4") == 0)) {
+               writel((readl(&pmc->mckr) & ~AT91_PMC_MDIV) |
+                       AT91SAM9_PMC_MDIV_4, &pmc->mckr);
+               at91_clock_init(CONFIG_SYS_AT91_MAIN_CLOCK);
+               serial_setbrg();
+               /* Notify the user that the clock is not default */
+               printf("Setting master clock to %s MHz\n",
+                       strmhz(buf, get_mck_clk_rate()));
+       }
 
+       return 0;
+}
+#endif /* CONFIG_MISC_INIT_R */
+
+int board_early_init_f(void)
+{
+       at91_pmc_t      *pmc    = (at91_pmc_t *) ATMEL_BASE_PMC;
+
+       /* enable all clocks */
+       writel((1 << ATMEL_ID_PIOA) | (1 << ATMEL_ID_PIOB) |
+               (1 << ATMEL_ID_PIOCDE) | (1 << ATMEL_ID_UHP),
+               &pmc->pcer);
+
+       at91_seriald_hw_init();
+
+       return 0;
+}
+
+int board_init(void)
+{
        /* initialize ET1100 Controller */
        meesc_ethercat_hw_init();
 
        /* adress of boot parameters */
-       gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
+       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
 
-       at91_serial_hw_init();
 #ifdef CONFIG_CMD_NAND
        meesc_nand_hw_init();
 #endif
@@ -244,6 +263,9 @@ int board_init(void)
 #endif
 #ifdef CONFIG_AT91_CAN
        at91_can_hw_init();
+#endif
+#ifdef CONFIG_USB_OHCI_NEW
+       at91_uhp_hw_init();
 #endif
        return 0;
 }