diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpio/tegra_gpio.c | 2 | ||||
| -rw-r--r-- | drivers/i2c/tegra_i2c.c | 4 | ||||
| -rw-r--r-- | drivers/input/tegra-kbc.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/tegra_mmc.c | 6 | ||||
| -rw-r--r-- | drivers/mtd/nand/tegra_nand.c | 5 | ||||
| -rw-r--r-- | drivers/spi/tegra_spi.c | 7 |
6 files changed, 12 insertions, 14 deletions
diff --git a/drivers/gpio/tegra_gpio.c b/drivers/gpio/tegra_gpio.c index 747f4cf921..2417968214 100644 --- a/drivers/gpio/tegra_gpio.c +++ b/drivers/gpio/tegra_gpio.c @@ -30,7 +30,7 @@ #include <common.h> #include <asm/io.h> #include <asm/bitops.h> -#include <asm/arch/tegra20.h> +#include <asm/arch/tegra.h> #include <asm/gpio.h> enum { diff --git a/drivers/i2c/tegra_i2c.c b/drivers/i2c/tegra_i2c.c index e3be14e3cf..efc77fa910 100644 --- a/drivers/i2c/tegra_i2c.c +++ b/drivers/i2c/tegra_i2c.c @@ -26,12 +26,12 @@ #include <fdtdec.h> #include <i2c.h> #include <asm/io.h> -#include <asm/arch/clk_rst.h> #include <asm/arch/clock.h> #include <asm/arch/funcmux.h> #include <asm/arch/gpio.h> #include <asm/arch/pinmux.h> -#include <asm/arch/tegra_i2c.h> +#include <asm/arch-tegra/clk_rst.h> +#include <asm/arch-tegra/tegra_i2c.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/input/tegra-kbc.c b/drivers/input/tegra-kbc.c index 6f1cfd8155..ab7a9e33ee 100644 --- a/drivers/input/tegra-kbc.c +++ b/drivers/input/tegra-kbc.c @@ -30,7 +30,7 @@ #include <asm/io.h> #include <asm/arch/clock.h> #include <asm/arch/funcmux.h> -#include <asm/arch/timer.h> +#include <asm/arch-tegra/timer.h> #include <linux/input.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c index ca8fad8657..8fea6a6bfb 100644 --- a/drivers/mmc/tegra_mmc.c +++ b/drivers/mmc/tegra_mmc.c @@ -20,12 +20,12 @@ */ #include <common.h> -#include <mmc.h> #include <asm/gpio.h> #include <asm/io.h> -#include <asm/arch/clk_rst.h> #include <asm/arch/clock.h> -#include <asm/arch/tegra_mmc.h> +#include <asm/arch-tegra/clk_rst.h> +#include <asm/arch-tegra/tegra_mmc.h> +#include <mmc.h> /* support 4 mmc hosts */ struct mmc mmc_dev[4]; diff --git a/drivers/mtd/nand/tegra_nand.c b/drivers/mtd/nand/tegra_nand.c index 8c1de34455..2c1b533bb0 100644 --- a/drivers/mtd/nand/tegra_nand.c +++ b/drivers/mtd/nand/tegra_nand.c @@ -26,12 +26,11 @@ #include <common.h> #include <asm/io.h> #include <nand.h> -#include <asm/arch/clk_rst.h> #include <asm/arch/clock.h> #include <asm/arch/funcmux.h> -#include <asm/arch/gpio.h> +#include <asm/arch-tegra/clk_rst.h> #include <asm/errno.h> -#include <asm-generic/gpio.h> +#include <asm/gpio.h> #include <fdtdec.h> #include "tegra_nand.h" diff --git a/drivers/spi/tegra_spi.c b/drivers/spi/tegra_spi.c index 18b00b2cae..9bb34e2938 100644 --- a/drivers/spi/tegra_spi.c +++ b/drivers/spi/tegra_spi.c @@ -23,16 +23,15 @@ */ #include <common.h> - #include <malloc.h> -#include <spi.h> #include <asm/io.h> #include <asm/gpio.h> -#include <asm/arch/clk_rst.h> #include <asm/arch/clock.h> #include <asm/arch/pinmux.h> #include <asm/arch/uart-spi-switch.h> -#include <asm/arch/tegra_spi.h> +#include <asm/arch-tegra/clk_rst.h> +#include <asm/arch-tegra/tegra_spi.h> +#include <spi.h> #if defined(CONFIG_SPI_CORRUPTS_UART) #define corrupt_delay() udelay(CONFIG_SPI_CORRUPTS_UART_DLY); |