apalis/colibri_t20/30: clean-up

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.ziswiler@toradex.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>

diff --git a/arch/arm/dts/tegra20-colibri.dts b/arch/arm/dts/tegra20-colibri.dts
index 8eaac4f5a5fd16744c175b18cb1a0fb48363c444..f058d45c5ca8fcf2bb8ba68d0e1f1c49e777779b 100644 (file)
--- 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 36533dc840a31acbd4d461d95c93d314f41b223c..1da726029517634520a70e1c62c0de4b86da6e13 100644 (file)
--- 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 b7a221902b9d668cb6c158b143232bd55554e406..879006f8e05623f24de7cb0dc23a8e9bf093c6bc 100644 (file)
--- 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 7ca79eb7f98e1b229511aca27aec5282566ff919..44b5beb92832ceb3a53621b68029de490146a3ee 100644 (file)
--- 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 27c013baba8442a82d83301e90fc22fb64d80e43..6c0ae22df9fa3883a4a91a5beb695aa9385309fb 100644 (file)
--- 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+
  */
 
@@ -26,7 +28,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
@@ -38,10 +40,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 09a65d544d0f2c6e09e781665ed545c12ac4e577..7611fc5004cc890f6cd2b0b4f8a9c797ca84560b 100644 (file)
--- 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+
  */
 
@@ -36,7 +38,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
 
@@ -63,7 +65,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 */
@@ -78,9 +80,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 25885d4431355acdce5e14e51eac9c0d3f19efc5..ef743b0d33cc5749f469e01e0699d17550e0a7b7 100644 (file)
--- 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+
  */
 
@@ -26,7 +28,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
@@ -38,10 +40,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