From: Marcel Ziswiler <marcel.ziswi...@toradex.com>
Various clean-ups either in comments, order or spacing without any
functional impact:
- Add some comments in the device trees resp. reorder some parameters
for consistency across all our modules.
- Sort some include files alphabetically (while leaving common.h on
top of course).
- Streamline some comments in the configuration files and fix the
spacing from using spaces to tabs.
Signed-off-by: Marcel Ziswiler <marcel.ziswi...@toradex.com>
---
arch/arm/dts/tegra20-colibri.dts | 4 +++-
arch/arm/dts/tegra30-colibri.dts | 2 +-
board/toradex/apalis_t30/apalis_t30.c | 3 ++-
board/toradex/colibri_t30/colibri_t30.c | 6 +++---
include/configs/apalis_t30.h | 8 +++++---
include/configs/colibri_t20.h | 12 +++++++-----
include/configs/colibri_t30.h | 8 +++++---
7 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/arch/arm/dts/tegra20-colibri.dts b/arch/arm/dts/tegra20-colibri.dts
index 8eaac4f..f058d45 100644
--- a/arch/arm/dts/tegra20-colibri.dts
+++ b/arch/arm/dts/tegra20-colibri.dts
@@ -36,11 +36,13 @@
};
usb@c5004000 {
+ /* VBUS_LAN */
nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)
GPIO_ACTIVE_HIGH>;
nvidia,vbus-gpio = <&gpio TEGRA_GPIO(BB, 1) GPIO_ACTIVE_HIGH>;
};
usb@c5008000 {
+ /* USBH_PEN */
nvidia,vbus-gpio = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>;
};
@@ -82,8 +84,8 @@
sdhci@c8000600 {
status = "okay";
- cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>;
bus-width = <4>;
+ cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>;
};
lcd_panel: panel {
diff --git a/arch/arm/dts/tegra30-colibri.dts b/arch/arm/dts/tegra30-colibri.dts
index 36533dc..1da7260 100644
--- a/arch/arm/dts/tegra30-colibri.dts
+++ b/arch/arm/dts/tegra30-colibri.dts
@@ -82,9 +82,9 @@
/* EHCI instance 1: USB2_DP/N -> AX88772B */
usb@7d004000 {
status = "okay";
- phy_type = "utmi";
/* VBUS_LAN */
nvidia,vbus-gpio = <&gpio TEGRA_GPIO(DD, 2) GPIO_ACTIVE_HIGH>;
+ phy_type = "utmi";
};
/* EHCI instance 2: USB3_DP/N -> USBH_P/N */
diff --git a/board/toradex/apalis_t30/apalis_t30.c
b/board/toradex/apalis_t30/apalis_t30.c
index b7a2219..879006f 100644
--- a/board/toradex/apalis_t30/apalis_t30.c
+++ b/board/toradex/apalis_t30/apalis_t30.c
@@ -6,13 +6,13 @@
*/
#include <common.h>
-#include <dm.h>
#include <asm/arch/gp_padctrl.h>
#include <asm/arch/pinmux.h>
#include <asm/arch-tegra/ap.h>
#include <asm/arch-tegra/tegra.h>
#include <asm/gpio.h>
#include <asm/io.h>
+#include <dm.h>
#include <i2c.h>
#include <netdev.h>
@@ -59,6 +59,7 @@ int tegra_pcie_board_init(void)
debug("%s: Cannot find PMIC I2C chip\n", __func__);
return err;
}
+
/* TPS659110: VDD2_OP_REG = 1.05V */
data[0] = 0x27;
addr = 0x25;
diff --git a/board/toradex/colibri_t30/colibri_t30.c
b/board/toradex/colibri_t30/colibri_t30.c
index 7ca79eb..44b5beb 100644
--- a/board/toradex/colibri_t30/colibri_t30.c
+++ b/board/toradex/colibri_t30/colibri_t30.c
@@ -6,14 +6,14 @@
*/
#include <common.h>
-#include <asm/arch/pinmux.h>
#include <asm/arch/gp_padctrl.h>
+#include <asm/arch/pinmux.h>
#include <asm/arch-tegra/ap.h>
#include <asm/arch-tegra/tegra.h>
+#include <asm/gpio.h>
#include <asm/io.h>
-#include "pinmux-config-colibri_t30.h"
#include <i2c.h>
-#include <asm/gpio.h>
+#include "pinmux-config-colibri_t30.h"
int arch_misc_init(void)
{
diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index 8f7f833..7fc4bd9 100644
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -1,6 +1,8 @@
/*
* Copyright (c) 2014-2015 Marcel Ziswiler
*
+ * Configuration settings for the Toradex Apalis T30 modules.
+ *
* SPDX-License-Identifier: GPL-2.0+
*/
@@ -28,7 +30,7 @@
#define CONFIG_SYS_I2C_TEGRA
#define CONFIG_CMD_I2C
-/* SD/MMC */
+/* SD/MMC support */
#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA_MMC
@@ -40,10 +42,10 @@
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART 2
-/* USB Host support */
+/* USB host support */
#define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_TEGRA
-#define CONFIG_USB_MAX_CONTROLLER_COUNT 3
+#define CONFIG_USB_MAX_CONTROLLER_COUNT 3
#define CONFIG_USB_STORAGE
#define CONFIG_CMD_USB
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index 65c4bee..f068cfa 100644
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -1,6 +1,8 @@
/*
* Copyright (C) 2012 Lucas Stach
*
+ * Configuration settings for the Toradex Colibri T20 modules.
+ *
* SPDX-License-Identifier: GPL-2.0+
*/
@@ -38,7 +40,7 @@
#define CONFIG_USB_EHCI_TEGRA
#define CONFIG_USB_ULPI
#define CONFIG_USB_ULPI_VIEWPORT
-#define CONFIG_USB_MAX_CONTROLLER_COUNT 3
+#define CONFIG_USB_MAX_CONTROLLER_COUNT 3
#define CONFIG_USB_STORAGE
#define CONFIG_CMD_USB
@@ -65,7 +67,7 @@
/* NAND support */
#define CONFIG_CMD_NAND
#define CONFIG_TEGRA_NAND
-#define CONFIG_SYS_MAX_NAND_DEVICE 1
+#define CONFIG_SYS_MAX_NAND_DEVICE 1
/* Dynamic MTD partition support */
#define CONFIG_CMD_MTDPARTS /* Enable 'mtdparts' command line support */
@@ -80,9 +82,9 @@
/* 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)
+#define CONFIG_ENV_OFFSET (SZ_2M)
+#undef CONFIG_ENV_SIZE /* undef size from tegra20-common.h */
+#define CONFIG_ENV_SIZE (SZ_64K)
/* UBI */
#define CONFIG_CMD_BOOTZ
diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index f91c2e2..04fdc48 100644
--- a/include/configs/colibri_t30.h
+++ b/include/configs/colibri_t30.h
@@ -1,6 +1,8 @@
/*
* Copyright (c) 2013-2015 Stefan Agner
*
+ * Configuration settings for the Toradex Colibri T30 modules.
+ *
* SPDX-License-Identifier: GPL-2.0+
*/
@@ -28,7 +30,7 @@
#define CONFIG_SYS_I2C_TEGRA
#define CONFIG_CMD_I2C
-/* SD/MMC */
+/* SD/MMC support */
#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA_MMC
@@ -40,10 +42,10 @@
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART 2
-/* USB Host support */
+/* USB host support */
#define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_TEGRA
-#define CONFIG_USB_MAX_CONTROLLER_COUNT 3
+#define CONFIG_USB_MAX_CONTROLLER_COUNT 3
#define CONFIG_USB_STORAGE
#define CONFIG_CMD_USB
--
2.4.3
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
