projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
arm
/
mach-shmobile
/
board-marzen-reference.c
diff --git
a/arch/arm/mach-shmobile/board-marzen-reference.c
b/arch/arm/mach-shmobile/board-marzen-reference.c
index
2773936
..
38d9cdd
100644
(file)
--- a/
arch/arm/mach-shmobile/board-marzen-reference.c
+++ b/
arch/arm/mach-shmobile/board-marzen-reference.c
@@
-19,19
+19,32
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <mach/r8a7779.h>
-#include <mach/common.h>
-#include <mach/irqs.h>
+#include <linux/clk/shmobile.h>
+#include <linux/clocksource.h>
+#include <linux/of_platform.h>
+
#include <asm/irq.h>
#include <asm/mach/arch.h>
#include <asm/irq.h>
#include <asm/mach/arch.h>
+#include "clock.h"
+#include "common.h"
+#include "irqs.h"
+#include "r8a7779.h"
+
+static void __init marzen_init_timer(void)
+{
+ r8a7779_clocks_init(r8a7779_read_mode_pins());
+ clocksource_of_init();
+}
+
static void __init marzen_init(void)
{
static void __init marzen_init(void)
{
-
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 */
}
static const char *marzen_boards_compat_dt[] __initdata = {
r8a7779_init_irq_extpin_dt(1); /* IRQ1 as individual interrupt */
}
static const char *marzen_boards_compat_dt[] __initdata = {
+ "renesas,marzen",
"renesas,marzen-reference",
NULL,
};
"renesas,marzen-reference",
NULL,
};
@@
-39,9
+52,10
@@
static const char *marzen_boards_compat_dt[] __initdata = {
DT_MACHINE_START(MARZEN, "marzen")
.smp = smp_ops(r8a7779_smp_ops),
.map_io = r8a7779_map_io,
DT_MACHINE_START(MARZEN, "marzen")
.smp = smp_ops(r8a7779_smp_ops),
.map_io = r8a7779_map_io,
- .init_early =
r8a7779
_init_delay,
- .
nr_irqs = NR_IRQS_LEGACY
,
+ .init_early =
shmobile
_init_delay,
+ .
init_time = marzen_init_timer
,
.init_irq = r8a7779_init_irq_dt,
.init_machine = marzen_init,
.init_irq = r8a7779_init_irq_dt,
.init_machine = marzen_init,
+ .init_late = shmobile_init_late,
.dt_compat = marzen_boards_compat_dt,
MACHINE_END
.dt_compat = marzen_boards_compat_dt,
MACHINE_END