[U-Boot] [PATCH v2] tegra: add Colibri T20 board support
This adds board support for the Toradex Colibri T20 module.
Working functions: - SD card boot - USB boot - Network - NAND environment
Signed-off-by: Lucas Stach dev@lynxeye.de CC: Stephen Warren swarren@wwwdotorg.org CC: Tom Warren twarren.nvidia@gmail.com --- v2: rename .dts file to match board name --- MAINTAINERS | 4 ++ board/toradex/colibri_t20/Makefile | 38 ++++++++++++++ board/toradex/colibri_t20/colibri_t20.c | 64 +++++++++++++++++++++++ board/toradex/dts/tegra20-colibri_t20.dts | 39 ++++++++++++++ boards.cfg | 1 + include/configs/colibri_t20.h | 84 +++++++++++++++++++++++++++++++ 6 Dateien geändert, 230 Zeilen hinzugefügt(+) create mode 100644 board/toradex/colibri_t20/Makefile create mode 100644 board/toradex/colibri_t20/colibri_t20.c create mode 100644 board/toradex/dts/tegra20-colibri_t20.dts create mode 100644 include/configs/colibri_t20.h
diff --git a/MAINTAINERS b/MAINTAINERS index a00e850..6b3e9a4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -890,6 +890,10 @@ Matt Sealey matt@genesi-usa.com Bo Shen voice.shen@atmel.com at91sam9x5ek ARM926EJS (AT91SAM9G15,G25,G35,X25,X35 SoC)
+Lucas Stach dev@lynxeye.de + + colibri_t20 Tegra20 (ARM7 & A9 Dual Core) + Nick Thompson nick.thompson@gefanuc.com
da830evm ARM926EJS (DA830/OMAP-L137) diff --git a/board/toradex/colibri_t20/Makefile b/board/toradex/colibri_t20/Makefile new file mode 100644 index 0000000..b8c61b6 --- /dev/null +++ b/board/toradex/colibri_t20/Makefile @@ -0,0 +1,38 @@ +# +# (C) Copyright 2012 Lucas Stach +# +# 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. +# +# + +include $(TOPDIR)/config.mk + +$(shell mkdir -p $(obj)../../nvidia/common) + +LIB = $(obj)lib$(BOARD).o + +COBJS := ../../nvidia/common/board.o +COBJS += $(BOARD).o + +SRCS := $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) + +$(LIB): $(obj).depend $(OBJS) + $(call cmd_link_o_target, $(OBJS)) + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +######################################################################### \ No newline at end of file diff --git a/board/toradex/colibri_t20/colibri_t20.c b/board/toradex/colibri_t20/colibri_t20.c new file mode 100644 index 0000000..0ad4311 --- /dev/null +++ b/board/toradex/colibri_t20/colibri_t20.c @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2010,2011 NVIDIA Corporation <www.nvidia.com> + * Copyright (C) 2012 Lucas Stach + * + * 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. + * + */ + +#include <common.h> +#include <asm/gpio.h> +#include <asm/arch/clock.h> +#include <asm/arch/funcmux.h> +#include <asm/arch/pinmux.h> +#include <asm/arch-tegra/board.h> +#include <asm/arch-tegra/sys_proto.h> +#include <asm/arch-tegra/tegra.h> + +#ifdef CONFIG_TEGRA_MMC +#include <asm/arch-tegra/mmc.h> +#endif + +#ifdef CONFIG_USB_EHCI_TEGRA +void pin_mux_usb(void) +{ + /* USB 1 aka Tegra USB port 3 */ + pinmux_tristate_disable(PINGRP_SPIG); + + /* USB 3 aka Tegra USB port 2 */ + funcmux_select(PERIPH_ID_USB2, FUNCMUX_USB2_ULPI); + pinmux_tristate_disable(PINGRP_UAC); + /* ULPI reference clock output */ + pinmux_set_func(PINGRP_CDEV2, PMUX_FUNC_PLLP_OUT4); + pinmux_tristate_disable(PINGRP_CDEV2); + /* VBus GPIO */ + pinmux_tristate_disable(PINGRP_DTE); +} +#endif + +#ifdef CONFIG_TEGRA_MMC +int board_mmc_init(bd_t *bd) +{ + funcmux_select(PERIPH_ID_SDMMC4, FUNCMUX_SDMMC4_ATB_GMA_4_BIT); + pinmux_tristate_disable(PINGRP_GMB); + + tegra_mmc_init(0, 4, -1, GPIO_PC7); + + return 0; +} +#endif + +#ifdef CONFIG_TEGRA_NAND +void pin_mux_nand(void) +{ + funcmux_select(PERIPH_ID_NDFLASH, FUNCMUX_NDFLASH_KBC_8_BIT); +} +#endif diff --git a/board/toradex/dts/tegra20-colibri_t20.dts b/board/toradex/dts/tegra20-colibri_t20.dts new file mode 100644 index 0000000..29db0c8 --- /dev/null +++ b/board/toradex/dts/tegra20-colibri_t20.dts @@ -0,0 +1,39 @@ +/dts-v1/; + +/include/ ARCH_CPU_DTS + +/ { + model = "Toradex Colibri T20"; + compatible = "toradex,t20", "nvidia,tegra20"; + + aliases { + /* This defines the order of our USB ports */ + usb0 = "/usb@c5008000"; + usb1 = "/usb@c5000000"; + usb2 = "/usb@c5004000"; + }; + + usb@c5000000 { + dr_mode = "otg"; + }; + + usb@c5004000 { + nvidia,phy-reset-gpio = <&gpio 169 0>; /* PV1 */ + nvidia,vbus-gpio = <&gpio 217 0>; /* PBB1 */ + }; + + usb@c5008000 { + nvidia,vbus-gpio = <&gpio 178 1>; /* PW2 low-active */ + }; + + nand-controller@70008000 { + nvidia,wp-gpios = <&gpio 144 0>; /* PS0 */ + nvidia,width = <8>; + nvidia,timing = <15 100 25 80 25 10 15 10 100>; + + nand@0 { + reg = <0>; + compatible = "nand-flash"; + }; + }; +}; diff --git a/boards.cfg b/boards.cfg index 4ae6656..1a33b44 100644 --- a/boards.cfg +++ b/boards.cfg @@ -270,6 +270,7 @@ harmony arm armv7:arm720t harmony nvidia seaboard arm armv7:arm720t seaboard nvidia tegra20 ventana arm armv7:arm720t ventana nvidia tegra20 whistler arm armv7:arm720t whistler nvidia tegra20 +colibri_t20 arm armv7:arm720t colibri_t20 toradex tegra20 u8500_href arm armv7 u8500 st-ericsson u8500 snowball arm armv7 snowball st-ericsson u8500 actux1_4_16 arm ixp actux1 - - actux1:FLASH2X2 diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h new file mode 100644 index 0000000..9958d5d --- /dev/null +++ b/include/configs/colibri_t20.h @@ -0,0 +1,84 @@ +/* + * Copyright (C) 2012 Lucas Stach + * + * 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. + * + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +#include "tegra20-common.h" + +/* Enable FDT support */ +#define CONFIG_DEFAULT_DEVICE_TREE tegra20-colibri_t20 +#define CONFIG_OF_CONTROL +#define CONFIG_OF_SEPARATE + +/* High-level configuration options */ +#define V_PROMPT "Tegra20 (Colibri) # " +#define CONFIG_TEGRA_BOARD_STRING "Toradex Colibri T20" + +/* Board-specific serial config */ +#define CONFIG_TEGRA_ENABLE_UARTA +#define CONFIG_TEGRA_UARTA_SDIO1 +#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE + +#define CONFIG_BOARD_EARLY_INIT_F + +/* SD/MMC support */ +#define CONFIG_MMC +#define CONFIG_GENERIC_MMC +#define CONFIG_TEGRA_MMC +#define CONFIG_CMD_MMC + +/* File system support */ +#define CONFIG_DOS_PARTITION +#define CONFIG_EFI_PARTITION +#define CONFIG_CMD_EXT2 +#define CONFIG_CMD_FAT + +/* USB host support */ +#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_TEGRA +#define CONFIG_USB_ULPI +#define CONFIG_USB_ULPI_VIEWPORT +#define CONFIG_USB_STORAGE +#define CONFIG_USB_MAX_CONTROLLER_COUNT 3 +#define CONFIG_CMD_USB + +/* USB networking support */ +#define CONFIG_USB_HOST_ETHER +#define CONFIG_USB_ETHER_ASIX +#define CONFIG_CMD_NET +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_NFS +#define CONFIG_CMD_PING + +/* NAND support */ +#define CONFIG_CMD_NAND +#define CONFIG_TEGRA_NAND +#define CONFIG_SYS_MAX_NAND_DEVICE 1 +#define CONFIG_SYS_NAND_BASE TEGRA20_NAND_BASE + +/* Environment in NAND, 64K is a bit excessive but erase block is 512K anyway */ +#define CONFIG_ENV_IS_IN_NAND +#define CONFIG_ENV_OFFSET (SZ_2M) +#undef CONFIG_ENV_SIZE /* undef size from tegra20-common.h */ +#define CONFIG_ENV_SIZE (SZ_64K) + +/* Debug commands */ +#define CONFIG_CMD_BDI +#define CONFIG_CMD_CACHE + +#include "tegra-common-post.h" + +#endif /* __CONFIG_H */
On 09/29/2012 02:03 PM, Lucas Stach wrote:
This adds board support for the Toradex Colibri T20 module.
Working functions:
- SD card boot
- USB boot
- Network
- NAND environment
diff --git a/board/toradex/colibri_t20/Makefile b/board/toradex/colibri_t20/Makefile
...
+######################################################################### \ No newline at end of file
I assume that's a mistake.
diff --git a/board/toradex/colibri_t20/colibri_t20.c b/board/toradex/colibri_t20/colibri_t20.c
+#ifdef CONFIG_USB_EHCI_TEGRA +void pin_mux_usb(void) +{
- /* USB 1 aka Tegra USB port 3 */
- pinmux_tristate_disable(PINGRP_SPIG);
I don't think that's muxing USB itself, but rather muxing perhaps the VBUS GPIO?
+#ifdef CONFIG_TEGRA_MMC +int board_mmc_init(bd_t *bd) +{
- funcmux_select(PERIPH_ID_SDMMC4, FUNCMUX_SDMMC4_ATB_GMA_4_BIT);
- pinmux_tristate_disable(PINGRP_GMB);
It might be useful to comment the tristate call like other boards, e.g.:
/* For power GPIO PI6 */ pinmux_tristate_disable(PINGRP_ATA);
so it's obvious why the call isn't done inside funcmux_select().
diff --git a/board/toradex/dts/tegra20-colibri_t20.dts b/board/toradex/dts/tegra20-colibri_t20.dts
- usb@c5008000 {
nvidia,vbus-gpio = <&gpio 178 1>; /* PW2 low-active */- };
As an FYI, although the GPIO bindings do specify that the last cell there is for GPIO flags, I'm not sure that we should rely on it. Not all GPIO bindings actually have the ability to specify flags there, so if a given board's GPIO is provided by some device whose GPIO binding doesn't allow for flags, then it won't be possible to specify an active-low GPIO, and this won't work.
The kernel certainly doesn't actually do anything with the flags argument in the EHCI driver, IIRC.
Either we should forcibly change all GPIO bindings in the kernel to require that they allow flags to be specified (probably very hard), or remove the flags from the Tegra GPIO binding, and use a separate property such as nvidia,vbus-gpio-active-low for this purpose. Certainly, the latter form of approach has been taken in other places (such as fixed regulator IIRC).
Am Montag, den 01.10.2012, 10:33 -0600 schrieb Stephen Warren:
On 09/29/2012 02:03 PM, Lucas Stach wrote:
This adds board support for the Toradex Colibri T20 module.
Working functions:
- SD card boot
- USB boot
- Network
- NAND environment
diff --git a/board/toradex/colibri_t20/Makefile b/board/toradex/colibri_t20/Makefile
...
+######################################################################### \ No newline at end of file
I assume that's a mistake.
Another one...
diff --git a/board/toradex/colibri_t20/colibri_t20.c b/board/toradex/colibri_t20/colibri_t20.c
+#ifdef CONFIG_USB_EHCI_TEGRA +void pin_mux_usb(void) +{
- /* USB 1 aka Tegra USB port 3 */
- pinmux_tristate_disable(PINGRP_SPIG);
I don't think that's muxing USB itself, but rather muxing perhaps the VBUS GPIO?
That's right. I'll do a comment to make this more obvious.
+#ifdef CONFIG_TEGRA_MMC +int board_mmc_init(bd_t *bd) +{
- funcmux_select(PERIPH_ID_SDMMC4, FUNCMUX_SDMMC4_ATB_GMA_4_BIT);
- pinmux_tristate_disable(PINGRP_GMB);
It might be useful to comment the tristate call like other boards, e.g.:
/* For power GPIO PI6 */ pinmux_tristate_disable(PINGRP_ATA);so it's obvious why the call isn't done inside funcmux_select().
diff --git a/board/toradex/dts/tegra20-colibri_t20.dts b/board/toradex/dts/tegra20-colibri_t20.dts
- usb@c5008000 {
nvidia,vbus-gpio = <&gpio 178 1>; /* PW2 low-active */- };
As an FYI, although the GPIO bindings do specify that the last cell there is for GPIO flags, I'm not sure that we should rely on it. Not all GPIO bindings actually have the ability to specify flags there, so if a given board's GPIO is provided by some device whose GPIO binding doesn't allow for flags, then it won't be possible to specify an active-low GPIO, and this won't work.
The kernel certainly doesn't actually do anything with the flags argument in the EHCI driver, IIRC.
Either we should forcibly change all GPIO bindings in the kernel to require that they allow flags to be specified (probably very hard), or remove the flags from the Tegra GPIO binding, and use a separate property such as nvidia,vbus-gpio-active-low for this purpose. Certainly, the latter form of approach has been taken in other places (such as fixed regulator IIRC).
You mentioned that your plan is to bring over the regulator thing from the kernel to u-boot. So IMHO the correct approach would be to just use a fixed regulator for VBUS, where we already have the active-low property in the binding.
So can we just let this sit as it is now, and agree to remove the GPIO active-low flag from the Tegra GPIO binding and every use of it as soon as we have proper regulators in u-boot?
Thanks for the review, Lucas
On 10/01/2012 10:48 AM, Lucas Stach wrote:
Am Montag, den 01.10.2012, 10:33 -0600 schrieb Stephen Warren:
On 09/29/2012 02:03 PM, Lucas Stach wrote:
This adds board support for the Toradex Colibri T20 module.
Working functions:
- SD card boot
- USB boot
- Network
- NAND environment
diff --git a/board/toradex/colibri_t20/Makefile b/board/toradex/colibri_t20/Makefile
...
+######################################################################### \ No newline at end of file
I assume that's a mistake.
Another one...
diff --git a/board/toradex/colibri_t20/colibri_t20.c b/board/toradex/colibri_t20/colibri_t20.c
+#ifdef CONFIG_USB_EHCI_TEGRA +void pin_mux_usb(void) +{
- /* USB 1 aka Tegra USB port 3 */
- pinmux_tristate_disable(PINGRP_SPIG);
I don't think that's muxing USB itself, but rather muxing perhaps the VBUS GPIO?
That's right. I'll do a comment to make this more obvious.
+#ifdef CONFIG_TEGRA_MMC +int board_mmc_init(bd_t *bd) +{
- funcmux_select(PERIPH_ID_SDMMC4, FUNCMUX_SDMMC4_ATB_GMA_4_BIT);
- pinmux_tristate_disable(PINGRP_GMB);
It might be useful to comment the tristate call like other boards, e.g.:
/* For power GPIO PI6 */ pinmux_tristate_disable(PINGRP_ATA);so it's obvious why the call isn't done inside funcmux_select().
diff --git a/board/toradex/dts/tegra20-colibri_t20.dts b/board/toradex/dts/tegra20-colibri_t20.dts
- usb@c5008000 {
nvidia,vbus-gpio = <&gpio 178 1>; /* PW2 low-active */- };
As an FYI, although the GPIO bindings do specify that the last cell there is for GPIO flags, I'm not sure that we should rely on it. Not all GPIO bindings actually have the ability to specify flags there, so if a given board's GPIO is provided by some device whose GPIO binding doesn't allow for flags, then it won't be possible to specify an active-low GPIO, and this won't work.
The kernel certainly doesn't actually do anything with the flags argument in the EHCI driver, IIRC.
Either we should forcibly change all GPIO bindings in the kernel to require that they allow flags to be specified (probably very hard), or remove the flags from the Tegra GPIO binding, and use a separate property such as nvidia,vbus-gpio-active-low for this purpose. Certainly, the latter form of approach has been taken in other places (such as fixed regulator IIRC).
You mentioned that your plan is to bring over the regulator thing from the kernel to u-boot. So IMHO the correct approach would be to just use a fixed regulator for VBUS, where we already have the active-low property in the binding.
Yes, that's true.
So can we just let this sit as it is now, and agree to remove the GPIO active-low flag from the Tegra GPIO binding and every use of it as soon as we have proper regulators in u-boot?
Hmmm. I guess. I wonder how likely it is that anyone is going to get around to cleaning up U-Boot's DT usage to match the kernel's though. At least I can file a bug for this once the kernel is update though, so hopefully it will happen. I do wish that U-Boot would start using generally agreed upon bindings rather than going its own way first and then having to be cleaned up though, although admittedly that comment doesn't directly apply to this case.
participants (2)
-
Lucas Stach -
Stephen Warren