diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2014-05-15 20:32:03 +0900 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2014-06-17 19:56:27 +0900 |
| commit | f8fba0ce6628109bac9d33f65b637a87a2f3be24 (patch) | |
| tree | cd469d5a715abdf830c9876b1373e9bf780081a4 | |
| parent | f48039a3da40f0c193122c83ad582913f2daf29d (diff) | |
ARM: shmobile: marzen-reference: Move clock and OF device initialisation into board code
Move the clock initialisation and OF device population from
SoC to board code. This is in keeping with the pattern used by Lager.
And the clock portion is part of decoupling clock initialisation
from SoC code in preparation for moving to the common clock framework.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
| -rw-r--r-- | arch/arm/mach-shmobile/board-marzen-reference.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/setup-r8a7779.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-shmobile/board-marzen-reference.c b/arch/arm/mach-shmobile/board-marzen-reference.c index 94bd57203ff..46ed17a5018 100644 --- a/arch/arm/mach-shmobile/board-marzen-reference.c +++ b/arch/arm/mach-shmobile/board-marzen-reference.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <linux/of_platform.h> #include <mach/r8a7779.h> #include <asm/irq.h> #include <asm/mach/arch.h> @@ -27,7 +28,9 @@ static void __init marzen_init(void) { + r8a7779_clock_init(); r8a7779_add_standard_devices_dt(); + of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); r8a7779_init_irq_extpin_dt(1); /* IRQ1 as individual interrupt */ } diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c index 23122f62366..15f533b8970 100644 --- a/arch/arm/mach-shmobile/setup-r8a7779.c +++ b/arch/arm/mach-shmobile/setup-r8a7779.c @@ -744,12 +744,8 @@ void __init r8a7779_init_delay(void) void __init r8a7779_add_standard_devices_dt(void) { - /* clocks are setup late during boot in the case of DT */ - r8a7779_clock_init(); - platform_add_devices(r8a7779_devices_dt, ARRAY_SIZE(r8a7779_devices_dt)); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); } #define MODEMR 0xffcc0020 |