Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 23:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

ARM: tegra: get rid of colibri_t20-common

Browse source 
As a preparatory step to renaming the board folder as well first get
rid of the colibri_t20-common after having integrated it into
colibri_t20_iris for now.

While at it also migrate to using NVIDIA's common.mk magic.

Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
This commit is contained in:
Marcel Ziswiler 2015-03-26 01:31:53 +01:00 committed by Tom Warren
parent 37220efab8
commit d1db97aaa4
4 changed files with 31 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
board/toradex/colibri_t20-common/colibri_t20-common.c
View file

@ -1,35 +0,0 @@
/*
* Copyright (C) 2012 Lucas Stach
*
* SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
#include <asm/arch/clock.h>
#include <asm/arch/funcmux.h>
#include <asm/arch/pinmux.h>
#include <asm/arch-tegra/board.h>
#include "colibri_t20-common.h"
#ifdef CONFIG_USB_EHCI_TEGRA
void colibri_t20_common_pin_mux_usb(void)
{
/* module internal USB bus to connect ethernet chipset */
funcmux_select(PERIPH_ID_USB2, FUNCMUX_USB2_ULPI);
/* ULPI reference clock output */
pinmux_set_func(PMUX_PINGRP_CDEV2, PMUX_FUNC_PLLP_OUT4);
pinmux_tristate_disable(PMUX_PINGRP_CDEV2);
/* PHY reset GPIO */
pinmux_tristate_disable(PMUX_PINGRP_UAC);
/* VBus GPIO */
pinmux_tristate_disable(PMUX_PINGRP_DTE);
}
#endif
#ifdef CONFIG_TEGRA_NAND
void pin_mux_nand(void)
{
funcmux_select(PERIPH_ID_NDFLASH, FUNCMUX_NDFLASH_KBC_8_BIT);
}
#endif

7
board/toradex/colibri_t20-common/colibri_t20-common.h
View file

@ -1,7 +0,0 @@
/*
* Copyright (C) 2012 Lucas Stach
*
* SPDX-License-Identifier: GPL-2.0+
*/
void colibri_t20_common_pin_mux_usb(void);

4
board/toradex/colibri_t20_iris/Makefile
View file

@ -4,6 +4,6 @@
# SPDX-License-Identifier: GPL-2.0+
#
obj-y := ../../nvidia/common/board.o
obj-y += ../colibri_t20-common/colibri_t20-common.o
include $(srctree)/board/nvidia/common/common.mk
obj-y += colibri_t20_iris.o

42
board/toradex/colibri_t20_iris/colibri_t20_iris.c
View file

@ -5,23 +5,11 @@
*/
#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 "../colibri_t20-common/colibri_t20-common.h"
#ifdef CONFIG_USB_EHCI_TEGRA
void pin_mux_usb(void)
{
colibri_t20_common_pin_mux_usb();
/* USB 1 aka Tegra USB port 3 VBus*/
pinmux_tristate_disable(PMUX_PINGRP_SPIG);
}
#endif
#include <asm/gpio.h>
#ifdef CONFIG_TEGRA_MMC
/*
@ -34,3 +22,31 @@ void pin_mux_mmc(void)
pinmux_tristate_disable(PMUX_PINGRP_GMB);
}
#endif
#ifdef CONFIG_TEGRA_NAND
void pin_mux_nand(void)
{
funcmux_select(PERIPH_ID_NDFLASH, FUNCMUX_NDFLASH_KBC_8_BIT);
}
#endif
#ifdef CONFIG_USB_EHCI_TEGRA
void pin_mux_usb(void)
{
/* module internal USB bus to connect ethernet chipset */
funcmux_select(PERIPH_ID_USB2, FUNCMUX_USB2_ULPI);
/* ULPI reference clock output */
pinmux_set_func(PMUX_PINGRP_CDEV2, PMUX_FUNC_PLLP_OUT4);
pinmux_tristate_disable(PMUX_PINGRP_CDEV2);
/* PHY reset GPIO */
pinmux_tristate_disable(PMUX_PINGRP_UAC);
/* VBus GPIO */
pinmux_tristate_disable(PMUX_PINGRP_DTE);
/* USB 1 aka Tegra USB port 3 VBus */
pinmux_tristate_disable(PMUX_PINGRP_SPIG);
}
#endif