diff options
author | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-11 10:41:07 +0300 |
---|---|---|
committer | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-04-13 08:17:18 +0300 |
commit | e09b41010ba33a20a87472ee821fa407a5b8da36 (patch) | |
tree | d10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/drivers/staging/board/kzm9d.c | |
parent | f93b97fd65072de626c074dbe099a1fff05ce060 (diff) |
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
are taken from kernel.org, and rt patch from the rt wiki download page.
During the rebasing, the following patch collided:
Force tick interrupt and get rid of softirq magic(I70131fb85).
Collisions have been removed because its logic was found on the
source already.
Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769
Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/drivers/staging/board/kzm9d.c')
-rw-r--r-- | kernel/drivers/staging/board/kzm9d.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/kernel/drivers/staging/board/kzm9d.c b/kernel/drivers/staging/board/kzm9d.c index 533f3026e..8d1eb09bc 100644 --- a/kernel/drivers/staging/board/kzm9d.c +++ b/kernel/drivers/staging/board/kzm9d.c @@ -4,16 +4,22 @@ #include <linux/platform_device.h> #include "board.h" -static const struct resource usbs1_res[] __initconst = { +static struct resource usbs1_res[] __initdata = { DEFINE_RES_MEM(0xe2800000, 0x2000), DEFINE_RES_IRQ(159), }; static void __init kzm9d_init(void) { - if (!board_staging_dt_node_available(usbs1_res, ARRAY_SIZE(usbs1_res))) + board_staging_gic_setup_xlate("arm,cortex-a9-gic", 32); + + if (!board_staging_dt_node_available(usbs1_res, + ARRAY_SIZE(usbs1_res))) { + board_staging_gic_fixup_resources(usbs1_res, + ARRAY_SIZE(usbs1_res)); platform_device_register_simple("emxx_udc", -1, usbs1_res, ARRAY_SIZE(usbs1_res)); + } } board_staging("renesas,kzm9d", kzm9d_init); |