From: Stephen Warren swarren@nvidia.com
These are the last files in arch/arm/include/asm/arch-tegra*. Move them into arch/arm/mach-tegra. The Tegra clock API currently exposes a lot of internal implementation details, which are unfortunately relied upon throughout the code base. Consequently, the headers are moved to <mach/> rather than being hidden out of the global include path. This needs cleanup/refactoring, especially since the current state cannot support the next chip at all. However, this cleanup series is already rather long, and the work to cleanup the clock API rather involved, so I'll do that later.
Signed-off-by: Stephen Warren swarren@nvidia.com --- arch/arm/mach-tegra/ap.c | 2 +- arch/arm/mach-tegra/board.c | 2 +- arch/arm/mach-tegra/board2.c | 4 ++-- arch/arm/mach-tegra/clock.c | 4 ++-- arch/arm/mach-tegra/cpu.c | 4 ++-- .../asm/arch-tegra => mach-tegra/include/mach}/clk_rst.h | 6 +++--- .../clock.h => mach-tegra/include/mach/clock_common.h} | 8 ++++---- arch/arm/mach-tegra/include/mach/powergate.h | 2 +- arch/arm/mach-tegra/spl.c | 2 +- arch/arm/mach-tegra/spl_uart.c | 2 +- arch/arm/mach-tegra/tegra114/clock.c | 4 ++-- arch/arm/mach-tegra/tegra114/cpu.c | 4 ++-- .../tegra114/include/mach}/clock-tables.h | 8 ++++---- .../arch-tegra114 => mach-tegra/tegra114/include/mach}/clock.h | 10 +++++----- arch/arm/mach-tegra/tegra114/pllx.c | 2 +- arch/arm/mach-tegra/tegra124/clock.c | 4 ++-- arch/arm/mach-tegra/tegra124/cpu.c | 4 ++-- .../tegra124/include/mach}/clock-tables.h | 8 ++++---- .../arch-tegra124 => mach-tegra/tegra124/include/mach}/clock.h | 10 +++++----- arch/arm/mach-tegra/tegra124/pllx.c | 2 +- arch/arm/mach-tegra/tegra20/clock.c | 4 ++-- arch/arm/mach-tegra/tegra20/emc.c | 2 +- .../tegra20/include/mach}/clock-tables.h | 8 ++++---- .../arch-tegra20 => mach-tegra/tegra20/include/mach}/clock.h | 5 +++-- arch/arm/mach-tegra/tegra20/pllx.c | 2 +- arch/arm/mach-tegra/tegra20/warmboot.c | 4 ++-- arch/arm/mach-tegra/tegra20/warmboot_avp.c | 4 ++-- arch/arm/mach-tegra/tegra210/clock.c | 4 ++-- .../tegra210/include/mach}/clock-tables.h | 8 ++++---- .../arch-tegra210 => mach-tegra/tegra210/include/mach}/clock.h | 8 ++++---- arch/arm/mach-tegra/tegra210/pllx.c | 2 +- arch/arm/mach-tegra/tegra210/xusb-padctl.c | 8 +++----- arch/arm/mach-tegra/tegra30/clock.c | 4 ++-- arch/arm/mach-tegra/tegra30/cpu.c | 4 ++-- .../tegra30/include/mach}/clock-tables.h | 8 ++++---- .../arch-tegra30 => mach-tegra/tegra30/include/mach}/clock.h | 10 +++++----- arch/arm/mach-tegra/tegra30/pllx.c | 2 +- arch/arm/mach-tegra/xusb-padctl-common.c | 6 ++---- board/nvidia/jetson-tk1/jetson-tk1.c | 3 +-- board/nvidia/nyan-big/nyan-big.c | 2 +- drivers/i2c/tegra_i2c.c | 4 ++-- drivers/input/tegra-kbc.c | 2 +- drivers/mmc/tegra_mmc.c | 4 ++-- drivers/mtd/nand/tegra_nand.c | 4 ++-- drivers/pci/pci_tegra.c | 5 ++--- drivers/pwm/tegra_pwm.c | 2 +- drivers/spi/tegra114_spi.c | 6 +++--- drivers/spi/tegra20_sflash.c | 4 ++-- drivers/spi/tegra20_slink.c | 6 +++--- drivers/spi/tegra210_qspi.c | 6 +++--- drivers/usb/host/ehci-tegra.c | 5 ++--- drivers/video/tegra.c | 2 +- drivers/video/tegra124/display.c | 2 +- drivers/video/tegra124/sor.c | 2 +- 54 files changed, 119 insertions(+), 125 deletions(-) rename arch/arm/{include/asm/arch-tegra => mach-tegra/include/mach}/clk_rst.h (99%) rename arch/arm/{include/asm/arch-tegra/clock.h => mach-tegra/include/mach/clock_common.h} (99%) rename arch/arm/{include/asm/arch-tegra114 => mach-tegra/tegra114/include/mach}/clock-tables.h (97%) rename arch/arm/{include/asm/arch-tegra114 => mach-tegra/tegra114/include/mach}/clock.h (61%) rename arch/arm/{include/asm/arch-tegra124 => mach-tegra/tegra124/include/mach}/clock-tables.h (98%) rename arch/arm/{include/asm/arch-tegra124 => mach-tegra/tegra124/include/mach}/clock.h (85%) rename arch/arm/{include/asm/arch-tegra20 => mach-tegra/tegra20/include/mach}/clock-tables.h (95%) rename arch/arm/{include/asm/arch-tegra20 => mach-tegra/tegra20/include/mach}/clock.h (77%) rename arch/arm/{include/asm/arch-tegra210 => mach-tegra/tegra210/include/mach}/clock-tables.h (98%) rename arch/arm/{include/asm/arch-tegra210 => mach-tegra/tegra210/include/mach}/clock.h (78%) rename arch/arm/{include/asm/arch-tegra30 => mach-tegra/tegra30/include/mach}/clock-tables.h (97%) rename arch/arm/{include/asm/arch-tegra30 => mach-tegra/tegra30/include/mach}/clock.h (58%)
diff --git a/arch/arm/mach-tegra/ap.c b/arch/arm/mach-tegra/ap.c index fba8a6417135..5883798bc4bd 100644 --- a/arch/arm/mach-tegra/ap.c +++ b/arch/arm/mach-tegra/ap.c @@ -10,7 +10,7 @@ #include <common.h> #include <linux/bug.h> #include <asm/io.h> -#include <asm/arch-tegra/clock.h> +#include <mach/clock.h> #include <soc/mc.h> #include "cpu.h" #include "pmc.h" diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c index 2f8b79b63d83..7d2579671855 100644 --- a/arch/arm/mach-tegra/board.c +++ b/arch/arm/mach-tegra/board.c @@ -8,8 +8,8 @@ #include <common.h> #include <spl.h> #include <asm/io.h> -#include <asm/arch/clock.h> #include <mach/board.h> +#include <mach/clock.h> #include <soc/mc.h> #include "pmc.h" #include "tegra.h" diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c index 3a5ba94c19c9..b2ab301897a0 100644 --- a/arch/arm/mach-tegra/board2.c +++ b/arch/arm/mach-tegra/board2.c @@ -8,11 +8,11 @@ #include <common.h> #include <errno.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch-tegra/clk_rst.h> #include "../../../drivers/usb/host/ehci-tegra-priv.h" #include <mach/board.h> #include <mach/board_init.h> +#include <mach/clk_rst.h> +#include <mach/clock.h> #ifdef CONFIG_TEGRA_MMC #include <mach/tegra_mmc.h> #endif diff --git a/arch/arm/mach-tegra/clock.c b/arch/arm/mach-tegra/clock.c index e7f6aa7e04cc..9fd6802598f2 100644 --- a/arch/arm/mach-tegra/clock.c +++ b/arch/arm/mach-tegra/clock.c @@ -9,10 +9,10 @@ #include <common.h> #include <errno.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch-tegra/clk_rst.h> #include <div64.h> #include <fdtdec.h> +#include <mach/clk_rst.h> +#include <mach/clock.h> #include "pmc.h" #include "tegra.h"
diff --git a/arch/arm/mach-tegra/cpu.c b/arch/arm/mach-tegra/cpu.c index aa72cc297c84..40e32cfbc946 100644 --- a/arch/arm/mach-tegra/cpu.c +++ b/arch/arm/mach-tegra/cpu.c @@ -6,8 +6,8 @@
#include <common.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch-tegra/clk_rst.h> +#include <mach/clk_rst.h> +#include <mach/clock.h> #include "cpu.h" #include "pllx.h" #include "pmc.h" diff --git a/arch/arm/include/asm/arch-tegra/clk_rst.h b/arch/arm/mach-tegra/include/mach/clk_rst.h similarity index 99% rename from arch/arm/include/asm/arch-tegra/clk_rst.h rename to arch/arm/mach-tegra/include/mach/clk_rst.h index 619793bfbef8..47ae5e8301cc 100644 --- a/arch/arm/include/asm/arch-tegra/clk_rst.h +++ b/arch/arm/mach-tegra/include/mach/clk_rst.h @@ -5,8 +5,8 @@ * SPDX-License-Identifier: GPL-2.0+ */
-#ifndef _TEGRA_CLK_RST_H_ -#define _TEGRA_CLK_RST_H_ +#ifndef _MACH_CLK_RST_H +#define _MACH_CLK_RST_H
#define NV_PA_CLK_RST_BASE 0x60006000
@@ -386,4 +386,4 @@ enum { /* CLK_RST_PLLD_MISC */ #define PLLD_CLKENABLE 30
-#endif /* _TEGRA_CLK_RST_H_ */ +#endif diff --git a/arch/arm/include/asm/arch-tegra/clock.h b/arch/arm/mach-tegra/include/mach/clock_common.h similarity index 99% rename from arch/arm/include/asm/arch-tegra/clock.h rename to arch/arm/mach-tegra/include/mach/clock_common.h index a20832b7f35f..11e2a81ebde0 100644 --- a/arch/arm/include/asm/arch-tegra/clock.h +++ b/arch/arm/mach-tegra/include/mach/clock_common.h @@ -7,8 +7,8 @@
/* Tegra clock control functions */
-#ifndef _TEGRA_CLOCK_H_ -#define _TEGRA_CLOCK_H_ +#ifndef _MACH_CLOCK_COMMON_H +#define _MACH_CLOCK_COMMON_H
/* Set of oscillator frequencies supported in the internal API. */ enum clock_osc_freq { @@ -38,7 +38,7 @@ enum { MASK_BITS_31_28, };
-#include <asm/arch/clock-tables.h> +#include <mach/clock-tables.h> /* PLL stabilization delay in usec */ #define CLOCK_PLL_STABLE_DELAY_US 300
@@ -370,4 +370,4 @@ extern struct clk_pll_info tegra_pll_info_table[CLOCK_ID_PLL_COUNT]; */ int clock_external_output(int clk_id);
-#endif /* _TEGRA_CLOCK_H_ */ +#endif diff --git a/arch/arm/mach-tegra/include/mach/powergate.h b/arch/arm/mach-tegra/include/mach/powergate.h index 3ac9c9b092b1..297cf2b43cc8 100644 --- a/arch/arm/mach-tegra/include/mach/powergate.h +++ b/arch/arm/mach-tegra/include/mach/powergate.h @@ -7,7 +7,7 @@ #ifndef _MACH_POWERGATE_H #define _MACH_POWERGATE_H
-#include <asm/arch/clock.h> +#include <mach/clock.h>
enum tegra_powergate { TEGRA_POWERGATE_CPU, diff --git a/arch/arm/mach-tegra/spl.c b/arch/arm/mach-tegra/spl.c index d5e709406e8b..f6c3b4aeeaaf 100644 --- a/arch/arm/mach-tegra/spl.c +++ b/arch/arm/mach-tegra/spl.c @@ -11,10 +11,10 @@ #include <spl.h>
#include <asm/io.h> -#include <asm/arch/clock.h> #include <asm/spl.h> #include <mach/board.h> #include <mach/board_init.h> +#include <mach/clock.h> #include "apb_misc.h" #include "cpu.h" #include "tegra.h" diff --git a/arch/arm/mach-tegra/spl_uart.c b/arch/arm/mach-tegra/spl_uart.c index 163e6443e821..9ae93587e075 100644 --- a/arch/arm/mach-tegra/spl_uart.c +++ b/arch/arm/mach-tegra/spl_uart.c @@ -7,7 +7,7 @@ #include <common.h> #include <dm.h> #include <ns16550.h> -#include <asm/arch/clock.h> +#include <mach/clock.h> #include <mach/spl_uart.h> #include "tegra.h"
diff --git a/arch/arm/mach-tegra/tegra114/clock.c b/arch/arm/mach-tegra/tegra114/clock.c index 39d8523ab1f0..0a93c40663a0 100644 --- a/arch/arm/mach-tegra/tegra114/clock.c +++ b/arch/arm/mach-tegra/tegra114/clock.c @@ -9,10 +9,10 @@
#include <common.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch-tegra/clk_rst.h> #include <div64.h> #include <fdtdec.h> +#include <mach/clk_rst.h> +#include <mach/clock.h> #include "../sysctr.h" #include "../tegra.h"
diff --git a/arch/arm/mach-tegra/tegra114/cpu.c b/arch/arm/mach-tegra/tegra114/cpu.c index 388c03002b88..9f9883e50bda 100644 --- a/arch/arm/mach-tegra/tegra114/cpu.c +++ b/arch/arm/mach-tegra/tegra114/cpu.c @@ -7,8 +7,8 @@
#include <common.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch-tegra/clk_rst.h> +#include <mach/clk_rst.h> +#include <mach/clock.h> #include <mach/pinmux.h> #include <soc/flow.h> #include "../cpu.h" diff --git a/arch/arm/include/asm/arch-tegra114/clock-tables.h b/arch/arm/mach-tegra/tegra114/include/mach/clock-tables.h similarity index 97% rename from arch/arm/include/asm/arch-tegra114/clock-tables.h rename to arch/arm/mach-tegra/tegra114/include/mach/clock-tables.h index d4511817fa3b..c12770c37d8c 100644 --- a/arch/arm/include/asm/arch-tegra114/clock-tables.h +++ b/arch/arm/mach-tegra/tegra114/include/mach/clock-tables.h @@ -1,13 +1,13 @@ /* - * Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2010-2016, NVIDIA CORPORATION. All rights reserved. * * SPDX-License-Identifier: GPL-2.0 */
/* Tegra114 clock PLL tables */
-#ifndef _TEGRA114_CLOCK_TABLES_H_ -#define _TEGRA114_CLOCK_TABLES_H_ +#ifndef _TEGRA114_CLOCK_TABLES_H +#define _TEGRA114_CLOCK_TABLES_H
/* The PLLs supported by the hardware */ enum clock_id { @@ -390,4 +390,4 @@ enum periphc_internal_id { #define clock_periph_id_isvalid(id) ((id) >= PERIPH_ID_FIRST && \ (id) < PERIPH_ID_COUNT)
-#endif /* _TEGRA114_CLOCK_TABLES_H_ */ +#endif diff --git a/arch/arm/include/asm/arch-tegra114/clock.h b/arch/arm/mach-tegra/tegra114/include/mach/clock.h similarity index 61% rename from arch/arm/include/asm/arch-tegra114/clock.h rename to arch/arm/mach-tegra/tegra114/include/mach/clock.h index 4d58bf184218..1f3f2ebc7aae 100644 --- a/arch/arm/include/asm/arch-tegra114/clock.h +++ b/arch/arm/mach-tegra/tegra114/include/mach/clock.h @@ -1,15 +1,15 @@ /* - * Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2010-2016, NVIDIA CORPORATION. All rights reserved. * * SPDX-License-Identifier: GPL-2.0 */
/* Tegra114 clock control functions */
-#ifndef _TEGRA114_CLOCK_H_ -#define _TEGRA114_CLOCK_H_ +#ifndef _TEGRA114_CLOCK_H +#define _TEGRA114_CLOCK_H
-#include <asm/arch-tegra/clock.h> +#include <mach/clock_common.h>
/* CLK_RST_CONTROLLER_OSC_CTRL_0 */ #define OSC_FREQ_SHIFT 28 @@ -18,4 +18,4 @@ /* CLK_RST_CONTROLLER_PLLC_MISC_0 */ #define PLLC_IDDQ (1 << 26)
-#endif /* _TEGRA114_CLOCK_H_ */ +#endif diff --git a/arch/arm/mach-tegra/tegra114/pllx.c b/arch/arm/mach-tegra/tegra114/pllx.c index 4c4e8f74f973..362693408d76 100644 --- a/arch/arm/mach-tegra/tegra114/pllx.c +++ b/arch/arm/mach-tegra/tegra114/pllx.c @@ -5,7 +5,7 @@ */
#include <common.h> -#include <asm/arch-tegra/clock.h> +#include <mach/clock.h> #include "../cpu.h" #include "../pllx.h"
diff --git a/arch/arm/mach-tegra/tegra124/clock.c b/arch/arm/mach-tegra/tegra124/clock.c index 692b82f336c0..2fc75da7f28a 100644 --- a/arch/arm/mach-tegra/tegra124/clock.c +++ b/arch/arm/mach-tegra/tegra124/clock.c @@ -9,10 +9,10 @@
#include <common.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch-tegra/clk_rst.h> #include <div64.h> #include <fdtdec.h> +#include <mach/clk_rst.h> +#include <mach/clock.h> #include "../sysctr.h" #include "../tegra.h"
diff --git a/arch/arm/mach-tegra/tegra124/cpu.c b/arch/arm/mach-tegra/tegra124/cpu.c index aa4b5581dd75..bd787ccc3d11 100644 --- a/arch/arm/mach-tegra/tegra124/cpu.c +++ b/arch/arm/mach-tegra/tegra124/cpu.c @@ -7,8 +7,8 @@
#include <common.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch-tegra/clk_rst.h> +#include <mach/clk_rst.h> +#include <mach/clock.h> #include <mach/pinmux.h> #include <soc/flow.h> #include "../cpu.h" diff --git a/arch/arm/include/asm/arch-tegra124/clock-tables.h b/arch/arm/mach-tegra/tegra124/include/mach/clock-tables.h similarity index 98% rename from arch/arm/include/asm/arch-tegra124/clock-tables.h rename to arch/arm/mach-tegra/tegra124/include/mach/clock-tables.h index 9466b4ffb33e..dcd5cd905dec 100644 --- a/arch/arm/include/asm/arch-tegra124/clock-tables.h +++ b/arch/arm/mach-tegra/tegra124/include/mach/clock-tables.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2013 + * (C) Copyright 2013-2016 * NVIDIA Corporation <www.nvidia.com> * * SPDX-License-Identifier: GPL-2.0+ @@ -7,8 +7,8 @@
/* Tegra124 clock PLL tables */
-#ifndef _TEGRA124_CLOCK_TABLES_H_ -#define _TEGRA124_CLOCK_TABLES_H_ +#ifndef _TEGRA124_CLOCK_TABLES_H +#define _TEGRA124_CLOCK_TABLES_H
/* The PLLs supported by the hardware */ enum clock_id { @@ -495,4 +495,4 @@ enum periphc_internal_id { #define clock_periph_id_isvalid(id) ((id) >= PERIPH_ID_FIRST && \ (id) < PERIPH_ID_COUNT)
-#endif /* _TEGRA124_CLOCK_TABLES_H_ */ +#endif diff --git a/arch/arm/include/asm/arch-tegra124/clock.h b/arch/arm/mach-tegra/tegra124/include/mach/clock.h similarity index 85% rename from arch/arm/include/asm/arch-tegra124/clock.h rename to arch/arm/mach-tegra/tegra124/include/mach/clock.h index ff99b9dfafda..e0d426704860 100644 --- a/arch/arm/include/asm/arch-tegra124/clock.h +++ b/arch/arm/mach-tegra/tegra124/include/mach/clock.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2010-2013 + * (C) Copyright 2010-2016 * NVIDIA Corporation <www.nvidia.com> * * SPDX-License-Identifier: GPL-2.0+ @@ -7,10 +7,10 @@
/* Tegra124 clock control definitions */
-#ifndef _TEGRA124_CLOCK_H_ -#define _TEGRA124_CLOCK_H_ +#ifndef _TEGRA124_CLOCK_H +#define _TEGRA124_CLOCK_H
-#include <asm/arch-tegra/clock.h> +#include <mach/clock_common.h>
/* CLK_RST_CONTROLLER_OSC_CTRL_0 */ #define OSC_FREQ_SHIFT 28 @@ -42,4 +42,4 @@ u32 clock_set_display_rate(u32 frequency); */ void clock_set_up_plldp(void);
-#endif /* _TEGRA124_CLOCK_H_ */ +#endif diff --git a/arch/arm/mach-tegra/tegra124/pllx.c b/arch/arm/mach-tegra/tegra124/pllx.c index c19f1df6014b..56125b517c80 100644 --- a/arch/arm/mach-tegra/tegra124/pllx.c +++ b/arch/arm/mach-tegra/tegra124/pllx.c @@ -5,7 +5,7 @@ */
#include <common.h> -#include <asm/arch-tegra/clock.h> +#include <mach/clock.h> #include "../cpu.h" #include "../pllx.h"
diff --git a/arch/arm/mach-tegra/tegra20/clock.c b/arch/arm/mach-tegra/tegra20/clock.c index 182ab6f50db8..9b6d2cac0f80 100644 --- a/arch/arm/mach-tegra/tegra20/clock.c +++ b/arch/arm/mach-tegra/tegra20/clock.c @@ -11,10 +11,10 @@ #include <common.h> #include <errno.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch-tegra/clk_rst.h> #include <div64.h> #include <fdtdec.h> +#include <mach/clk_rst.h> +#include <mach/clock.h> #include "../tegra.h"
/* diff --git a/arch/arm/mach-tegra/tegra20/emc.c b/arch/arm/mach-tegra/tegra20/emc.c index c089e7a8ed0d..42a9a3089c14 100644 --- a/arch/arm/mach-tegra/tegra20/emc.c +++ b/arch/arm/mach-tegra/tegra20/emc.c @@ -8,7 +8,7 @@ #include <common.h> #include <fdtdec.h> #include <asm/io.h> -#include <asm/arch/clock.h> +#include <mach/clock.h> #include "../apb_misc.h" #include "../emc.h" #include "../tegra.h" diff --git a/arch/arm/include/asm/arch-tegra20/clock-tables.h b/arch/arm/mach-tegra/tegra20/include/mach/clock-tables.h similarity index 95% rename from arch/arm/include/asm/arch-tegra20/clock-tables.h rename to arch/arm/mach-tegra/tegra20/include/mach/clock-tables.h index 812e8760d0cd..6a6bb40a31e7 100644 --- a/arch/arm/include/asm/arch-tegra20/clock-tables.h +++ b/arch/arm/mach-tegra/tegra20/include/mach/clock-tables.h @@ -1,14 +1,14 @@ /* * Copyright (c) 2011 The Chromium OS Authors. - * Copyright (c) 2010-2012 NVIDIA Corporation <www.nvidia.com> + * Copyright (c) 2010-2016 NVIDIA Corporation <www.nvidia.com> * * SPDX-License-Identifier: GPL-2.0+ */
/* Tegra20 clock PLL tables */
-#ifndef _CLOCK_TABLES_H_ -#define _CLOCK_TABLES_H_ +#ifndef _TEGRA20_CLOCK_TABLES_H +#define _TEGRA20_CLOCK_TABLES_H
/* The PLLs supported by the hardware */ enum clock_id { @@ -183,4 +183,4 @@ enum pll_out_id { #define clock_periph_id_isvalid(id) ((id) >= PERIPH_ID_FIRST && \ (id) < PERIPH_ID_COUNT)
-#endif /* _CLOCK_TABLES_H_ */ +#endif diff --git a/arch/arm/include/asm/arch-tegra20/clock.h b/arch/arm/mach-tegra/tegra20/include/mach/clock.h similarity index 77% rename from arch/arm/include/asm/arch-tegra20/clock.h rename to arch/arm/mach-tegra/tegra20/include/mach/clock.h index 4df8da96e2a3..0a59ef749721 100644 --- a/arch/arm/include/asm/arch-tegra20/clock.h +++ b/arch/arm/mach-tegra/tegra20/include/mach/clock.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2011 The Chromium OS Authors. + * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. * * SPDX-License-Identifier: GPL-2.0+ */ @@ -9,7 +10,7 @@ #ifndef _TEGRA20_CLOCK_H #define _TEGRA20_CLOCK_H
-#include <asm/arch-tegra/clock.h> +#include <mach/clock_common.h>
/* CLK_RST_CONTROLLER_OSC_CTRL_0 */ #define OSC_FREQ_SHIFT 30 @@ -17,4 +18,4 @@
int tegra_plle_enable(void);
-#endif /* _TEGRA20_CLOCK_H */ +#endif diff --git a/arch/arm/mach-tegra/tegra20/pllx.c b/arch/arm/mach-tegra/tegra20/pllx.c index 1e0127313c4f..15b2c8d9d198 100644 --- a/arch/arm/mach-tegra/tegra20/pllx.c +++ b/arch/arm/mach-tegra/tegra20/pllx.c @@ -5,7 +5,7 @@ */
#include <common.h> -#include <asm/arch-tegra/clock.h> +#include <mach/clock.h> #include "../pllx.h" #include "sku.h"
diff --git a/arch/arm/mach-tegra/tegra20/warmboot.c b/arch/arm/mach-tegra/tegra20/warmboot.c index 1f3f3843b438..e43699cd8fe8 100644 --- a/arch/arm/mach-tegra/tegra20/warmboot.c +++ b/arch/arm/mach-tegra/tegra20/warmboot.c @@ -8,8 +8,8 @@ #include <common.h> #include <asm/io.h> #include <asm/errno.h> -#include <asm/arch/clock.h> -#include <asm/arch-tegra/clk_rst.h> +#include <mach/clk_rst.h> +#include <mach/clock.h> #include "../apb_misc.h" #include "../emc.h" #include "../pmc.h" diff --git a/arch/arm/mach-tegra/tegra20/warmboot_avp.c b/arch/arm/mach-tegra/tegra20/warmboot_avp.c index 82722b5b52ec..aab4cb93ff7b 100644 --- a/arch/arm/mach-tegra/tegra20/warmboot_avp.c +++ b/arch/arm/mach-tegra/tegra20/warmboot_avp.c @@ -7,8 +7,8 @@
#include <common.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch-tegra/clk_rst.h> +#include <mach/clk_rst.h> +#include <mach/clock.h> #include <soc/flow.h> #include "../apb_misc.h" #include "../cpu.h" diff --git a/arch/arm/mach-tegra/tegra210/clock.c b/arch/arm/mach-tegra/tegra210/clock.c index 830ff6d267c6..38f91679222a 100644 --- a/arch/arm/mach-tegra/tegra210/clock.c +++ b/arch/arm/mach-tegra/tegra210/clock.c @@ -10,10 +10,10 @@ #include <common.h> #include <errno.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch-tegra/clk_rst.h> #include <div64.h> #include <fdtdec.h> +#include <mach/clk_rst.h> +#include <mach/clock.h> #include "../sysctr.h" #include "../tegra.h"
diff --git a/arch/arm/include/asm/arch-tegra210/clock-tables.h b/arch/arm/mach-tegra/tegra210/include/mach/clock-tables.h similarity index 98% rename from arch/arm/include/asm/arch-tegra210/clock-tables.h rename to arch/arm/mach-tegra/tegra210/include/mach/clock-tables.h index a612485d8e23..fb5ba4840dd7 100644 --- a/arch/arm/include/asm/arch-tegra210/clock-tables.h +++ b/arch/arm/mach-tegra/tegra210/include/mach/clock-tables.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2013-2015 + * (C) Copyright 2013-2016 * NVIDIA Corporation <www.nvidia.com> * * SPDX-License-Identifier: GPL-2.0+ @@ -7,8 +7,8 @@
/* Tegra210 clock PLL tables */
-#ifndef _TEGRA210_CLOCK_TABLES_H_ -#define _TEGRA210_CLOCK_TABLES_H_ +#ifndef _TEGRA210_CLOCK_TABLES_H +#define _TEGRA210_CLOCK_TABLES_H
/* The PLLs supported by the hardware */ enum clock_id { @@ -565,4 +565,4 @@ enum periphc_internal_id { #define clock_periph_id_isvalid(id) ((id) >= PERIPH_ID_FIRST && \ (id) < PERIPH_ID_COUNT)
-#endif /* _TEGRA210_CLOCK_TABLES_H_ */ +#endif diff --git a/arch/arm/include/asm/arch-tegra210/clock.h b/arch/arm/mach-tegra/tegra210/include/mach/clock.h similarity index 78% rename from arch/arm/include/asm/arch-tegra210/clock.h rename to arch/arm/mach-tegra/tegra210/include/mach/clock.h index 54e70439952d..785179a720a9 100644 --- a/arch/arm/include/asm/arch-tegra210/clock.h +++ b/arch/arm/mach-tegra/tegra210/include/mach/clock.h @@ -7,10 +7,10 @@
/* Tegra210 clock control definitions */
-#ifndef _TEGRA210_CLOCK_H_ -#define _TEGRA210_CLOCK_H_ +#ifndef _TEGRA210_CLOCK_H +#define _TEGRA210_CLOCK_H
-#include <asm/arch-tegra/clock.h> +#include <mach/clock_common.h>
/* CLK_RST_CONTROLLER_OSC_CTRL_0 */ #define OSC_FREQ_SHIFT 28 @@ -23,4 +23,4 @@
int tegra_plle_enable(void);
-#endif /* _TEGRA210_CLOCK_H_ */ +#endif diff --git a/arch/arm/mach-tegra/tegra210/pllx.c b/arch/arm/mach-tegra/tegra210/pllx.c index 9c6f0e0013da..5558dd52e597 100644 --- a/arch/arm/mach-tegra/tegra210/pllx.c +++ b/arch/arm/mach-tegra/tegra210/pllx.c @@ -5,7 +5,7 @@ */
#include <common.h> -#include <asm/arch-tegra/clock.h> +#include <mach/clock.h> #include "../cpu.h" #include "../pllx.h"
diff --git a/arch/arm/mach-tegra/tegra210/xusb-padctl.c b/arch/arm/mach-tegra/tegra210/xusb-padctl.c index 44523c5b385b..bfa0f3dd9ecd 100644 --- a/arch/arm/mach-tegra/tegra210/xusb-padctl.c +++ b/arch/arm/mach-tegra/tegra210/xusb-padctl.c @@ -8,13 +8,11 @@
#include <common.h> #include <errno.h> - +#include <dt-bindings/pinctrl/pinctrl-tegra-xusb.h> +#include <mach/clk_rst.h> +#include <mach/clock.h> #include "../xusb-padctl-common.h"
-#include <asm/arch/clock.h> -#include <asm/arch-tegra/clk_rst.h> - -#include <dt-bindings/pinctrl/pinctrl-tegra-xusb.h>
enum tegra210_function { TEGRA210_FUNC_SNPS, diff --git a/arch/arm/mach-tegra/tegra30/clock.c b/arch/arm/mach-tegra/tegra30/clock.c index dca6d1118b3b..7483d052b47c 100644 --- a/arch/arm/mach-tegra/tegra30/clock.c +++ b/arch/arm/mach-tegra/tegra30/clock.c @@ -10,10 +10,10 @@ #include <common.h> #include <errno.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch-tegra/clk_rst.h> #include <div64.h> #include <fdtdec.h> +#include <mach/clk_rst.h> +#include <mach/clock.h> #include "../tegra.h"
/* diff --git a/arch/arm/mach-tegra/tegra30/cpu.c b/arch/arm/mach-tegra/tegra30/cpu.c index ac234da59d50..b6a142dd1a9b 100644 --- a/arch/arm/mach-tegra/tegra30/cpu.c +++ b/arch/arm/mach-tegra/tegra30/cpu.c @@ -6,8 +6,8 @@
#include <common.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch-tegra/clk_rst.h> +#include <mach/clk_rst.h> +#include <mach/clock.h> #include <mach/tegra_i2c.h> #include <soc/flow.h> #include "../cpu.h" diff --git a/arch/arm/include/asm/arch-tegra30/clock-tables.h b/arch/arm/mach-tegra/tegra30/include/mach/clock-tables.h similarity index 97% rename from arch/arm/include/asm/arch-tegra30/clock-tables.h rename to arch/arm/mach-tegra/tegra30/include/mach/clock-tables.h index 16b4b963305e..c89076f3c237 100644 --- a/arch/arm/include/asm/arch-tegra30/clock-tables.h +++ b/arch/arm/mach-tegra/tegra30/include/mach/clock-tables.h @@ -1,13 +1,13 @@ /* - * Copyright (c) 2010-2012, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2010-2016, NVIDIA CORPORATION. All rights reserved. * * SPDX-License-Identifier: GPL-2.0 */
/* Tegra30 clock PLL tables */
-#ifndef _TEGRA30_CLOCK_TABLES_H_ -#define _TEGRA30_CLOCK_TABLES_H_ +#ifndef _TEGRA30_CLOCK_TABLES_H +#define _TEGRA30_CLOCK_TABLES_H
/* The PLLs supported by the hardware */ enum clock_id { @@ -370,4 +370,4 @@ enum periphc_internal_id { #define clock_periph_id_isvalid(id) ((id) >= PERIPH_ID_FIRST && \ (id) < PERIPH_ID_COUNT)
-#endif /* _TEGRA30_CLOCK_TABLES_H_ */ +#endif diff --git a/arch/arm/include/asm/arch-tegra30/clock.h b/arch/arm/mach-tegra/tegra30/include/mach/clock.h similarity index 58% rename from arch/arm/include/asm/arch-tegra30/clock.h rename to arch/arm/mach-tegra/tegra30/include/mach/clock.h index 46cd7d8e01b8..da7d34cd9880 100644 --- a/arch/arm/include/asm/arch-tegra30/clock.h +++ b/arch/arm/mach-tegra/tegra30/include/mach/clock.h @@ -1,15 +1,15 @@ /* - * Copyright (c) 2010-2012, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2010-2016, NVIDIA CORPORATION. All rights reserved. * * SPDX-License-Identifier: GPL-2.0 */
/* Tegra30 clock control functions */
-#ifndef _TEGRA30_CLOCK_H_ -#define _TEGRA30_CLOCK_H_ +#ifndef _TEGRA30_CLOCK_H +#define _TEGRA30_CLOCK_H
-#include <asm/arch-tegra/clock.h> +#include <mach/clock_common.h>
/* CLK_RST_CONTROLLER_OSC_CTRL_0 */ #define OSC_FREQ_SHIFT 28 @@ -17,4 +17,4 @@
int tegra_plle_enable(void);
-#endif /* _TEGRA30_CLOCK_H_ */ +#endif diff --git a/arch/arm/mach-tegra/tegra30/pllx.c b/arch/arm/mach-tegra/tegra30/pllx.c index 7c4f0ab67f1c..e0e7278a7523 100644 --- a/arch/arm/mach-tegra/tegra30/pllx.c +++ b/arch/arm/mach-tegra/tegra30/pllx.c @@ -5,7 +5,7 @@ */
#include <common.h> -#include <asm/arch-tegra/clock.h> +#include <mach/clock.h> #include "../cpu.h" #include "../pllx.h"
diff --git a/arch/arm/mach-tegra/xusb-padctl-common.c b/arch/arm/mach-tegra/xusb-padctl-common.c index 18ad7bfbdc0f..fbcde07deaa8 100644 --- a/arch/arm/mach-tegra/xusb-padctl-common.c +++ b/arch/arm/mach-tegra/xusb-padctl-common.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2014-2016, NVIDIA CORPORATION. All rights reserved. * * SPDX-License-Identifier: GPL-2.0 */ @@ -8,11 +8,9 @@
#include <common.h> #include <errno.h> - +#include <mach/clock.h> #include "xusb-padctl-common.h"
-#include <asm/arch/clock.h> - int tegra_xusb_phy_prepare(struct tegra_xusb_phy *phy) { if (phy && phy->ops && phy->ops->prepare) diff --git a/board/nvidia/jetson-tk1/jetson-tk1.c b/board/nvidia/jetson-tk1/jetson-tk1.c index a5e958235355..4d8bd224cda8 100644 --- a/board/nvidia/jetson-tk1/jetson-tk1.c +++ b/board/nvidia/jetson-tk1/jetson-tk1.c @@ -10,6 +10,7 @@ #include <power/as3722.h> #include <asm/gpio.h> #include <mach/board_init.h> +#include <mach/clock.h> #include <mach/pinmux.h> #include <mach/spl_uart.h> #include <mach/tegra_gpio.h> @@ -17,8 +18,6 @@
DECLARE_GLOBAL_DATA_PTR;
-#include <asm/arch/clock.h> - void tegra_spl_board_init(void) { tegra124_pinmux_uartd_gpio(); diff --git a/board/nvidia/nyan-big/nyan-big.c b/board/nvidia/nyan-big/nyan-big.c index c38ae8c9a02d..3e7ef191d463 100644 --- a/board/nvidia/nyan-big/nyan-big.c +++ b/board/nvidia/nyan-big/nyan-big.c @@ -10,8 +10,8 @@ #include <dt-bindings/gpio/tegra-gpio.h> #include <power/as3722.h> #include <asm/gpio.h> -#include <asm/arch/clock.h> #include <mach/board_init.h> +#include <mach/clock.h> #include <mach/pinmux.h> #include <mach/tegra_gpio.h> #include <mach/spl_uart.h> diff --git a/drivers/i2c/tegra_i2c.c b/drivers/i2c/tegra_i2c.c index b462f2264b33..dcd71fa39cab 100644 --- a/drivers/i2c/tegra_i2c.c +++ b/drivers/i2c/tegra_i2c.c @@ -12,8 +12,8 @@ #include <fdtdec.h> #include <i2c.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch-tegra/clk_rst.h> +#include <mach/clk_rst.h> +#include <mach/clock.h> #include <mach/tegra_i2c.h> #include "tegra_i2c_priv.h"
diff --git a/drivers/input/tegra-kbc.c b/drivers/input/tegra-kbc.c index df0f52c2c6f8..e57b8ff0969d 100644 --- a/drivers/input/tegra-kbc.c +++ b/drivers/input/tegra-kbc.c @@ -14,7 +14,7 @@ #include <stdio_dev.h> #include <tegra-kbc.h> #include <asm/io.h> -#include <asm/arch/clock.h> +#include <mach/clock.h> #include <linux/input.h>
DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c index 6e1667b3bce7..ae1cb366ddaa 100644 --- a/drivers/mmc/tegra_mmc.c +++ b/drivers/mmc/tegra_mmc.c @@ -13,8 +13,8 @@ #include <mmc.h> #include <asm/gpio.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch-tegra/clk_rst.h> +#include <mach/clk_rst.h> +#include <mach/clock.h> #include <mach/tegra_mmc.h> #include "tegra_mmc_priv.h"
diff --git a/drivers/mtd/nand/tegra_nand.c b/drivers/mtd/nand/tegra_nand.c index 391b807127c8..76f31fab06e6 100644 --- a/drivers/mtd/nand/tegra_nand.c +++ b/drivers/mtd/nand/tegra_nand.c @@ -11,12 +11,12 @@ #include <asm/io.h> #include <memalign.h> #include <nand.h> -#include <asm/arch/clock.h> -#include <asm/arch-tegra/clk_rst.h> #include <asm/errno.h> #include <asm/gpio.h> #include <fdtdec.h> #include <bouncebuf.h> +#include <mach/clk_rst.h> +#include <mach/clock.h> #include "tegra_nand.h"
DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/pci/pci_tegra.c b/drivers/pci/pci_tegra.c index f19e213bd7bd..485c02626a91 100644 --- a/drivers/pci/pci_tegra.c +++ b/drivers/pci/pci_tegra.c @@ -22,9 +22,8 @@ #include <asm/io.h> #include <asm/gpio.h>
-#include <asm/arch/clock.h> -#include <asm/arch-tegra/clk_rst.h> - +#include <mach/clk_rst.h> +#include <mach/clock.h> #include <mach/powergate.h> #include <mach/xusb-padctl.h>
diff --git a/drivers/pwm/tegra_pwm.c b/drivers/pwm/tegra_pwm.c index a0f204a216de..8e760e61cc45 100644 --- a/drivers/pwm/tegra_pwm.c +++ b/drivers/pwm/tegra_pwm.c @@ -9,7 +9,7 @@ #include <dm.h> #include <pwm.h> #include <asm/io.h> -#include <asm/arch/clock.h> +#include <mach/clock.h> #include "tegra_pwm_priv.h"
DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/spi/tegra114_spi.c b/drivers/spi/tegra114_spi.c index 509afba0a298..d4b91462dd91 100644 --- a/drivers/spi/tegra114_spi.c +++ b/drivers/spi/tegra114_spi.c @@ -1,7 +1,7 @@ /* * NVIDIA Tegra SPI controller (T114 and later) * - * Copyright (c) 2010-2013 NVIDIA Corporation + * Copyright (c) 2010-2016 NVIDIA Corporation * * SPDX-License-Identifier: GPL-2.0 */ @@ -9,10 +9,10 @@ #include <common.h> #include <dm.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch-tegra/clk_rst.h> #include <spi.h> #include <fdtdec.h> +#include <mach/clk_rst.h> +#include <mach/clock.h> #include "tegra_spi.h"
DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/spi/tegra20_sflash.c b/drivers/spi/tegra20_sflash.c index 4e51b252e6a2..db71a879c524 100644 --- a/drivers/spi/tegra20_sflash.c +++ b/drivers/spi/tegra20_sflash.c @@ -11,8 +11,8 @@ #include <errno.h> #include <asm/io.h> #include <asm/gpio.h> -#include <asm/arch/clock.h> -#include <asm/arch-tegra/clk_rst.h> +#include <mach/clk_rst.h> +#include <mach/clock.h> #include <mach/pinmux.h> #include <spi.h> #include <fdtdec.h> diff --git a/drivers/spi/tegra20_slink.c b/drivers/spi/tegra20_slink.c index 238edec23ba5..5683aadc3e58 100644 --- a/drivers/spi/tegra20_slink.c +++ b/drivers/spi/tegra20_slink.c @@ -1,7 +1,7 @@ /* * NVIDIA Tegra SPI-SLINK controller * - * Copyright (c) 2010-2013 NVIDIA Corporation + * Copyright (c) 2010-2016 NVIDIA Corporation * * SPDX-License-Identifier: GPL-2.0 */ @@ -9,10 +9,10 @@ #include <common.h> #include <dm.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch-tegra/clk_rst.h> #include <spi.h> #include <fdtdec.h> +#include <mach/clk_rst.h> +#include <mach/clock.h> #include "tegra_spi.h"
DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/spi/tegra210_qspi.c b/drivers/spi/tegra210_qspi.c index 6bbbe9383954..8f5d6e750c84 100644 --- a/drivers/spi/tegra210_qspi.c +++ b/drivers/spi/tegra210_qspi.c @@ -1,7 +1,7 @@ /* * NVIDIA Tegra210 QSPI controller driver * - * (C) Copyright 2015 NVIDIA Corporation <www.nvidia.com> + * (C) Copyright 2015-2016 NVIDIA Corporation <www.nvidia.com> * * SPDX-License-Identifier: GPL-2.0+ */ @@ -9,10 +9,10 @@ #include <common.h> #include <dm.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch-tegra/clk_rst.h> #include <spi.h> #include <fdtdec.h> +#include <mach/clk_rst.h> +#include <mach/clock.h> #include "tegra_spi.h"
DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c index 9bf069382605..e69db25608e8 100644 --- a/drivers/usb/host/ehci-tegra.c +++ b/drivers/usb/host/ehci-tegra.c @@ -11,13 +11,12 @@ #include <asm/errno.h> #include <asm/io.h> #include <asm-generic/gpio.h> -#include <asm/arch/clock.h> -#include <asm/arch-tegra/clk_rst.h> #include <usb.h> #include <usb/ulpi.h> #include <libfdt.h> #include <fdtdec.h> - +#include <mach/clk_rst.h> +#include <mach/clock.h> #include "ehci.h" #include "ehci-tegra-priv.h"
diff --git a/drivers/video/tegra.c b/drivers/video/tegra.c index 8543c2980cf8..d7db70eb7bf0 100644 --- a/drivers/video/tegra.c +++ b/drivers/video/tegra.c @@ -13,7 +13,7 @@ #include <asm/system.h> #include <asm/gpio.h> #include <asm/io.h> -#include <asm/arch/clock.h> +#include <mach/clock.h> #include <mach/pinmux.h> #include "tegra_dc.h"
diff --git a/drivers/video/tegra124/display.c b/drivers/video/tegra124/display.c index bc31103e8b92..e5d0aabc75a0 100644 --- a/drivers/video/tegra124/display.c +++ b/drivers/video/tegra124/display.c @@ -18,7 +18,7 @@ #include <video.h> #include <asm/gpio.h> #include <asm/io.h> -#include <asm/arch/clock.h> +#include <mach/clock.h> #include <dm/uclass-internal.h> #include "../tegra_dc.h" #include "displayport.h" diff --git a/drivers/video/tegra124/sor.c b/drivers/video/tegra124/sor.c index 40d9dd22a2c4..bb24ccecfc62 100644 --- a/drivers/video/tegra124/sor.c +++ b/drivers/video/tegra124/sor.c @@ -12,7 +12,7 @@ #include <panel.h> #include <video_bridge.h> #include <asm/io.h> -#include <asm/arch/clock.h> +#include <mach/clock.h> #include "../tegra_dc.h" #include "displayport.h" #include "sor.h"