diff options
author | Stephen Warren <swarren@nvidia.com> | 2012-06-28 18:29:19 -0400 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2012-06-29 19:22:08 -0400 |
commit | 2553dcc6e603e3833990bd3a29bee98d1dbdf251 (patch) | |
tree | 4628d52ffecc40168e03f42e2e813a432587860c /arch/arm | |
parent | bd976e0307fbb3c715df944ded6b70a9fa8d6bb1 (diff) |
ARM: tegra: use of_default_bus_match_table
of_default_bus_match_table is a table of default bus types supported by
of_platform_populate(). Since Tegra has no need to support any specific
custom list of bus types, modify the DT board files to use this default
list.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-tegra/board-dt-tegra20.c | 7 | ||||
-rw-r--r-- | arch/arm/mach-tegra/board-dt-tegra30.c | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/arch/arm/mach-tegra/board-dt-tegra20.c b/arch/arm/mach-tegra/board-dt-tegra20.c index 1b43c3350e3c..d0de9c1192f7 100644 --- a/arch/arm/mach-tegra/board-dt-tegra20.c +++ b/arch/arm/mach-tegra/board-dt-tegra20.c | |||
@@ -82,11 +82,6 @@ static __initdata struct tegra_clk_init_table tegra_dt_clk_init_table[] = { | |||
82 | { NULL, NULL, 0, 0}, | 82 | { NULL, NULL, 0, 0}, |
83 | }; | 83 | }; |
84 | 84 | ||
85 | static struct of_device_id tegra_dt_match_table[] __initdata = { | ||
86 | { .compatible = "simple-bus", }, | ||
87 | {} | ||
88 | }; | ||
89 | |||
90 | static void __init tegra_dt_init(void) | 85 | static void __init tegra_dt_init(void) |
91 | { | 86 | { |
92 | tegra_clk_init_from_table(tegra_dt_clk_init_table); | 87 | tegra_clk_init_from_table(tegra_dt_clk_init_table); |
@@ -95,7 +90,7 @@ static void __init tegra_dt_init(void) | |||
95 | * Finished with the static registrations now; fill in the missing | 90 | * Finished with the static registrations now; fill in the missing |
96 | * devices | 91 | * devices |
97 | */ | 92 | */ |
98 | of_platform_populate(NULL, tegra_dt_match_table, | 93 | of_platform_populate(NULL, of_default_bus_match_table, |
99 | tegra20_auxdata_lookup, NULL); | 94 | tegra20_auxdata_lookup, NULL); |
100 | } | 95 | } |
101 | 96 | ||
diff --git a/arch/arm/mach-tegra/board-dt-tegra30.c b/arch/arm/mach-tegra/board-dt-tegra30.c index 4a409862015f..ee48214bfd89 100644 --- a/arch/arm/mach-tegra/board-dt-tegra30.c +++ b/arch/arm/mach-tegra/board-dt-tegra30.c | |||
@@ -36,11 +36,6 @@ | |||
36 | #include "board.h" | 36 | #include "board.h" |
37 | #include "clock.h" | 37 | #include "clock.h" |
38 | 38 | ||
39 | static struct of_device_id tegra_dt_match_table[] __initdata = { | ||
40 | { .compatible = "simple-bus", }, | ||
41 | {} | ||
42 | }; | ||
43 | |||
44 | struct of_dev_auxdata tegra30_auxdata_lookup[] __initdata = { | 39 | struct of_dev_auxdata tegra30_auxdata_lookup[] __initdata = { |
45 | OF_DEV_AUXDATA("nvidia,tegra20-sdhci", 0x78000000, "sdhci-tegra.0", NULL), | 40 | OF_DEV_AUXDATA("nvidia,tegra20-sdhci", 0x78000000, "sdhci-tegra.0", NULL), |
46 | OF_DEV_AUXDATA("nvidia,tegra20-sdhci", 0x78000200, "sdhci-tegra.1", NULL), | 41 | OF_DEV_AUXDATA("nvidia,tegra20-sdhci", 0x78000200, "sdhci-tegra.1", NULL), |
@@ -75,7 +70,7 @@ static void __init tegra30_dt_init(void) | |||
75 | { | 70 | { |
76 | tegra_clk_init_from_table(tegra_dt_clk_init_table); | 71 | tegra_clk_init_from_table(tegra_dt_clk_init_table); |
77 | 72 | ||
78 | of_platform_populate(NULL, tegra_dt_match_table, | 73 | of_platform_populate(NULL, of_default_bus_match_table, |
79 | tegra30_auxdata_lookup, NULL); | 74 | tegra30_auxdata_lookup, NULL); |
80 | } | 75 | } |
81 | 76 | ||