From: Stephen Warren swarren@nvidia.com
The order is general includes, general asm includes, arch asm includes, local files.
Signed-off-by: Stephen Warren swarren@nvidia.com --- board/avionic-design/common/tamonten-ng.c | 5 +++-- board/nvidia/cardhu/cardhu.c | 6 +++--- board/nvidia/jetson-tk1/jetson-tk1.c | 4 +--- board/nvidia/nyan-big/nyan-big.c | 6 +++--- board/nvidia/p2571/p2571.c | 4 ++-- board/nvidia/seaboard/seaboard.c | 6 +++--- board/toradex/colibri_t20/colibri_t20.c | 6 +++--- board/toradex/colibri_t30/colibri_t30.c | 6 +++--- 8 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/board/avionic-design/common/tamonten-ng.c b/board/avionic-design/common/tamonten-ng.c index 170462711264..352f5d7ba5d1 100644 --- a/board/avionic-design/common/tamonten-ng.c +++ b/board/avionic-design/common/tamonten-ng.c @@ -1,18 +1,19 @@ /* * (C) Copyright 2013 * Avionic Design GmbH <www.avionic-design.de> + * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. * * SPDX-License-Identifier: GPL-2.0+ */
#include <common.h> #include <dm.h> +#include <i2c.h> +#include <asm/gpio.h> #include <asm/arch/pinmux.h> #include <asm/arch/gp_padctrl.h> #include <asm/arch/gpio.h> -#include <asm/gpio.h> #include "pinmux-config-tamonten-ng.h" -#include <i2c.h>
#define PMU_I2C_ADDRESS 0x2D
diff --git a/board/nvidia/cardhu/cardhu.c b/board/nvidia/cardhu/cardhu.c index ba15e2e6cf0c..ffa74a3e8acb 100644 --- a/board/nvidia/cardhu/cardhu.c +++ b/board/nvidia/cardhu/cardhu.c @@ -1,5 +1,5 @@ /* - * (C) Copyright 2010-2013 + * (C) Copyright 2010-2016 * NVIDIA Corporation <www.nvidia.com> * * SPDX-License-Identifier: GPL-2.0+ @@ -7,12 +7,12 @@
#include <common.h> #include <dm.h> +#include <i2c.h> +#include <asm/gpio.h> #include <asm/arch/pinmux.h> #include <asm/arch/gp_padctrl.h> #include <asm/arch/gpio.h> -#include <asm/gpio.h> #include "pinmux-config-cardhu.h" -#include <i2c.h>
#define PMU_I2C_ADDRESS 0x2D #define MAX_I2C_RETRY 3 diff --git a/board/nvidia/jetson-tk1/jetson-tk1.c b/board/nvidia/jetson-tk1/jetson-tk1.c index a66b710cddab..05f847e7f430 100644 --- a/board/nvidia/jetson-tk1/jetson-tk1.c +++ b/board/nvidia/jetson-tk1/jetson-tk1.c @@ -1,5 +1,5 @@ /* - * (C) Copyright 2014 + * (C) Copyright 2014-2016 * NVIDIA Corporation <www.nvidia.com> * * SPDX-License-Identifier: GPL-2.0+ @@ -7,10 +7,8 @@
#include <common.h> #include <power/as3722.h> - #include <asm/arch/gpio.h> #include <asm/arch/pinmux.h> - #include "pinmux-config-jetson-tk1.h"
DECLARE_GLOBAL_DATA_PTR; diff --git a/board/nvidia/nyan-big/nyan-big.c b/board/nvidia/nyan-big/nyan-big.c index ba964018901a..8fef0d3d91a9 100644 --- a/board/nvidia/nyan-big/nyan-big.c +++ b/board/nvidia/nyan-big/nyan-big.c @@ -1,5 +1,5 @@ /* - * (C) Copyright 2014 + * (C) Copyright 2014-2016 * NVIDIA Corporation <www.nvidia.com> * * SPDX-License-Identifier: GPL-2.0+ @@ -7,6 +7,8 @@
#include <common.h> #include <errno.h> +#include <power/as3722.h> +#include <power/pmic.h> #include <asm/gpio.h> #include <asm/io.h> #include <asm/arch/pinmux.h> @@ -14,8 +16,6 @@ #include <asm/arch/mc.h> #include <asm/arch-tegra/clk_rst.h> #include <asm/arch-tegra/pmc.h> -#include <power/as3722.h> -#include <power/pmic.h> #include "pinmux-config-nyan-big.h"
/* diff --git a/board/nvidia/p2571/p2571.c b/board/nvidia/p2571/p2571.c index d80a7d0d3e31..32c8da552b85 100644 --- a/board/nvidia/p2571/p2571.c +++ b/board/nvidia/p2571/p2571.c @@ -1,5 +1,5 @@ /* - * (C) Copyright 2013-2015 + * (C) Copyright 2013-2016 * NVIDIA Corporation <www.nvidia.com> * * SPDX-License-Identifier: GPL-2.0+ @@ -7,9 +7,9 @@
#include <common.h> #include <i2c.h> +#include <asm/gpio.h> #include <asm/arch/gpio.h> #include <asm/arch/pinmux.h> -#include <asm/gpio.h> #include "max77620_init.h" #include "pinmux-config-p2571.h"
diff --git a/board/nvidia/seaboard/seaboard.c b/board/nvidia/seaboard/seaboard.c index 2d07001800e3..a8300742eed3 100644 --- a/board/nvidia/seaboard/seaboard.c +++ b/board/nvidia/seaboard/seaboard.c @@ -1,19 +1,19 @@ /* - * (C) Copyright 2010,2011 + * (C) Copyright 2010-2016 * NVIDIA Corporation <www.nvidia.com> * * SPDX-License-Identifier: GPL-2.0+ */
#include <common.h> +#include <asm/gpio.h> #include <asm/io.h> #include <asm/arch/tegra.h> -#include <asm/arch-tegra/board.h> #include <asm/arch/clock.h> #include <asm/arch/funcmux.h> #include <asm/arch/gpio.h> #include <asm/arch/pinmux.h> -#include <asm/gpio.h> +#include <asm/arch-tegra/board.h>
/* TODO: Remove this code when the SPI switch is working */ #if (CONFIG_MACH_TYPE != MACH_TYPE_VENTANA) diff --git a/board/toradex/colibri_t20/colibri_t20.c b/board/toradex/colibri_t20/colibri_t20.c index b9f845a09b6a..74421819d0f0 100644 --- a/board/toradex/colibri_t20/colibri_t20.c +++ b/board/toradex/colibri_t20/colibri_t20.c @@ -6,14 +6,14 @@ */
#include <common.h> +#include <i2c.h> +#include <asm/gpio.h> +#include <asm/io.h> #include <asm/arch/clock.h> #include <asm/arch/funcmux.h> #include <asm/arch/pinmux.h> #include <asm/arch-tegra/board.h> #include <asm/arch-tegra/tegra.h> -#include <asm/gpio.h> -#include <asm/io.h> -#include <i2c.h>
#define PMU_I2C_ADDRESS 0x34 #define MAX_I2C_RETRY 3 diff --git a/board/toradex/colibri_t30/colibri_t30.c b/board/toradex/colibri_t30/colibri_t30.c index 3902bff203d5..413cf1b498fe 100644 --- a/board/toradex/colibri_t30/colibri_t30.c +++ b/board/toradex/colibri_t30/colibri_t30.c @@ -7,12 +7,12 @@ */
#include <common.h> +#include <i2c.h> +#include <asm/gpio.h> +#include <asm/io.h> #include <asm/arch/gp_padctrl.h> #include <asm/arch/pinmux.h> #include <asm/arch-tegra/tegra.h> -#include <asm/gpio.h> -#include <asm/io.h> -#include <i2c.h> #include "pinmux-config-colibri_t30.h"
int arch_misc_init(void)