]> git.kernelconcepts.de Git - karo-tx-uboot.git/blobdiff - board/nvidia/common/board.c
Tegra2: Add additional pin multiplexing features
[karo-tx-uboot.git] / board / nvidia / common / board.c
index 3d6c248479327e896fcc92722e51c00ec08b43ea..799dd3a629666afa7e2bc8186c052c91c09b9dab 100644 (file)
 #include <asm/arch/sys_proto.h>
 
 #include <asm/arch/clk_rst.h>
+#include <asm/arch/clock.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/uart.h>
 #include "board.h"
 
+#ifdef CONFIG_TEGRA2_MMC
+#include <mmc.h>
+#endif
+
 DECLARE_GLOBAL_DATA_PTR;
 
 const struct tegra2_sysinfo sysinfo = {
@@ -62,7 +67,6 @@ int board_early_init_f(void)
  */
 int timer_init(void)
 {
-       reset_timer();
        return 0;
 }
 
@@ -73,33 +77,28 @@ int timer_init(void)
 static void clock_init_uart(void)
 {
        struct clk_rst_ctlr *clkrst = (struct clk_rst_ctlr *)NV_PA_CLK_RST_BASE;
+       struct clk_pll *pll = &clkrst->crc_pll[CLOCK_PLL_ID_PERIPH];
        u32 reg;
 
-       reg = readl(&clkrst->crc_pllp_base);
+       reg = readl(&pll->pll_base);
        if (!(reg & PLL_BASE_OVRRIDE)) {
                /* Override pllp setup for 216MHz operation. */
-               reg = (PLL_BYPASS | PLL_BASE_OVRRIDE | PLL_DIVP);
-               reg |= (((NVRM_PLLP_FIXED_FREQ_KHZ/500) << 8) | PLL_DIVM);
-               writel(reg, &clkrst->crc_pllp_base);
+               reg = (PLL_BYPASS | PLL_BASE_OVRRIDE | PLL_DIVP_VALUE);
+               reg |= (((NVRM_PLLP_FIXED_FREQ_KHZ/500) << 8) | PLL_DIVM_VALUE);
+               writel(reg, &pll->pll_base);
 
                reg |= PLL_ENABLE;
-               writel(reg, &clkrst->crc_pllp_base);
+               writel(reg, &pll->pll_base);
 
                reg &= ~PLL_BYPASS;
-               writel(reg, &clkrst->crc_pllp_base);
+               writel(reg, &pll->pll_base);
        }
 
        /* Now do the UART reset/clock enable */
 #if defined(CONFIG_TEGRA2_ENABLE_UARTA)
-       /* Assert Reset to UART */
-       reg = readl(&clkrst->crc_rst_dev_l);
-       reg |= SWR_UARTA_RST;           /* SWR_UARTA_RST = 1 */
-       writel(reg, &clkrst->crc_rst_dev_l);
-
-       /* Enable clk to UART */
-       reg = readl(&clkrst->crc_clk_out_enb_l);
-       reg |= CLK_ENB_UARTA;           /* CLK_ENB_UARTA = 1 */
-       writel(reg, &clkrst->crc_clk_out_enb_l);
+       /* Assert UART reset and enable clock */
+       reset_set_enable(PERIPH_ID_UART1, 1);
+       clock_enable(PERIPH_ID_UART1);
 
        /* Enable pllp_out0 to UART */
        reg = readl(&clkrst->crc_clk_src_uarta);
@@ -110,20 +109,12 @@ static void clock_init_uart(void)
        udelay(2);
 
        /* De-assert reset to UART */
-       reg = readl(&clkrst->crc_rst_dev_l);
-       reg &= ~SWR_UARTA_RST;          /* SWR_UARTA_RST = 0 */
-       writel(reg, &clkrst->crc_rst_dev_l);
+       reset_set_enable(PERIPH_ID_UART1, 0);
 #endif /* CONFIG_TEGRA2_ENABLE_UARTA */
 #if defined(CONFIG_TEGRA2_ENABLE_UARTD)
-       /* Assert Reset to UART */
-       reg = readl(&clkrst->crc_rst_dev_u);
-       reg |= SWR_UARTD_RST;           /* SWR_UARTD_RST = 1 */
-       writel(reg, &clkrst->crc_rst_dev_u);
-
-       /* Enable clk to UART */
-       reg = readl(&clkrst->crc_clk_out_enb_u);
-       reg |= CLK_ENB_UARTD;           /* CLK_ENB_UARTD = 1 */
-       writel(reg, &clkrst->crc_clk_out_enb_u);
+       /* Assert UART reset and enable clock */
+       reset_set_enable(PERIPH_ID_UART4, 1);
+       clock_enable(PERIPH_ID_UART4);
 
        /* Enable pllp_out0 to UART */
        reg = readl(&clkrst->crc_clk_src_uartd);
@@ -134,9 +125,7 @@ static void clock_init_uart(void)
        udelay(2);
 
        /* De-assert reset to UART */
-       reg = readl(&clkrst->crc_rst_dev_u);
-       reg &= ~SWR_UARTD_RST;          /* SWR_UARTD_RST = 0 */
-       writel(reg, &clkrst->crc_rst_dev_u);
+       reset_set_enable(PERIPH_ID_UART4, 0);
 #endif /* CONFIG_TEGRA2_ENABLE_UARTD */
 }
 
@@ -154,22 +143,99 @@ static void pin_mux_uart(void)
        reg &= 0xFFF0FFFF;      /* IRRX_/IRTX_SEL [19:16] = 00 UARTA */
        writel(reg, &pmt->pmt_ctl_c);
 
-       reg = readl(&pmt->pmt_tri_a);
-       reg &= ~Z_IRRX;         /* Z_IRRX = normal (0) */
-       reg &= ~Z_IRTX;         /* Z_IRTX = normal (0) */
-       writel(reg, &pmt->pmt_tri_a);
+       pinmux_tristate_disable(PIN_IRRX);
+       pinmux_tristate_disable(PIN_IRTX);
 #endif /* CONFIG_TEGRA2_ENABLE_UARTA */
 #if defined(CONFIG_TEGRA2_ENABLE_UARTD)
        reg = readl(&pmt->pmt_ctl_b);
        reg &= 0xFFFFFFF3;      /* GMC_SEL [3:2] = 00, UARTD */
        writel(reg, &pmt->pmt_ctl_b);
 
-       reg = readl(&pmt->pmt_tri_a);
-       reg &= ~Z_GMC;          /* Z_GMC = normal (0) */
-       writel(reg, &pmt->pmt_tri_a);
+       pinmux_tristate_disable(PIN_GMC);
 #endif /* CONFIG_TEGRA2_ENABLE_UARTD */
 }
 
+/*
+ * Routine: clock_init_mmc
+ * Description: init the PLL and clocks for the SDMMC controllers
+ */
+static void clock_init_mmc(void)
+{
+       struct clk_rst_ctlr *clkrst = (struct clk_rst_ctlr *)NV_PA_CLK_RST_BASE;
+       u32 reg;
+
+       /* Do the SDMMC resets/clock enables */
+       reset_set_enable(PERIPH_ID_SDMMC4, 1);
+       clock_enable(PERIPH_ID_SDMMC4);
+
+       /* Enable pllp_out0 to SDMMC4 */
+       reg = readl(&clkrst->crc_clk_src_sdmmc4);
+       reg &= 0x3FFFFF00;      /* SDMMC4_CLK_SRC = 00, PLLP_OUT0 */
+       reg |= (10 << 1);       /* n-1, 11-1 shl 1 */
+       writel(reg, &clkrst->crc_clk_src_sdmmc4);
+
+       /*
+        * As per the Tegra2 TRM, section 5.3.4:
+        * 'Wait 2 us for the clock to flush through the pipe/logic'
+        */
+       udelay(2);
+
+       reset_set_enable(PERIPH_ID_SDMMC4, 1);
+
+       reset_set_enable(PERIPH_ID_SDMMC3, 1);
+       clock_enable(PERIPH_ID_SDMMC3);
+
+       /* Enable pllp_out0 to SDMMC4, set divisor to 11 for 20MHz */
+       reg = readl(&clkrst->crc_clk_src_sdmmc3);
+       reg &= 0x3FFFFF00;      /* SDMMC3_CLK_SRC = 00, PLLP_OUT0 */
+       reg |= (10 << 1);       /* n-1, 11-1 shl 1 */
+       writel(reg, &clkrst->crc_clk_src_sdmmc3);
+
+       /* wait for 2us */
+       udelay(2);
+
+       reset_set_enable(PERIPH_ID_SDMMC3, 0);
+}
+
+/*
+ * Routine: pin_mux_mmc
+ * Description: setup the pin muxes/tristate values for the SDMMC(s)
+ */
+static void pin_mux_mmc(void)
+{
+       struct pmux_tri_ctlr *pmt = (struct pmux_tri_ctlr *)NV_PA_APB_MISC_BASE;
+       u32 reg;
+
+       /* SDMMC4 */
+       /* config 2, x8 on 2nd set of pins */
+       reg = readl(&pmt->pmt_ctl_a);
+       reg |= (3 << 16);       /* ATB_SEL [17:16] = 11 SDIO4 */
+       writel(reg, &pmt->pmt_ctl_a);
+       reg = readl(&pmt->pmt_ctl_b);
+       reg |= (3 << 0);        /* GMA_SEL [1:0] = 11 SDIO4 */
+       writel(reg, &pmt->pmt_ctl_b);
+       reg = readl(&pmt->pmt_ctl_d);
+       reg |= (3 << 0);        /* GME_SEL [1:0] = 11 SDIO4 */
+       writel(reg, &pmt->pmt_ctl_d);
+
+       pinmux_tristate_disable(PIN_ATB);
+       pinmux_tristate_disable(PIN_GMA);
+       pinmux_tristate_disable(PIN_GME);
+
+       /* SDMMC3 */
+       /* SDIO3_CLK, SDIO3_CMD, SDIO3_DAT[3:0] */
+       reg = readl(&pmt->pmt_ctl_d);
+       reg &= 0xFFFF03FF;
+       reg |= (2 << 10);       /* SDB_SEL [11:10] = 01 SDIO3 */
+       reg |= (2 << 12);       /* SDC_SEL [13:12] = 01 SDIO3 */
+       reg |= (2 << 14);       /* SDD_SEL [15:14] = 01 SDIO3 */
+       writel(reg, &pmt->pmt_ctl_d);
+
+       pinmux_tristate_disable(PIN_SDC);
+       pinmux_tristate_disable(PIN_SDD);
+       pinmux_tristate_disable(PIN_SDB);
+}
+
 /*
  * Routine: clock_init
  * Description: Do individual peripheral clock reset/enables
@@ -205,8 +271,39 @@ int board_init(void)
 {
        /* boot param addr */
        gd->bd->bi_boot_params = (NV_PA_SDRAM_BASE + 0x100);
-       /* board id for Linux */
-       gd->bd->bi_arch_number = CONFIG_MACH_TYPE;
 
        return 0;
 }
+
+#ifdef CONFIG_TEGRA2_MMC
+/* this is a weak define that we are overriding */
+int board_mmc_init(bd_t *bd)
+{
+       debug("board_mmc_init called\n");
+       /* Enable clocks, muxes, etc. for SDMMC controllers */
+       clock_init_mmc();
+       pin_mux_mmc();
+
+       debug("board_mmc_init: init eMMC\n");
+       /* init dev 0, eMMC chip, with 4-bit bus */
+       tegra2_mmc_init(0, 4);
+
+       debug("board_mmc_init: init SD slot\n");
+       /* init dev 1, SD slot, with 4-bit bus */
+       tegra2_mmc_init(1, 4);
+
+       return 0;
+}
+
+/* this is a weak define that we are overriding */
+int board_mmc_getcd(u8 *cd, struct mmc *mmc)
+{
+       debug("board_mmc_getcd called\n");
+       /*
+        * Hard-code CD presence for now. Need to add GPIO inputs
+        * for Seaboard & Harmony (& Kaen/Aebl/Wario?)
+        */
+       *cd = 1;
+       return 0;
+}
+#endif