LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Marcel Ziswiler 2015-08-06 00:47:10 +02:00 committed by Tom Warren
parent baa6f0f1b1
commit 36a01bdd80
7 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/dts/tegra20-colibri.dts
View File

@ -36,11 +36,13 @@
}; };
usb@c5004000 { usb@c5004000 {
/* VBUS_LAN */
nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1) GPIO_ACTIVE_HIGH>; nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1) GPIO_ACTIVE_HIGH>;
nvidia,vbus-gpio = <&gpio TEGRA_GPIO(BB, 1) GPIO_ACTIVE_HIGH>; nvidia,vbus-gpio = <&gpio TEGRA_GPIO(BB, 1) GPIO_ACTIVE_HIGH>;
}; };
usb@c5008000 { usb@c5008000 {
/* USBH_PEN */
nvidia,vbus-gpio = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>; nvidia,vbus-gpio = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>;
}; };
@ -82,8 +84,8 @@
sdhci@c8000600 { sdhci@c8000600 {
status = "okay"; status = "okay";
cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>;
}; };
lcd_panel: panel { lcd_panel: panel {

2
arch/arm/dts/tegra30-colibri.dts
View File

@ -82,9 +82,9 @@
/* EHCI instance 1: USB2_DP/N -> AX88772B */ /* EHCI instance 1: USB2_DP/N -> AX88772B */
usb@7d004000 { usb@7d004000 {
status = "okay"; status = "okay";
phy_type = "utmi";
/* VBUS_LAN */ /* VBUS_LAN */
nvidia,vbus-gpio = <&gpio TEGRA_GPIO(DD, 2) GPIO_ACTIVE_HIGH>; nvidia,vbus-gpio = <&gpio TEGRA_GPIO(DD, 2) GPIO_ACTIVE_HIGH>;
phy_type = "utmi";
}; };
/* EHCI instance 2: USB3_DP/N -> USBH_P/N */ /* EHCI instance 2: USB3_DP/N -> USBH_P/N */

3
board/toradex/apalis_t30/apalis_t30.c
View File

@ -6,13 +6,13 @@
*/ */
#include <common.h> #include <common.h>
#include <dm.h>
#include <asm/arch/gp_padctrl.h> #include <asm/arch/gp_padctrl.h>
#include <asm/arch/pinmux.h> #include <asm/arch/pinmux.h>
#include <asm/arch-tegra/ap.h> #include <asm/arch-tegra/ap.h>
#include <asm/arch-tegra/tegra.h> #include <asm/arch-tegra/tegra.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/io.h> #include <asm/io.h>
#include <dm.h>
#include <i2c.h> #include <i2c.h>
#include <netdev.h> #include <netdev.h>
@ -59,6 +59,7 @@ int tegra_pcie_board_init(void)
debug("%s: Cannot find PMIC I2C chip\n", __func__); debug("%s: Cannot find PMIC I2C chip\n", __func__);
return err; return err;
} }
/* TPS659110: VDD2_OP_REG = 1.05V */ /* TPS659110: VDD2_OP_REG = 1.05V */
data[0] = 0x27; data[0] = 0x27;
addr = 0x25; addr = 0x25;

8
board/toradex/colibri_t30/colibri_t30.c
View File

@ -6,14 +6,14 @@
*/ */
#include <common.h> #include <common.h>
#include <asm/arch/pinmux.h>
#include <asm/arch/gp_padctrl.h> #include <asm/arch/gp_padctrl.h>
#include <asm/arch/pinmux.h>
#include <asm/arch-tegra/ap.h> #include <asm/arch-tegra/ap.h>
#include <asm/arch-tegra/tegra.h> #include <asm/arch-tegra/tegra.h>
#include <asm/io.h>
#include "pinmux-config-colibri_t30.h"
#include <i2c.h>
#include <asm/gpio.h> #include <asm/gpio.h>
#include <asm/io.h>
#include <i2c.h>
#include "pinmux-config-colibri_t30.h"
int arch_misc_init(void) int arch_misc_init(void)
{ {

6
include/configs/apalis_t30.h
View File

@ -1,6 +1,8 @@
/* /*
* Copyright (c) 2014-2015 Marcel Ziswiler * Copyright (c) 2014-2015 Marcel Ziswiler
* *
* Configuration settings for the Toradex Apalis T30 modules.
*
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */
@ -26,7 +28,7 @@
#define CONFIG_SYS_I2C_TEGRA #define CONFIG_SYS_I2C_TEGRA
#define CONFIG_CMD_I2C #define CONFIG_CMD_I2C
/* SD/MMC */ /* SD/MMC support */
#define CONFIG_MMC #define CONFIG_MMC
#define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA_MMC #define CONFIG_TEGRA_MMC
@ -38,7 +40,7 @@
#define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART 2 #define CONFIG_SYS_MMC_ENV_PART 2
/* USB Host support */ /* USB host support */
#define CONFIG_USB_EHCI #define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_TEGRA #define CONFIG_USB_EHCI_TEGRA
#define CONFIG_USB_MAX_CONTROLLER_COUNT 3 #define CONFIG_USB_MAX_CONTROLLER_COUNT 3

2
include/configs/colibri_t20.h
View File

@ -1,6 +1,8 @@
/* /*
* Copyright (C) 2012 Lucas Stach * Copyright (C) 2012 Lucas Stach
* *
* Configuration settings for the Toradex Colibri T20 modules.
*
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */

6
include/configs/colibri_t30.h
View File

@ -1,6 +1,8 @@
/* /*
* Copyright (c) 2013-2015 Stefan Agner * Copyright (c) 2013-2015 Stefan Agner
* *
* Configuration settings for the Toradex Colibri T30 modules.
*
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */
@ -26,7 +28,7 @@
#define CONFIG_SYS_I2C_TEGRA #define CONFIG_SYS_I2C_TEGRA
#define CONFIG_CMD_I2C #define CONFIG_CMD_I2C
/* SD/MMC */ /* SD/MMC support */
#define CONFIG_MMC #define CONFIG_MMC
#define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_MMC
#define CONFIG_TEGRA_MMC #define CONFIG_TEGRA_MMC
@ -38,7 +40,7 @@
#define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_ENV_PART 2 #define CONFIG_SYS_MMC_ENV_PART 2
/* USB Host support */ /* USB host support */
#define CONFIG_USB_EHCI #define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_TEGRA #define CONFIG_USB_EHCI_TEGRA
#define CONFIG_USB_MAX_CONTROLLER_COUNT 3 #define CONFIG_USB_MAX_CONTROLLER_COUNT 3