diff options
author | Magnus Damm <damm+renesas@opensource.se> | 2014-06-09 08:38:53 -0400 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2014-06-17 06:35:59 -0400 |
commit | 5f65c5bd58bf027eb2bacc2294a98e7aea81c630 (patch) | |
tree | ef8f27cdfa5a5fb22b25c8b219186fa05dde6dce | |
parent | 8a0d1a2fcfd019adf9893076f6c65a9a05712853 (diff) |
ARM: shmobile: Enable R-Car Gen2 CMA code in board files
Hook in the R-Car Gen2 CMA reservation code in the board
files for Lager and Koelsch. Both the DT-reference code
and the legacy code is modified.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
-rw-r--r-- | arch/arm/mach-shmobile/board-koelsch-reference.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/board-koelsch.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/board-lager-reference.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/board-lager.c | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/board-koelsch-reference.c b/arch/arm/mach-shmobile/board-koelsch-reference.c index 28e3c45c8b90..5e0375fdc6f7 100644 --- a/arch/arm/mach-shmobile/board-koelsch-reference.c +++ b/arch/arm/mach-shmobile/board-koelsch-reference.c | |||
@@ -113,5 +113,6 @@ DT_MACHINE_START(KOELSCH_DT, "koelsch") | |||
113 | .init_time = rcar_gen2_timer_init, | 113 | .init_time = rcar_gen2_timer_init, |
114 | .init_machine = koelsch_add_standard_devices, | 114 | .init_machine = koelsch_add_standard_devices, |
115 | .init_late = shmobile_init_late, | 115 | .init_late = shmobile_init_late, |
116 | .reserve = rcar_gen2_reserve, | ||
116 | .dt_compat = koelsch_boards_compat_dt, | 117 | .dt_compat = koelsch_boards_compat_dt, |
117 | MACHINE_END | 118 | MACHINE_END |
diff --git a/arch/arm/mach-shmobile/board-koelsch.c b/arch/arm/mach-shmobile/board-koelsch.c index 0d44e7eb6508..db4b8a311c75 100644 --- a/arch/arm/mach-shmobile/board-koelsch.c +++ b/arch/arm/mach-shmobile/board-koelsch.c | |||
@@ -526,5 +526,6 @@ DT_MACHINE_START(KOELSCH_DT, "koelsch") | |||
526 | .init_time = rcar_gen2_timer_init, | 526 | .init_time = rcar_gen2_timer_init, |
527 | .init_machine = koelsch_init, | 527 | .init_machine = koelsch_init, |
528 | .init_late = shmobile_init_late, | 528 | .init_late = shmobile_init_late, |
529 | .reserve = rcar_gen2_reserve, | ||
529 | .dt_compat = koelsch_boards_compat_dt, | 530 | .dt_compat = koelsch_boards_compat_dt, |
530 | MACHINE_END | 531 | MACHINE_END |
diff --git a/arch/arm/mach-shmobile/board-lager-reference.c b/arch/arm/mach-shmobile/board-lager-reference.c index 9e0624e1b2f0..c5e656e3bae3 100644 --- a/arch/arm/mach-shmobile/board-lager-reference.c +++ b/arch/arm/mach-shmobile/board-lager-reference.c | |||
@@ -119,5 +119,6 @@ DT_MACHINE_START(LAGER_DT, "lager") | |||
119 | .init_time = rcar_gen2_timer_init, | 119 | .init_time = rcar_gen2_timer_init, |
120 | .init_machine = lager_add_standard_devices, | 120 | .init_machine = lager_add_standard_devices, |
121 | .init_late = shmobile_init_late, | 121 | .init_late = shmobile_init_late, |
122 | .reserve = rcar_gen2_reserve, | ||
122 | .dt_compat = lager_boards_compat_dt, | 123 | .dt_compat = lager_boards_compat_dt, |
123 | MACHINE_END | 124 | MACHINE_END |
diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c index 83bbb5c48863..a51d202cddcf 100644 --- a/arch/arm/mach-shmobile/board-lager.c +++ b/arch/arm/mach-shmobile/board-lager.c | |||
@@ -891,5 +891,6 @@ DT_MACHINE_START(LAGER_DT, "lager") | |||
891 | .init_time = rcar_gen2_timer_init, | 891 | .init_time = rcar_gen2_timer_init, |
892 | .init_machine = lager_init, | 892 | .init_machine = lager_init, |
893 | .init_late = shmobile_init_late, | 893 | .init_late = shmobile_init_late, |
894 | .reserve = rcar_gen2_reserve, | ||
894 | .dt_compat = lager_boards_compat_dt, | 895 | .dt_compat = lager_boards_compat_dt, |
895 | MACHINE_END | 896 | MACHINE_END |