diff mbox

[U-Boot,3/5] ARM: tegra: get rid of colibri_t20-common

Message ID 9337b51af75334d2afff1d81782aa78411eccdbb.1427130862.git.marcel@ziswiler.com
State Superseded
Delegated to: Tom Warren
Headers show

Commit Message

Marcel Ziswiler March 23, 2015, 5:28 p.m. UTC 
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.
---
 .../colibri_t20-common/colibri_t20-common.h        |  7 -----
 board/toradex/colibri_t20_iris/Makefile            |  4 +--
 .../colibri_t20_iris.c}                            | 33 ++++++++++++++++------
 3 files changed, 27 insertions(+), 17 deletions(-)
 delete mode 100644 board/toradex/colibri_t20-common/colibri_t20-common.h
 rename board/toradex/{colibri_t20-common/colibri_t20-common.c => colibri_t20_iris/colibri_t20_iris.c} (65%)

Comments

Stephen Warren March 23, 2015, 7:42 p.m. UTC | #1 
On 03/23/2015 11:28 AM, Marcel Ziswiler wrote:
> 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.

Is it possible to separate the removal of colibri_t20-common into a 
separate commit from the renames, so that the two are lumped together.

I'd rather expect this series to have two commits:

1) Remove colibri_t20-common and move the C code into the board file.

2) Everything related to the rename.
diff mbox

Patch

diff --git a/board/toradex/colibri_t20-common/colibri_t20-common.h b/board/toradex/colibri_t20-common/colibri_t20-common.h
deleted file mode 100644
index 1fe53f6..0000000
--- a/board/toradex/colibri_t20-common/colibri_t20-common.h
+++ /dev/null
@@ -1,7 +0,0 @@ 
-/*
- *  Copyright (C) 2012 Lucas Stach
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-void colibri_t20_common_pin_mux_usb(void);
diff --git a/board/toradex/colibri_t20_iris/Makefile b/board/toradex/colibri_t20_iris/Makefile
index ebeac70..f286aec 100644
--- a/board/toradex/colibri_t20_iris/Makefile
+++ b/board/toradex/colibri_t20_iris/Makefile
@@ -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
diff --git a/board/toradex/colibri_t20-common/colibri_t20-common.c b/board/toradex/colibri_t20_iris/colibri_t20_iris.c
similarity index 65%
rename from board/toradex/colibri_t20-common/colibri_t20-common.c
rename to board/toradex/colibri_t20_iris/colibri_t20_iris.c
index 58a9916..4656094 100644
--- a/board/toradex/colibri_t20-common/colibri_t20-common.c
+++ b/board/toradex/colibri_t20_iris/colibri_t20_iris.c
@@ -9,27 +9,44 @@ 
 #include <asm/arch/funcmux.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch-tegra/board.h>
+#include <asm/gpio.h>
 
-#include "colibri_t20-common.h"
+#ifdef CONFIG_TEGRA_MMC
+/*
+ * Routine: pin_mux_mmc
+ * Description: setup the pin muxes/tristate values for the SDMMC(s)
+ */
+void pin_mux_mmc(void)
+{
+	funcmux_select(PERIPH_ID_SDMMC4, FUNCMUX_SDMMC4_ATB_GMA_4_BIT);
+	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 colibri_t20_common_pin_mux_usb(void)
+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);
-}
-#endif
 
-#ifdef CONFIG_TEGRA_NAND
-void pin_mux_nand(void)
-{
-	funcmux_select(PERIPH_ID_NDFLASH, FUNCMUX_NDFLASH_KBC_8_BIT);
+	/* USB 1 aka Tegra USB port 3 VBus */
+	pinmux_tristate_disable(PMUX_PINGRP_SPIG);
 }
 #endif