diff options
author | Thierry Reding <treding@nvidia.com> | 2014-07-11 03:44:49 -0400 |
---|---|---|
committer | Thierry Reding <treding@nvidia.com> | 2014-07-17 07:29:57 -0400 |
commit | a0524acc94c91c72c2968a76eddc6f3afe82f9f2 (patch) | |
tree | aa56b590f78f5f00a15551cd4d97c3523d5fc469 /arch | |
parent | 306a7f9139318a28063282a15b9f9ebacf09c9b9 (diff) |
ARM: tegra: Sort includes alphabetically
If these aren't sorted alphabetically, then the logical choice is to
append new ones, however that creates a lot of potential for conflicts
because every change will then add new includes in the same location.
Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-tegra/apbio.c | 12 | ||||
-rw-r--r-- | arch/arm/mach-tegra/board-paz00.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-tegra/cpuidle-tegra114.c | 10 | ||||
-rw-r--r-- | arch/arm/mach-tegra/cpuidle-tegra20.c | 16 | ||||
-rw-r--r-- | arch/arm/mach-tegra/cpuidle-tegra30.c | 10 | ||||
-rw-r--r-- | arch/arm/mach-tegra/flowctrl.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-tegra/fuse.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-tegra/hotplug.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-tegra/io.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-tegra/irq.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-tegra/platsmp.c | 20 | ||||
-rw-r--r-- | arch/arm/mach-tegra/pm-tegra20.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-tegra/pm-tegra30.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-tegra/pm.c | 22 | ||||
-rw-r--r-- | arch/arm/mach-tegra/pmc.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-tegra/powergate.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-tegra/reset-handler.S | 4 | ||||
-rw-r--r-- | arch/arm/mach-tegra/reset.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-tegra/sleep-tegra30.S | 6 | ||||
-rw-r--r-- | arch/arm/mach-tegra/tegra.c | 18 | ||||
-rw-r--r-- | arch/arm/mach-tegra/tegra114_speedo.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-tegra/tegra20_speedo.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-tegra/tegra30_speedo.c | 2 |
23 files changed, 89 insertions, 85 deletions
diff --git a/arch/arm/mach-tegra/apbio.c b/arch/arm/mach-tegra/apbio.c index bc471973cf04..5f9647b3f81d 100644 --- a/arch/arm/mach-tegra/apbio.c +++ b/arch/arm/mach-tegra/apbio.c | |||
@@ -13,15 +13,15 @@ | |||
13 | * | 13 | * |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/kernel.h> | 16 | #include <linux/completion.h> |
17 | #include <linux/io.h> | ||
18 | #include <linux/of.h> | ||
19 | #include <linux/dmaengine.h> | 17 | #include <linux/dmaengine.h> |
20 | #include <linux/dma-mapping.h> | 18 | #include <linux/dma-mapping.h> |
21 | #include <linux/spinlock.h> | 19 | #include <linux/io.h> |
22 | #include <linux/completion.h> | 20 | #include <linux/kernel.h> |
23 | #include <linux/sched.h> | ||
24 | #include <linux/mutex.h> | 21 | #include <linux/mutex.h> |
22 | #include <linux/of.h> | ||
23 | #include <linux/sched.h> | ||
24 | #include <linux/spinlock.h> | ||
25 | 25 | ||
26 | #include "apbio.h" | 26 | #include "apbio.h" |
27 | #include "iomap.h" | 27 | #include "iomap.h" |
diff --git a/arch/arm/mach-tegra/board-paz00.c b/arch/arm/mach-tegra/board-paz00.c index 9c6029ba526f..bb4782a32713 100644 --- a/arch/arm/mach-tegra/board-paz00.c +++ b/arch/arm/mach-tegra/board-paz00.c | |||
@@ -17,9 +17,10 @@ | |||
17 | * | 17 | * |
18 | */ | 18 | */ |
19 | 19 | ||
20 | #include <linux/platform_device.h> | ||
21 | #include <linux/gpio/driver.h> | 20 | #include <linux/gpio/driver.h> |
21 | #include <linux/platform_device.h> | ||
22 | #include <linux/rfkill-gpio.h> | 22 | #include <linux/rfkill-gpio.h> |
23 | |||
23 | #include "board.h" | 24 | #include "board.h" |
24 | 25 | ||
25 | static struct rfkill_gpio_platform_data wifi_rfkill_platform_data = { | 26 | static struct rfkill_gpio_platform_data wifi_rfkill_platform_data = { |
diff --git a/arch/arm/mach-tegra/cpuidle-tegra114.c b/arch/arm/mach-tegra/cpuidle-tegra114.c index b5fb7c110c64..e3ebdce3e71f 100644 --- a/arch/arm/mach-tegra/cpuidle-tegra114.c +++ b/arch/arm/mach-tegra/cpuidle-tegra114.c | |||
@@ -14,16 +14,16 @@ | |||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include <linux/kernel.h> | 17 | #include <asm/firmware.h> |
18 | #include <linux/module.h> | 18 | #include <linux/clockchips.h> |
19 | #include <linux/cpuidle.h> | 19 | #include <linux/cpuidle.h> |
20 | #include <linux/cpu_pm.h> | 20 | #include <linux/cpu_pm.h> |
21 | #include <linux/clockchips.h> | 21 | #include <linux/kernel.h> |
22 | #include <asm/firmware.h> | 22 | #include <linux/module.h> |
23 | 23 | ||
24 | #include <asm/cpuidle.h> | 24 | #include <asm/cpuidle.h> |
25 | #include <asm/suspend.h> | ||
26 | #include <asm/smp_plat.h> | 25 | #include <asm/smp_plat.h> |
26 | #include <asm/suspend.h> | ||
27 | 27 | ||
28 | #include "pm.h" | 28 | #include "pm.h" |
29 | #include "sleep.h" | 29 | #include "sleep.h" |
diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c index b82dcaee2ef4..b30bf5cba65b 100644 --- a/arch/arm/mach-tegra/cpuidle-tegra20.c +++ b/arch/arm/mach-tegra/cpuidle-tegra20.c | |||
@@ -19,23 +19,23 @@ | |||
19 | * more details. | 19 | * more details. |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #include <linux/kernel.h> | 22 | #include <linux/clk/tegra.h> |
23 | #include <linux/module.h> | 23 | #include <linux/clockchips.h> |
24 | #include <linux/cpuidle.h> | 24 | #include <linux/cpuidle.h> |
25 | #include <linux/cpu_pm.h> | 25 | #include <linux/cpu_pm.h> |
26 | #include <linux/clockchips.h> | 26 | #include <linux/kernel.h> |
27 | #include <linux/clk/tegra.h> | 27 | #include <linux/module.h> |
28 | 28 | ||
29 | #include <asm/cpuidle.h> | 29 | #include <asm/cpuidle.h> |
30 | #include <asm/proc-fns.h> | 30 | #include <asm/proc-fns.h> |
31 | #include <asm/suspend.h> | ||
32 | #include <asm/smp_plat.h> | 31 | #include <asm/smp_plat.h> |
32 | #include <asm/suspend.h> | ||
33 | 33 | ||
34 | #include "pm.h" | 34 | #include "flowctrl.h" |
35 | #include "sleep.h" | ||
36 | #include "iomap.h" | 35 | #include "iomap.h" |
37 | #include "irq.h" | 36 | #include "irq.h" |
38 | #include "flowctrl.h" | 37 | #include "pm.h" |
38 | #include "sleep.h" | ||
39 | 39 | ||
40 | #ifdef CONFIG_PM_SLEEP | 40 | #ifdef CONFIG_PM_SLEEP |
41 | static bool abort_flag; | 41 | static bool abort_flag; |
diff --git a/arch/arm/mach-tegra/cpuidle-tegra30.c b/arch/arm/mach-tegra/cpuidle-tegra30.c index ed2a2a7bae4d..35561274f6cf 100644 --- a/arch/arm/mach-tegra/cpuidle-tegra30.c +++ b/arch/arm/mach-tegra/cpuidle-tegra30.c | |||
@@ -19,17 +19,17 @@ | |||
19 | * more details. | 19 | * more details. |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #include <linux/kernel.h> | 22 | #include <linux/clk/tegra.h> |
23 | #include <linux/module.h> | 23 | #include <linux/clockchips.h> |
24 | #include <linux/cpuidle.h> | 24 | #include <linux/cpuidle.h> |
25 | #include <linux/cpu_pm.h> | 25 | #include <linux/cpu_pm.h> |
26 | #include <linux/clockchips.h> | 26 | #include <linux/kernel.h> |
27 | #include <linux/clk/tegra.h> | 27 | #include <linux/module.h> |
28 | 28 | ||
29 | #include <asm/cpuidle.h> | 29 | #include <asm/cpuidle.h> |
30 | #include <asm/proc-fns.h> | 30 | #include <asm/proc-fns.h> |
31 | #include <asm/suspend.h> | ||
32 | #include <asm/smp_plat.h> | 31 | #include <asm/smp_plat.h> |
32 | #include <asm/suspend.h> | ||
33 | 33 | ||
34 | #include "pm.h" | 34 | #include "pm.h" |
35 | #include "sleep.h" | 35 | #include "sleep.h" |
diff --git a/arch/arm/mach-tegra/flowctrl.c b/arch/arm/mach-tegra/flowctrl.c index ce8ab8abf061..fde581d78398 100644 --- a/arch/arm/mach-tegra/flowctrl.c +++ b/arch/arm/mach-tegra/flowctrl.c | |||
@@ -18,10 +18,10 @@ | |||
18 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 18 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include <linux/cpumask.h> | ||
21 | #include <linux/init.h> | 22 | #include <linux/init.h> |
22 | #include <linux/kernel.h> | ||
23 | #include <linux/io.h> | 23 | #include <linux/io.h> |
24 | #include <linux/cpumask.h> | 24 | #include <linux/kernel.h> |
25 | 25 | ||
26 | #include "flowctrl.h" | 26 | #include "flowctrl.h" |
27 | #include "iomap.h" | 27 | #include "iomap.h" |
diff --git a/arch/arm/mach-tegra/fuse.c b/arch/arm/mach-tegra/fuse.c index 930fef861227..af283039e37f 100644 --- a/arch/arm/mach-tegra/fuse.c +++ b/arch/arm/mach-tegra/fuse.c | |||
@@ -18,17 +18,17 @@ | |||
18 | * | 18 | * |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include <linux/kernel.h> | 21 | #include <linux/clk.h> |
22 | #include <linux/io.h> | ||
23 | #include <linux/export.h> | 22 | #include <linux/export.h> |
23 | #include <linux/io.h> | ||
24 | #include <linux/kernel.h> | ||
24 | #include <linux/random.h> | 25 | #include <linux/random.h> |
25 | #include <linux/clk.h> | ||
26 | 26 | ||
27 | #include <soc/tegra/fuse.h> | 27 | #include <soc/tegra/fuse.h> |
28 | 28 | ||
29 | #include "apbio.h" | ||
29 | #include "fuse.h" | 30 | #include "fuse.h" |
30 | #include "iomap.h" | 31 | #include "iomap.h" |
31 | #include "apbio.h" | ||
32 | 32 | ||
33 | /* Tegra20 only */ | 33 | /* Tegra20 only */ |
34 | #define FUSE_UID_LOW 0x108 | 34 | #define FUSE_UID_LOW 0x108 |
diff --git a/arch/arm/mach-tegra/hotplug.c b/arch/arm/mach-tegra/hotplug.c index ff26af26bd0c..7842b252dda5 100644 --- a/arch/arm/mach-tegra/hotplug.c +++ b/arch/arm/mach-tegra/hotplug.c | |||
@@ -7,9 +7,10 @@ | |||
7 | * it under the terms of the GNU General Public License version 2 as | 7 | * it under the terms of the GNU General Public License version 2 as |
8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
9 | */ | 9 | */ |
10 | |||
11 | #include <linux/clk/tegra.h> | ||
10 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
11 | #include <linux/smp.h> | 13 | #include <linux/smp.h> |
12 | #include <linux/clk/tegra.h> | ||
13 | 14 | ||
14 | #include <asm/smp_plat.h> | 15 | #include <asm/smp_plat.h> |
15 | 16 | ||
diff --git a/arch/arm/mach-tegra/io.c b/arch/arm/mach-tegra/io.c index bb9c9c29d181..352de159d2c5 100644 --- a/arch/arm/mach-tegra/io.c +++ b/arch/arm/mach-tegra/io.c | |||
@@ -18,14 +18,14 @@ | |||
18 | * | 18 | * |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include <linux/kernel.h> | ||
22 | #include <linux/module.h> | ||
23 | #include <linux/init.h> | 21 | #include <linux/init.h> |
24 | #include <linux/mm.h> | ||
25 | #include <linux/io.h> | 22 | #include <linux/io.h> |
23 | #include <linux/kernel.h> | ||
24 | #include <linux/mm.h> | ||
25 | #include <linux/module.h> | ||
26 | 26 | ||
27 | #include <asm/page.h> | ||
28 | #include <asm/mach/map.h> | 27 | #include <asm/mach/map.h> |
28 | #include <asm/page.h> | ||
29 | 29 | ||
30 | #include "board.h" | 30 | #include "board.h" |
31 | #include "iomap.h" | 31 | #include "iomap.h" |
diff --git a/arch/arm/mach-tegra/irq.c b/arch/arm/mach-tegra/irq.c index 1a74d562dca1..da7be13aecce 100644 --- a/arch/arm/mach-tegra/irq.c +++ b/arch/arm/mach-tegra/irq.c | |||
@@ -17,14 +17,14 @@ | |||
17 | * | 17 | * |
18 | */ | 18 | */ |
19 | 19 | ||
20 | #include <linux/kernel.h> | ||
21 | #include <linux/cpu_pm.h> | 20 | #include <linux/cpu_pm.h> |
22 | #include <linux/interrupt.h> | 21 | #include <linux/interrupt.h> |
23 | #include <linux/irq.h> | ||
24 | #include <linux/io.h> | 22 | #include <linux/io.h> |
25 | #include <linux/of.h> | ||
26 | #include <linux/of_address.h> | ||
27 | #include <linux/irqchip/arm-gic.h> | 23 | #include <linux/irqchip/arm-gic.h> |
24 | #include <linux/irq.h> | ||
25 | #include <linux/kernel.h> | ||
26 | #include <linux/of_address.h> | ||
27 | #include <linux/of.h> | ||
28 | #include <linux/syscore_ops.h> | 28 | #include <linux/syscore_ops.h> |
29 | 29 | ||
30 | #include "board.h" | 30 | #include "board.h" |
diff --git a/arch/arm/mach-tegra/platsmp.c b/arch/arm/mach-tegra/platsmp.c index 929d1046e2b4..c403edd0fcc7 100644 --- a/arch/arm/mach-tegra/platsmp.c +++ b/arch/arm/mach-tegra/platsmp.c | |||
@@ -11,27 +11,27 @@ | |||
11 | * it under the terms of the GNU General Public License version 2 as | 11 | * it under the terms of the GNU General Public License version 2 as |
12 | * published by the Free Software Foundation. | 12 | * published by the Free Software Foundation. |
13 | */ | 13 | */ |
14 | #include <linux/init.h> | 14 | |
15 | #include <linux/errno.h> | 15 | #include <linux/clk/tegra.h> |
16 | #include <linux/delay.h> | 16 | #include <linux/delay.h> |
17 | #include <linux/device.h> | 17 | #include <linux/device.h> |
18 | #include <linux/errno.h> | ||
19 | #include <linux/init.h> | ||
20 | #include <linux/io.h> | ||
18 | #include <linux/jiffies.h> | 21 | #include <linux/jiffies.h> |
19 | #include <linux/smp.h> | 22 | #include <linux/smp.h> |
20 | #include <linux/io.h> | ||
21 | #include <linux/clk/tegra.h> | ||
22 | 23 | ||
23 | #include <asm/cacheflush.h> | 24 | #include <asm/cacheflush.h> |
24 | #include <asm/mach-types.h> | 25 | #include <asm/mach-types.h> |
25 | #include <asm/smp_scu.h> | ||
26 | #include <asm/smp_plat.h> | 26 | #include <asm/smp_plat.h> |
27 | 27 | #include <asm/smp_scu.h> | |
28 | #include "fuse.h" | ||
29 | #include "flowctrl.h" | ||
30 | #include "reset.h" | ||
31 | #include "pmc.h" | ||
32 | 28 | ||
33 | #include "common.h" | 29 | #include "common.h" |
30 | #include "flowctrl.h" | ||
31 | #include "fuse.h" | ||
34 | #include "iomap.h" | 32 | #include "iomap.h" |
33 | #include "pmc.h" | ||
34 | #include "reset.h" | ||
35 | 35 | ||
36 | static cpumask_t tegra_cpu_init_mask; | 36 | static cpumask_t tegra_cpu_init_mask; |
37 | 37 | ||
diff --git a/arch/arm/mach-tegra/pm-tegra20.c b/arch/arm/mach-tegra/pm-tegra20.c index d65e1d786400..39ac2b723f2e 100644 --- a/arch/arm/mach-tegra/pm-tegra20.c +++ b/arch/arm/mach-tegra/pm-tegra20.c | |||
@@ -13,6 +13,7 @@ | |||
13 | * You should have received a copy of the GNU General Public License | 13 | * You should have received a copy of the GNU General Public License |
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
15 | */ | 15 | */ |
16 | |||
16 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
17 | 18 | ||
18 | #include "pm.h" | 19 | #include "pm.h" |
diff --git a/arch/arm/mach-tegra/pm-tegra30.c b/arch/arm/mach-tegra/pm-tegra30.c index 8fa326d6ff1a..46cc19de9916 100644 --- a/arch/arm/mach-tegra/pm-tegra30.c +++ b/arch/arm/mach-tegra/pm-tegra30.c | |||
@@ -13,6 +13,7 @@ | |||
13 | * You should have received a copy of the GNU General Public License | 13 | * You should have received a copy of the GNU General Public License |
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
15 | */ | 15 | */ |
16 | |||
16 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
17 | 18 | ||
18 | #include "pm.h" | 19 | #include "pm.h" |
diff --git a/arch/arm/mach-tegra/pm.c b/arch/arm/mach-tegra/pm.c index f55b05a29b55..ae4826e43171 100644 --- a/arch/arm/mach-tegra/pm.c +++ b/arch/arm/mach-tegra/pm.c | |||
@@ -16,30 +16,30 @@ | |||
16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
17 | */ | 17 | */ |
18 | 18 | ||
19 | #include <linux/kernel.h> | 19 | #include <linux/clk/tegra.h> |
20 | #include <linux/spinlock.h> | ||
21 | #include <linux/io.h> | ||
22 | #include <linux/cpumask.h> | 20 | #include <linux/cpumask.h> |
23 | #include <linux/delay.h> | ||
24 | #include <linux/cpu_pm.h> | 21 | #include <linux/cpu_pm.h> |
25 | #include <linux/suspend.h> | 22 | #include <linux/delay.h> |
26 | #include <linux/err.h> | 23 | #include <linux/err.h> |
24 | #include <linux/io.h> | ||
25 | #include <linux/kernel.h> | ||
27 | #include <linux/slab.h> | 26 | #include <linux/slab.h> |
28 | #include <linux/clk/tegra.h> | 27 | #include <linux/spinlock.h> |
28 | #include <linux/suspend.h> | ||
29 | 29 | ||
30 | #include <asm/smp_plat.h> | ||
31 | #include <asm/cacheflush.h> | 30 | #include <asm/cacheflush.h> |
32 | #include <asm/suspend.h> | ||
33 | #include <asm/idmap.h> | 31 | #include <asm/idmap.h> |
34 | #include <asm/proc-fns.h> | 32 | #include <asm/proc-fns.h> |
33 | #include <asm/smp_plat.h> | ||
34 | #include <asm/suspend.h> | ||
35 | #include <asm/tlbflush.h> | 35 | #include <asm/tlbflush.h> |
36 | 36 | ||
37 | #include "iomap.h" | ||
38 | #include "reset.h" | ||
39 | #include "flowctrl.h" | 37 | #include "flowctrl.h" |
40 | #include "fuse.h" | 38 | #include "fuse.h" |
41 | #include "pm.h" | 39 | #include "iomap.h" |
42 | #include "pmc.h" | 40 | #include "pmc.h" |
41 | #include "pm.h" | ||
42 | #include "reset.h" | ||
43 | #include "sleep.h" | 43 | #include "sleep.h" |
44 | 44 | ||
45 | #ifdef CONFIG_PM_SLEEP | 45 | #ifdef CONFIG_PM_SLEEP |
diff --git a/arch/arm/mach-tegra/pmc.c b/arch/arm/mach-tegra/pmc.c index 0f457801eaca..a602f6c76b10 100644 --- a/arch/arm/mach-tegra/pmc.c +++ b/arch/arm/mach-tegra/pmc.c | |||
@@ -15,9 +15,9 @@ | |||
15 | * | 15 | * |
16 | */ | 16 | */ |
17 | 17 | ||
18 | #include <linux/kernel.h> | ||
19 | #include <linux/clk.h> | 18 | #include <linux/clk.h> |
20 | #include <linux/io.h> | 19 | #include <linux/io.h> |
20 | #include <linux/kernel.h> | ||
21 | #include <linux/of.h> | 21 | #include <linux/of.h> |
22 | #include <linux/of_address.h> | 22 | #include <linux/of_address.h> |
23 | 23 | ||
diff --git a/arch/arm/mach-tegra/powergate.c b/arch/arm/mach-tegra/powergate.c index 7b148bc6c995..c12044de629b 100644 --- a/arch/arm/mach-tegra/powergate.c +++ b/arch/arm/mach-tegra/powergate.c | |||
@@ -17,18 +17,18 @@ | |||
17 | * | 17 | * |
18 | */ | 18 | */ |
19 | 19 | ||
20 | #include <linux/kernel.h> | ||
21 | #include <linux/clk.h> | 20 | #include <linux/clk.h> |
21 | #include <linux/clk/tegra.h> | ||
22 | #include <linux/debugfs.h> | 22 | #include <linux/debugfs.h> |
23 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
24 | #include <linux/err.h> | 24 | #include <linux/err.h> |
25 | #include <linux/export.h> | 25 | #include <linux/export.h> |
26 | #include <linux/init.h> | 26 | #include <linux/init.h> |
27 | #include <linux/io.h> | 27 | #include <linux/io.h> |
28 | #include <linux/kernel.h> | ||
28 | #include <linux/reset.h> | 29 | #include <linux/reset.h> |
29 | #include <linux/seq_file.h> | 30 | #include <linux/seq_file.h> |
30 | #include <linux/spinlock.h> | 31 | #include <linux/spinlock.h> |
31 | #include <linux/clk/tegra.h> | ||
32 | 32 | ||
33 | #include <soc/tegra/powergate.h> | 33 | #include <soc/tegra/powergate.h> |
34 | 34 | ||
diff --git a/arch/arm/mach-tegra/reset-handler.S b/arch/arm/mach-tegra/reset-handler.S index 578d4d1ad648..d916c84487ae 100644 --- a/arch/arm/mach-tegra/reset-handler.S +++ b/arch/arm/mach-tegra/reset-handler.S | |||
@@ -14,11 +14,11 @@ | |||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include <linux/linkage.h> | ||
18 | #include <linux/init.h> | 17 | #include <linux/init.h> |
18 | #include <linux/linkage.h> | ||
19 | 19 | ||
20 | #include <asm/cache.h> | ||
21 | #include <asm/asm-offsets.h> | 20 | #include <asm/asm-offsets.h> |
21 | #include <asm/cache.h> | ||
22 | 22 | ||
23 | #include "flowctrl.h" | 23 | #include "flowctrl.h" |
24 | #include "fuse.h" | 24 | #include "fuse.h" |
diff --git a/arch/arm/mach-tegra/reset.c b/arch/arm/mach-tegra/reset.c index 146fe8e0ae7c..b90507922a8c 100644 --- a/arch/arm/mach-tegra/reset.c +++ b/arch/arm/mach-tegra/reset.c | |||
@@ -14,20 +14,20 @@ | |||
14 | * | 14 | * |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include <linux/bitops.h> | ||
18 | #include <linux/cpumask.h> | ||
17 | #include <linux/init.h> | 19 | #include <linux/init.h> |
18 | #include <linux/io.h> | 20 | #include <linux/io.h> |
19 | #include <linux/cpumask.h> | ||
20 | #include <linux/bitops.h> | ||
21 | 21 | ||
22 | #include <asm/cacheflush.h> | 22 | #include <asm/cacheflush.h> |
23 | #include <asm/hardware/cache-l2x0.h> | ||
24 | #include <asm/firmware.h> | 23 | #include <asm/firmware.h> |
24 | #include <asm/hardware/cache-l2x0.h> | ||
25 | 25 | ||
26 | #include "fuse.h" | ||
26 | #include "iomap.h" | 27 | #include "iomap.h" |
27 | #include "irammap.h" | 28 | #include "irammap.h" |
28 | #include "reset.h" | 29 | #include "reset.h" |
29 | #include "sleep.h" | 30 | #include "sleep.h" |
30 | #include "fuse.h" | ||
31 | 31 | ||
32 | #define TEGRA_IRAM_RESET_BASE (TEGRA_IRAM_BASE + \ | 32 | #define TEGRA_IRAM_RESET_BASE (TEGRA_IRAM_BASE + \ |
33 | TEGRA_IRAM_RESET_HANDLER_OFFSET) | 33 | TEGRA_IRAM_RESET_HANDLER_OFFSET) |
diff --git a/arch/arm/mach-tegra/sleep-tegra30.S b/arch/arm/mach-tegra/sleep-tegra30.S index b16d4a57fa59..e240b875183b 100644 --- a/arch/arm/mach-tegra/sleep-tegra30.S +++ b/arch/arm/mach-tegra/sleep-tegra30.S | |||
@@ -16,14 +16,14 @@ | |||
16 | 16 | ||
17 | #include <linux/linkage.h> | 17 | #include <linux/linkage.h> |
18 | 18 | ||
19 | #include <asm/assembler.h> | ||
20 | #include <asm/asm-offsets.h> | 19 | #include <asm/asm-offsets.h> |
20 | #include <asm/assembler.h> | ||
21 | #include <asm/cache.h> | 21 | #include <asm/cache.h> |
22 | 22 | ||
23 | #include "irammap.h" | 23 | #include "flowctrl.h" |
24 | #include "fuse.h" | 24 | #include "fuse.h" |
25 | #include "irammap.h" | ||
25 | #include "sleep.h" | 26 | #include "sleep.h" |
26 | #include "flowctrl.h" | ||
27 | 27 | ||
28 | #define EMC_CFG 0xc | 28 | #define EMC_CFG 0xc |
29 | #define EMC_ADR_CFG 0x10 | 29 | #define EMC_ADR_CFG 0x10 |
diff --git a/arch/arm/mach-tegra/tegra.c b/arch/arm/mach-tegra/tegra.c index 15ac9fcc96b1..7a9f30289049 100644 --- a/arch/arm/mach-tegra/tegra.c +++ b/arch/arm/mach-tegra/tegra.c | |||
@@ -16,29 +16,29 @@ | |||
16 | * | 16 | * |
17 | */ | 17 | */ |
18 | 18 | ||
19 | #include <linux/kernel.h> | ||
20 | #include <linux/init.h> | ||
21 | #include <linux/platform_device.h> | ||
22 | #include <linux/serial_8250.h> | ||
23 | #include <linux/clk.h> | 19 | #include <linux/clk.h> |
20 | #include <linux/clk/tegra.h> | ||
24 | #include <linux/dma-mapping.h> | 21 | #include <linux/dma-mapping.h> |
22 | #include <linux/init.h> | ||
23 | #include <linux/io.h> | ||
24 | #include <linux/irqchip.h> | ||
25 | #include <linux/irqdomain.h> | 25 | #include <linux/irqdomain.h> |
26 | #include <linux/of.h> | 26 | #include <linux/kernel.h> |
27 | #include <linux/of_address.h> | 27 | #include <linux/of_address.h> |
28 | #include <linux/of_fdt.h> | 28 | #include <linux/of_fdt.h> |
29 | #include <linux/of.h> | ||
29 | #include <linux/of_platform.h> | 30 | #include <linux/of_platform.h> |
30 | #include <linux/pda_power.h> | 31 | #include <linux/pda_power.h> |
31 | #include <linux/io.h> | 32 | #include <linux/platform_device.h> |
33 | #include <linux/serial_8250.h> | ||
32 | #include <linux/slab.h> | 34 | #include <linux/slab.h> |
33 | #include <linux/sys_soc.h> | 35 | #include <linux/sys_soc.h> |
34 | #include <linux/usb/tegra_usb_phy.h> | 36 | #include <linux/usb/tegra_usb_phy.h> |
35 | #include <linux/clk/tegra.h> | ||
36 | #include <linux/irqchip.h> | ||
37 | 37 | ||
38 | #include <asm/hardware/cache-l2x0.h> | 38 | #include <asm/hardware/cache-l2x0.h> |
39 | #include <asm/mach-types.h> | ||
40 | #include <asm/mach/arch.h> | 39 | #include <asm/mach/arch.h> |
41 | #include <asm/mach/time.h> | 40 | #include <asm/mach/time.h> |
41 | #include <asm/mach-types.h> | ||
42 | #include <asm/setup.h> | 42 | #include <asm/setup.h> |
43 | #include <asm/trusted_foundations.h> | 43 | #include <asm/trusted_foundations.h> |
44 | 44 | ||
diff --git a/arch/arm/mach-tegra/tegra114_speedo.c b/arch/arm/mach-tegra/tegra114_speedo.c index 5218d4853cd3..86eca17e5286 100644 --- a/arch/arm/mach-tegra/tegra114_speedo.c +++ b/arch/arm/mach-tegra/tegra114_speedo.c | |||
@@ -14,8 +14,8 @@ | |||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include <linux/kernel.h> | ||
18 | #include <linux/bug.h> | 17 | #include <linux/bug.h> |
18 | #include <linux/kernel.h> | ||
19 | 19 | ||
20 | #include "fuse.h" | 20 | #include "fuse.h" |
21 | 21 | ||
diff --git a/arch/arm/mach-tegra/tegra20_speedo.c b/arch/arm/mach-tegra/tegra20_speedo.c index fa6eb570623f..dcd29a0b0187 100644 --- a/arch/arm/mach-tegra/tegra20_speedo.c +++ b/arch/arm/mach-tegra/tegra20_speedo.c | |||
@@ -14,8 +14,8 @@ | |||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include <linux/kernel.h> | ||
18 | #include <linux/bug.h> | 17 | #include <linux/bug.h> |
18 | #include <linux/kernel.h> | ||
19 | 19 | ||
20 | #include "fuse.h" | 20 | #include "fuse.h" |
21 | 21 | ||
diff --git a/arch/arm/mach-tegra/tegra30_speedo.c b/arch/arm/mach-tegra/tegra30_speedo.c index 125cb16424a6..7c0038326cf5 100644 --- a/arch/arm/mach-tegra/tegra30_speedo.c +++ b/arch/arm/mach-tegra/tegra30_speedo.c | |||
@@ -14,8 +14,8 @@ | |||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include <linux/kernel.h> | ||
18 | #include <linux/bug.h> | 17 | #include <linux/bug.h> |
18 | #include <linux/kernel.h> | ||
19 | 19 | ||
20 | #include "fuse.h" | 20 | #include "fuse.h" |
21 | 21 | ||