diff options
Diffstat (limited to 'arch/arm/mach-tegra/board-dt-tegra30.c')
-rw-r--r-- | arch/arm/mach-tegra/board-dt-tegra30.c | 67 |
1 files changed, 3 insertions, 64 deletions
diff --git a/arch/arm/mach-tegra/board-dt-tegra30.c b/arch/arm/mach-tegra/board-dt-tegra30.c index 6497d1236b08..bf68567e549d 100644 --- a/arch/arm/mach-tegra/board-dt-tegra30.c +++ b/arch/arm/mach-tegra/board-dt-tegra30.c | |||
@@ -23,6 +23,7 @@ | |||
23 | * | 23 | * |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include <linux/clocksource.h> | ||
26 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
27 | #include <linux/of.h> | 28 | #include <linux/of.h> |
28 | #include <linux/of_address.h> | 29 | #include <linux/of_address.h> |
@@ -31,75 +32,14 @@ | |||
31 | #include <linux/of_platform.h> | 32 | #include <linux/of_platform.h> |
32 | 33 | ||
33 | #include <asm/mach/arch.h> | 34 | #include <asm/mach/arch.h> |
34 | #include <asm/hardware/gic.h> | ||
35 | 35 | ||
36 | #include "board.h" | 36 | #include "board.h" |
37 | #include "clock.h" | ||
38 | #include "common.h" | 37 | #include "common.h" |
39 | #include "iomap.h" | 38 | #include "iomap.h" |
40 | 39 | ||
41 | struct of_dev_auxdata tegra30_auxdata_lookup[] __initdata = { | ||
42 | OF_DEV_AUXDATA("nvidia,tegra20-sdhci", 0x78000000, "sdhci-tegra.0", NULL), | ||
43 | OF_DEV_AUXDATA("nvidia,tegra20-sdhci", 0x78000200, "sdhci-tegra.1", NULL), | ||
44 | OF_DEV_AUXDATA("nvidia,tegra20-sdhci", 0x78000400, "sdhci-tegra.2", NULL), | ||
45 | OF_DEV_AUXDATA("nvidia,tegra20-sdhci", 0x78000600, "sdhci-tegra.3", NULL), | ||
46 | OF_DEV_AUXDATA("nvidia,tegra20-i2c", 0x7000C000, "tegra-i2c.0", NULL), | ||
47 | OF_DEV_AUXDATA("nvidia,tegra20-i2c", 0x7000C400, "tegra-i2c.1", NULL), | ||
48 | OF_DEV_AUXDATA("nvidia,tegra20-i2c", 0x7000C500, "tegra-i2c.2", NULL), | ||
49 | OF_DEV_AUXDATA("nvidia,tegra20-i2c", 0x7000C700, "tegra-i2c.3", NULL), | ||
50 | OF_DEV_AUXDATA("nvidia,tegra20-i2c", 0x7000D000, "tegra-i2c.4", NULL), | ||
51 | OF_DEV_AUXDATA("nvidia,tegra30-ahub", 0x70080000, "tegra30-ahub", NULL), | ||
52 | OF_DEV_AUXDATA("nvidia,tegra30-apbdma", 0x6000a000, "tegra-apbdma", NULL), | ||
53 | OF_DEV_AUXDATA("nvidia,tegra30-pwm", TEGRA_PWFM_BASE, "tegra-pwm", NULL), | ||
54 | OF_DEV_AUXDATA("nvidia,tegra30-slink", 0x7000D400, "spi_tegra.0", NULL), | ||
55 | OF_DEV_AUXDATA("nvidia,tegra30-slink", 0x7000D600, "spi_tegra.1", NULL), | ||
56 | OF_DEV_AUXDATA("nvidia,tegra30-slink", 0x7000D800, "spi_tegra.2", NULL), | ||
57 | OF_DEV_AUXDATA("nvidia,tegra30-slink", 0x7000DA00, "spi_tegra.3", NULL), | ||
58 | OF_DEV_AUXDATA("nvidia,tegra30-slink", 0x7000DC00, "spi_tegra.4", NULL), | ||
59 | OF_DEV_AUXDATA("nvidia,tegra30-slink", 0x7000DE00, "spi_tegra.5", NULL), | ||
60 | OF_DEV_AUXDATA("nvidia,tegra30-host1x", 0x50000000, "host1x", NULL), | ||
61 | OF_DEV_AUXDATA("nvidia,tegra30-dc", 0x54200000, "tegradc.0", NULL), | ||
62 | OF_DEV_AUXDATA("nvidia,tegra30-dc", 0x54240000, "tegradc.1", NULL), | ||
63 | OF_DEV_AUXDATA("nvidia,tegra30-hdmi", 0x54280000, "hdmi", NULL), | ||
64 | OF_DEV_AUXDATA("nvidia,tegra30-dsi", 0x54300000, "dsi", NULL), | ||
65 | OF_DEV_AUXDATA("nvidia,tegra30-tvo", 0x542c0000, "tvo", NULL), | ||
66 | {} | ||
67 | }; | ||
68 | |||
69 | static __initdata struct tegra_clk_init_table tegra_dt_clk_init_table[] = { | ||
70 | /* name parent rate enabled */ | ||
71 | { "uarta", "pll_p", 408000000, true }, | ||
72 | { "pll_a", "pll_p_out1", 564480000, true }, | ||
73 | { "pll_a_out0", "pll_a", 11289600, true }, | ||
74 | { "extern1", "pll_a_out0", 0, true }, | ||
75 | { "clk_out_1", "extern1", 0, true }, | ||
76 | { "blink", "clk_32k", 32768, true }, | ||
77 | { "i2s0", "pll_a_out0", 11289600, false}, | ||
78 | { "i2s1", "pll_a_out0", 11289600, false}, | ||
79 | { "i2s2", "pll_a_out0", 11289600, false}, | ||
80 | { "i2s3", "pll_a_out0", 11289600, false}, | ||
81 | { "i2s4", "pll_a_out0", 11289600, false}, | ||
82 | { "sdmmc1", "pll_p", 48000000, false}, | ||
83 | { "sdmmc3", "pll_p", 48000000, false}, | ||
84 | { "sdmmc4", "pll_p", 48000000, false}, | ||
85 | { "sbc1", "pll_p", 100000000, false}, | ||
86 | { "sbc2", "pll_p", 100000000, false}, | ||
87 | { "sbc3", "pll_p", 100000000, false}, | ||
88 | { "sbc4", "pll_p", 100000000, false}, | ||
89 | { "sbc5", "pll_p", 100000000, false}, | ||
90 | { "sbc6", "pll_p", 100000000, false}, | ||
91 | { "host1x", "pll_c", 150000000, false}, | ||
92 | { "disp1", "pll_p", 600000000, false}, | ||
93 | { "disp2", "pll_p", 600000000, false}, | ||
94 | { NULL, NULL, 0, 0}, | ||
95 | }; | ||
96 | |||
97 | static void __init tegra30_dt_init(void) | 40 | static void __init tegra30_dt_init(void) |
98 | { | 41 | { |
99 | tegra_clk_init_from_table(tegra_dt_clk_init_table); | 42 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); |
100 | |||
101 | of_platform_populate(NULL, of_default_bus_match_table, | ||
102 | tegra30_auxdata_lookup, NULL); | ||
103 | } | 43 | } |
104 | 44 | ||
105 | static const char *tegra30_dt_board_compat[] = { | 45 | static const char *tegra30_dt_board_compat[] = { |
@@ -112,8 +52,7 @@ DT_MACHINE_START(TEGRA30_DT, "NVIDIA Tegra30 (Flattened Device Tree)") | |||
112 | .map_io = tegra_map_common_io, | 52 | .map_io = tegra_map_common_io, |
113 | .init_early = tegra30_init_early, | 53 | .init_early = tegra30_init_early, |
114 | .init_irq = tegra_dt_init_irq, | 54 | .init_irq = tegra_dt_init_irq, |
115 | .handle_irq = gic_handle_irq, | 55 | .init_time = clocksource_of_init, |
116 | .timer = &tegra_sys_timer, | ||
117 | .init_machine = tegra30_dt_init, | 56 | .init_machine = tegra30_dt_init, |
118 | .init_late = tegra_init_late, | 57 | .init_late = tegra_init_late, |
119 | .restart = tegra_assert_system_reset, | 58 | .restart = tegra_assert_system_reset, |