Re: [U-Boot] [PATCH v3 2/4] tegra2: Add common Avionic Design Tamonten support.
On Thu, Nov 17, 2011 at 2:10 AM, Thierry Reding
wrote:
> Tamonten is an NVIDIA Tegra2-based SO-DIMM processor module that is
> derived from the Harmony reference design.
>
> Changes in v3:
> * Remove unused gpio_config_uart().
> * Remove call to tegra2_start().
> * Use new tegra2_mmc_init().
>
> Signed-off-by: Thierry Reding
The SPI patch set cleans up this UART code, but it isn't applied yet,
so we will clean this up later.
Acked-by: Simon Glass
> ---
> board/avionic-design/common/tamonten.c | 160
>
> board/avionic-design/common/tamonten.h | 32 +++
> 2 files changed, 192 insertions(+), 0 deletions(-)
> create mode 100644 board/avionic-design/common/tamonten.c
> create mode 100644 board/avionic-design/common/tamonten.h
>
> diff --git a/board/avionic-design/common/tamonten.c
> b/board/avionic-design/common/tamonten.c
> new file mode 100644
> index 000..98aa0f8
> --- /dev/null
> +++ b/board/avionic-design/common/tamonten.c
> @@ -0,0 +1,160 @@
> +/*
> + * (C) Copyright 2010,2011
> + * NVIDIA Corporation
> + * (C) Copyright 2011
> + * Avionic Design GmbH
> + *
> + * 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
> + */
> +
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include "tamonten.h"
> +
> +#ifdef CONFIG_TEGRA2_MMC
> +#include
> +#endif
> +
> +DECLARE_GLOBAL_DATA_PTR;
> +
> +const struct tegra2_sysinfo sysinfo = {
> + CONFIG_TEGRA2_BOARD_STRING
> +};
> +
> +/*
> + * Routine: timer_init
> + * Description: init the timestamp and lastinc value
> + */
> +int timer_init(void)
> +{
> + return 0;
> +}
> +
> +static void enable_uart(enum periph_id pid)
> +{
> + /* Assert UART reset and enable clock */
> + reset_set_enable(pid, 1);
> + clock_enable(pid);
> + clock_ll_set_source(pid, 0); /* UARTx_CLK_SRC = 00, PLLP_OUT0 */
> +
> + /* wait for 2us */
> + udelay(2);
> +
> + /* De-assert reset to UART */
> + reset_set_enable(pid, 0);
> +}
> +
> +/*
> + * Routine: clock_init_uart
> + * Description: init the PLL and clock for the UART(s)
> + */
> +static void clock_init_uart(void)
> +{
> +#if defined(CONFIG_TEGRA2_ENABLE_UARTD)
> + enable_uart(PERIPH_ID_UART4);
> +#endif /* CONFIG_TEGRA2_ENABLE_UARTD */
> +}
> +
> +/*
> + * Routine: pin_mux_uart
> + * Description: setup the pin muxes/tristate values for the UART(s)
> + */
> +static void pin_mux_uart(void)
> +{
> +#if defined(CONFIG_TEGRA2_ENABLE_UARTD)
> + pinmux_set_func(PINGRP_GMC, PMUX_FUNC_UARTD);
> +
> + pinmux_tristate_disable(PINGRP_GMC);
> +#endif /* CONFIG_TEGRA2_ENABLE_UARTD */
> +}
> +
> +#ifdef CONFIG_TEGRA2_MMC
> +/*
> + * Routine: pin_mux_mmc
> + * Description: setup the pin muxes/tristate values for the SDMMC(s)
> + */
> +static void pin_mux_mmc(void)
> +{
> + /* SDMMC4: config 3, x8 on 2nd set of pins */
> + pinmux_set_func(PINGRP_ATB, PMUX_FUNC_SDIO4);
> + pinmux_set_func(PINGRP_GMA, PMUX_FUNC_SDIO4);
> + pinmux_set_func(PINGRP_GME, PMUX_FUNC_SDIO4);
> +
> + pinmux_tristate_disable(PINGRP_ATB);
> + pinmux_tristate_disable(PINGRP_GMA);
> + pinmux_tristate_disable(PINGRP_GME);
> +}
> +#endif
> +
> +/*
> + * Routine: board_init
> + * Description: Early hardware init.
> + */
> +int board_init(void)
> +{
> + clock_init();
> + clock_verify();
> +
> + /* boot param addr */
> + gd->bd->bi_boot_params = (NV_PA_SDRAM_BASE + 0x100);
> +
> + 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 muxes, etc. for SDMMC controllers */
> + pin_mux_mmc();
> + gpio_config_mmc();
> +
> + debug("board_mmc_init: init eMMC\n");
> + /* init dev 0, eMMC chip, with 4-bit bus */
> + tegra2_mmc_init(0, 4, -1, GPIO_PH2);
> +
> + return 0;
> +}
> +#endif
> +
> +#ifdef CONFIG_BOARD_EARLY_INIT_F
> +int board_early_init_f(void)
> +{
> + /* Initialize essential common plls */
> + clock_early_init();
> +
>
[U-Boot] [PATCH v3 2/4] tegra2: Add common Avionic Design Tamonten support.
Tamonten is an NVIDIA Tegra2-based SO-DIMM processor module that is
derived from the Harmony reference design.
Changes in v3:
* Remove unused gpio_config_uart().
* Remove call to tegra2_start().
* Use new tegra2_mmc_init().
Signed-off-by: Thierry Reding
---
board/avionic-design/common/tamonten.c | 160
board/avionic-design/common/tamonten.h | 32 +++
2 files changed, 192 insertions(+), 0 deletions(-)
create mode 100644 board/avionic-design/common/tamonten.c
create mode 100644 board/avionic-design/common/tamonten.h
diff --git a/board/avionic-design/common/tamonten.c
b/board/avionic-design/common/tamonten.c
new file mode 100644
index 000..98aa0f8
--- /dev/null
+++ b/board/avionic-design/common/tamonten.c
@@ -0,0 +1,160 @@
+/*
+ * (C) Copyright 2010,2011
+ * NVIDIA Corporation
+ * (C) Copyright 2011
+ * Avionic Design GmbH
+ *
+ * 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
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include "tamonten.h"
+
+#ifdef CONFIG_TEGRA2_MMC
+#include
+#endif
+
+DECLARE_GLOBAL_DATA_PTR;
+
+const struct tegra2_sysinfo sysinfo = {
+ CONFIG_TEGRA2_BOARD_STRING
+};
+
+/*
+ * Routine: timer_init
+ * Description: init the timestamp and lastinc value
+ */
+int timer_init(void)
+{
+ return 0;
+}
+
+static void enable_uart(enum periph_id pid)
+{
+ /* Assert UART reset and enable clock */
+ reset_set_enable(pid, 1);
+ clock_enable(pid);
+ clock_ll_set_source(pid, 0);/* UARTx_CLK_SRC = 00, PLLP_OUT0 */
+
+ /* wait for 2us */
+ udelay(2);
+
+ /* De-assert reset to UART */
+ reset_set_enable(pid, 0);
+}
+
+/*
+ * Routine: clock_init_uart
+ * Description: init the PLL and clock for the UART(s)
+ */
+static void clock_init_uart(void)
+{
+#if defined(CONFIG_TEGRA2_ENABLE_UARTD)
+ enable_uart(PERIPH_ID_UART4);
+#endif /* CONFIG_TEGRA2_ENABLE_UARTD */
+}
+
+/*
+ * Routine: pin_mux_uart
+ * Description: setup the pin muxes/tristate values for the UART(s)
+ */
+static void pin_mux_uart(void)
+{
+#if defined(CONFIG_TEGRA2_ENABLE_UARTD)
+ pinmux_set_func(PINGRP_GMC, PMUX_FUNC_UARTD);
+
+ pinmux_tristate_disable(PINGRP_GMC);
+#endif /* CONFIG_TEGRA2_ENABLE_UARTD */
+}
+
+#ifdef CONFIG_TEGRA2_MMC
+/*
+ * Routine: pin_mux_mmc
+ * Description: setup the pin muxes/tristate values for the SDMMC(s)
+ */
+static void pin_mux_mmc(void)
+{
+ /* SDMMC4: config 3, x8 on 2nd set of pins */
+ pinmux_set_func(PINGRP_ATB, PMUX_FUNC_SDIO4);
+ pinmux_set_func(PINGRP_GMA, PMUX_FUNC_SDIO4);
+ pinmux_set_func(PINGRP_GME, PMUX_FUNC_SDIO4);
+
+ pinmux_tristate_disable(PINGRP_ATB);
+ pinmux_tristate_disable(PINGRP_GMA);
+ pinmux_tristate_disable(PINGRP_GME);
+}
+#endif
+
+/*
+ * Routine: board_init
+ * Description: Early hardware init.
+ */
+int board_init(void)
+{
+ clock_init();
+ clock_verify();
+
+ /* boot param addr */
+ gd->bd->bi_boot_params = (NV_PA_SDRAM_BASE + 0x100);
+
+ 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 muxes, etc. for SDMMC controllers */
+ pin_mux_mmc();
+ gpio_config_mmc();
+
+ debug("board_mmc_init: init eMMC\n");
+ /* init dev 0, eMMC chip, with 4-bit bus */
+ tegra2_mmc_init(0, 4, -1, GPIO_PH2);
+
+ return 0;
+}
+#endif
+
+#ifdef CONFIG_BOARD_EARLY_INIT_F
+int board_early_init_f(void)
+{
+ /* Initialize essential common plls */
+ clock_early_init();
+
+ /* Initialize UART clocks */
+ clock_init_uart();
+
+ /* Initialize periph pinmuxes */
+ pin_mux_uart();
+
+ return 0;
+}
+#endif /* EARLY_INIT */
diff --git a/board/avionic-design/common/tamonten.h
b/board/avionic-design/common/tamonten.h
new file mode 100644
index 000..0e60b0f
--- /dev/null
+++ b/board/avionic-design/common/tamonten.h
@@ -0,0 +1,32 @@
+/*
+ * (C) Copyright 2010,2011
+ * NVIDIA Corporation
+ * (C) Copyright 2011
+ * Avionic Design GmbH
+ *
+ * See file CREDITS for
