diff options
Diffstat (limited to 'board')
-rw-r--r-- | board/avionic-design/common/tamonten.c | 13 | ||||
-rw-r--r-- | board/compal/paz00/paz00.c | 4 | ||||
-rw-r--r-- | board/compulab/trimslice/trimslice.c | 6 | ||||
-rw-r--r-- | board/nvidia/common/board.c | 17 | ||||
-rw-r--r-- | board/nvidia/common/emc.c | 8 | ||||
-rw-r--r-- | board/nvidia/common/uart-spi-switch.c | 4 | ||||
-rw-r--r-- | board/nvidia/harmony/harmony.c | 4 | ||||
-rw-r--r-- | board/nvidia/seaboard/seaboard.c | 4 | ||||
-rw-r--r-- | board/nvidia/whistler/whistler.c | 6 |
9 files changed, 32 insertions, 34 deletions
diff --git a/board/avionic-design/common/tamonten.c b/board/avionic-design/common/tamonten.c index 93f12ea..7c05d49 100644 --- a/board/avionic-design/common/tamonten.c +++ b/board/avionic-design/common/tamonten.c @@ -27,16 +27,15 @@ #include <ns16550.h> #include <asm/io.h> #include <asm/gpio.h> -#include <asm/arch/board.h> -#include <asm/arch/tegra20.h> -#include <asm/arch/sys_proto.h> -#include <asm/arch/clk_rst.h> #include <asm/arch/clock.h> #include <asm/arch/funcmux.h> #include <asm/arch/pinmux.h> -#include <asm/arch/uart.h> -#include <asm/arch/mmc.h> - +#include <asm/arch/tegra.h> +#include <asm/arch-tegra/board.h> +#include <asm/arch-tegra/clk_rst.h> +#include <asm/arch-tegra/mmc.h> +#include <asm/arch-tegra/sys_proto.h> +#include <asm/arch-tegra/uart.h> #ifdef CONFIG_TEGRA_MMC #include <mmc.h> #endif diff --git a/board/compal/paz00/paz00.c b/board/compal/paz00/paz00.c index 0f8f167..c73ac5f 100644 --- a/board/compal/paz00/paz00.c +++ b/board/compal/paz00/paz00.c @@ -16,9 +16,9 @@ #include <common.h> #include <asm/io.h> -#include <asm/arch/tegra20.h> +#include <asm/arch/tegra.h> #include <asm/arch/pinmux.h> -#include <asm/arch/mmc.h> +#include <asm/arch-tegra/mmc.h> #include <asm/gpio.h> #ifdef CONFIG_TEGRA_MMC #include <mmc.h> diff --git a/board/compulab/trimslice/trimslice.c b/board/compulab/trimslice/trimslice.c index 893cca8..7b22a87 100644 --- a/board/compulab/trimslice/trimslice.c +++ b/board/compulab/trimslice/trimslice.c @@ -22,14 +22,14 @@ */ #include <common.h> -#include <i2c.h> #include <asm/io.h> -#include <asm/arch/tegra20.h> +#include <asm/arch/tegra.h> #include <asm/arch/clock.h> #include <asm/arch/funcmux.h> #include <asm/arch/pinmux.h> -#include <asm/arch/mmc.h> +#include <asm/arch-tegra/mmc.h> #include <asm/gpio.h> +#include <i2c.h> #ifdef CONFIG_TEGRA_MMC #include <mmc.h> #endif diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c index afe832a..8821fdf 100644 --- a/board/nvidia/common/board.c +++ b/board/nvidia/common/board.c @@ -25,20 +25,19 @@ #include <ns16550.h> #include <linux/compiler.h> #include <asm/io.h> -#include <asm/arch/tegra20.h> -#include <asm/arch/sys_proto.h> - -#include <asm/arch/board.h> -#include <asm/arch/clk_rst.h> #include <asm/arch/clock.h> #include <asm/arch/emc.h> #include <asm/arch/pinmux.h> -#include <asm/arch/pmc.h> #include <asm/arch/pmu.h> -#include <asm/arch/uart.h> -#include <asm/arch/warmboot.h> -#include <spi.h> +#include <asm/arch/tegra.h> #include <asm/arch/usb.h> +#include <asm/arch-tegra/board.h> +#include <asm/arch-tegra/clk_rst.h> +#include <asm/arch-tegra/pmc.h> +#include <asm/arch-tegra/sys_proto.h> +#include <asm/arch-tegra/uart.h> +#include <asm/arch-tegra/warmboot.h> +#include <spi.h> #include <i2c.h> #include "board.h" #include "emc.h" diff --git a/board/nvidia/common/emc.c b/board/nvidia/common/emc.c index 739d4bd..26b6ec7 100644 --- a/board/nvidia/common/emc.c +++ b/board/nvidia/common/emc.c @@ -22,13 +22,13 @@ #include <common.h> #include <asm/io.h> -#include <asm/arch/ap20.h> -#include <asm/arch/clk_rst.h> #include <asm/arch/clock.h> #include <asm/arch/emc.h> #include <asm/arch/pmu.h> -#include <asm/arch/sys_proto.h> -#include <asm/arch/tegra20.h> +#include <asm/arch/tegra.h> +#include <asm/arch-tegra/ap.h> +#include <asm/arch-tegra/clk_rst.h> +#include <asm/arch-tegra/sys_proto.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/nvidia/common/uart-spi-switch.c b/board/nvidia/common/uart-spi-switch.c index 6b21758..a0aeb7f 100644 --- a/board/nvidia/common/uart-spi-switch.c +++ b/board/nvidia/common/uart-spi-switch.c @@ -24,8 +24,8 @@ #include <asm/gpio.h> #include <asm/arch/pinmux.h> #include <asm/arch/uart-spi-switch.h> -#include <asm/arch/tegra20.h> -#include <asm/arch/tegra_spi.h> +#include <asm/arch/tegra.h> +#include <asm/arch-tegra/tegra_spi.h> /* position of the UART/SPI select switch */ diff --git a/board/nvidia/harmony/harmony.c b/board/nvidia/harmony/harmony.c index b4a811d..c23a87d 100644 --- a/board/nvidia/harmony/harmony.c +++ b/board/nvidia/harmony/harmony.c @@ -23,11 +23,11 @@ #include <common.h> #include <asm/io.h> -#include <asm/arch/tegra20.h> #include <asm/arch/clock.h> #include <asm/arch/funcmux.h> #include <asm/arch/pinmux.h> -#include <asm/arch/mmc.h> +#include <asm/arch/tegra.h> +#include <asm/arch-tegra/mmc.h> #include <asm/gpio.h> #ifdef CONFIG_TEGRA_MMC #include <mmc.h> diff --git a/board/nvidia/seaboard/seaboard.c b/board/nvidia/seaboard/seaboard.c index 667f60a..ab90a5d 100644 --- a/board/nvidia/seaboard/seaboard.c +++ b/board/nvidia/seaboard/seaboard.c @@ -23,11 +23,11 @@ #include <common.h> #include <asm/io.h> -#include <asm/arch/tegra20.h> +#include <asm/arch/tegra.h> #include <asm/arch/clock.h> #include <asm/arch/funcmux.h> #include <asm/arch/pinmux.h> -#include <asm/arch/mmc.h> +#include <asm/arch-tegra/mmc.h> #include <asm/gpio.h> #ifdef CONFIG_TEGRA_MMC #include <mmc.h> diff --git a/board/nvidia/whistler/whistler.c b/board/nvidia/whistler/whistler.c index 598b2e5..af918c4 100644 --- a/board/nvidia/whistler/whistler.c +++ b/board/nvidia/whistler/whistler.c @@ -22,14 +22,14 @@ */ #include <common.h> -#include <i2c.h> #include <asm/io.h> -#include <asm/arch/tegra20.h> +#include <asm/arch/tegra.h> #include <asm/arch/clock.h> #include <asm/arch/funcmux.h> #include <asm/arch/pinmux.h> -#include <asm/arch/mmc.h> +#include <asm/arch-tegra/mmc.h> #include <asm/gpio.h> +#include <i2c.h> #ifdef CONFIG_TEGRA_MMC #include <mmc.h> #endif |