From patchwork Wed Aug 5 22:47:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 504418 X-Patchwork-Delegate: twarren@nvidia.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id C9C7E1402AD for ; Thu, 6 Aug 2015 08:51:08 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0EC413A6B; Thu, 6 Aug 2015 00:50:55 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DMdZYAJRIska; Thu, 6 Aug 2015 00:50:54 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CCB723A43; Thu, 6 Aug 2015 00:50:42 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BE2893A41 for ; Thu, 6 Aug 2015 00:50:32 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EradUJUTP8tk for ; Thu, 6 Aug 2015 00:50:32 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by theia.denx.de (Postfix) with ESMTPS id 1DB4739C3 for ; Thu, 6 Aug 2015 00:50:25 +0200 (CEST) Received: from localhost.net ([62.167.132.2]) by mrelay.perfora.net (mreueus002) with ESMTPSA (Nemesis) id 0Mdtmd-1ZDYkU0p6T-00PZf5; Thu, 06 Aug 2015 00:50:23 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Thu, 6 Aug 2015 00:47:10 +0200 Message-Id: <2079de2e4d19e224616ecc406680b92f78526638.1438813726.git.marcel.ziswiler@toradex.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: References: X-Provags-ID: V03:K0:5zpMu7rU5aRgJdUdxODA9YOEooBRU/YXWmFt7xLKUVvGVqIbtf4 vWzi/9P+yDgjYTBzJPerSMYGwPBCACZkw4W3J9LioEqwqz6VpUWM9q/Sc1Gjfe6QkHD9Zb4 6BveePEBuMQf6bXwcRacpnKrV5T49FiiA/NFAhMLa4fiESsx4Jq6Rs60HlnC0FdVAmyJKMU aG6Yaz6W1KRDKrAE9RAjg== X-UI-Out-Filterresults: notjunk:1; V01:K0:nPDhj8YL0gk=:PqeR35DkmYHiKSSGEpV1Qs eSCHNLy7lo/YLsx1I89xCJhnYYJ1zSOchhKSbMoFG+Nc8TaGB1SXoxRslu0Ua1lOsw0viKkT0 m4tWttoH9ZgfB6DIphaNlDPQwnrVgcCpN5IPUwuwgnoM3sznR+SyNp/mqrhW7NkOQ7N/a7N45 +YOlmVJLoQop6b1KaQWppuxfmhBNdD4a9fPXuEIEwDXp3gjNlcg2TBq8rL8ilFEvPSH3cO/YK 780t48XQq+ovOENFG7kkMu2TNt56r5+dOOwZbm9uBBnIvBn7mmQLfSnjzGJmfCbg1vWG8cAvK m3FlC7SWxJ/d1hiY38zye4yJzKj5inCdbDErRg9SfSvFpDOCtn54c/ufBIEvukH7JPXq9dYBC eyEbdoRIUI0fTodvheL5pV73WL4Q82IdAdvZYrZPBQE4HOxo2htEBI1QbyNDk3wyYAE2/KZaN dpXdf/rsEc0gqAiaF9cYKcF8WeXXDHV0qBIYjV5092vnLY1VWV5a9iCO2/7pRITTDG1pWqsrT nEug+ffei3zYc7Y3qNC0YJzzVP3mdQbY9PcaD16CnNjdEJIpXextjIdYlLWOo2rElTLt3LNQW ZuCJ5oR4H06aSGLM126fMhkh2CEkrJf/122t1RUZIwtd6y/P8Yg/QlBywx4MevQDovsfWr9oX wJWmMcgqR7RiJcRSs+MVTL+IF Cc: Stefan Agner , Tom Rini , Marcel Ziswiler , Tom Warren , Scott Wood , Stephen Warren , Marcel Ziswiler Subject: [U-Boot] [PATCH v3 13/16] apalis/colibri_t20/30: clean-up X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Marcel Ziswiler 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 Acked-by: Stephen Warren --- 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 -#include #include #include #include #include #include #include +#include #include #include @@ -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 -#include #include +#include #include #include +#include #include -#include "pinmux-config-colibri_t30.h" #include -#include +#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 6b62883..f6185b3 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+ */ @@ -27,7 +29,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 @@ -39,10 +41,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 3b8b279..09065fa 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+ */ @@ -37,7 +39,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 @@ -64,7 +66,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 */ @@ -79,9 +81,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 484c970..b458b58 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+ */ @@ -27,7 +29,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 @@ -39,10 +41,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