Skip to content

Commit 28111dd

Browse files
olofjolofj
committed
Merge tag 'renesas-soc-fixes3-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes
Merge "Third Round of Renesas ARM Based SoC Fixes for v3.19" from Simon Horman: * Instantiate GIC from C board code in legacy builds on r8a7790 and r8a73a4 * tag 'renesas-soc-fixes3-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: r8a7790: Instantiate GIC from C board code in legacy builds ARM: shmobile: r8a73a4: Instantiate GIC from C board code in legacy builds Signed-off-by: Olof Johansson <olof@lixom.net>
2 parents eab8d65 + 77cf516 commit 28111dd

File tree

4 files changed

+47
-0
lines changed

4 files changed

+47
-0
lines changed

‎arch/arm/mach-shmobile/board-ape6evm.c

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
#include <linux/gpio_keys.h>
1919
#include <linux/input.h>
2020
#include <linux/interrupt.h>
21+
#include <linux/irqchip.h>
22+
#include <linux/irqchip/arm-gic.h>
2123
#include <linux/kernel.h>
2224
#include <linux/mfd/tmio.h>
2325
#include <linux/mmc/host.h>
@@ -273,14 +275,32 @@ static void __init ape6evm_add_standard_devices(void)
273275
sizeof(ape6evm_leds_pdata));
274276
}
275277

278+
static void __init ape6evm_legacy_init_time(void)
279+
{
280+
/* Do not invoke DT-based timers via clocksource_of_init() */
281+
}
282+
283+
static void __init ape6evm_legacy_init_irq(void)
284+
{
285+
void __iomem *gic_dist_base = ioremap_nocache(0xf1001000, 0x1000);
286+
void __iomem *gic_cpu_base = ioremap_nocache(0xf1002000, 0x1000);
287+
288+
gic_init(0, 29, gic_dist_base, gic_cpu_base);
289+
290+
/* Do not invoke DT-based interrupt code via irqchip_init() */
291+
}
292+
293+
276294
static const char *ape6evm_boards_compat_dt[] __initdata = {
277295
"renesas,ape6evm",
278296
NULL,
279297
};
280298

281299
DT_MACHINE_START(APE6EVM_DT, "ape6evm")
282300
.init_early = shmobile_init_delay,
301+
.init_irq = ape6evm_legacy_init_irq,
283302
.init_machine = ape6evm_add_standard_devices,
284303
.init_late = shmobile_init_late,
285304
.dt_compat = ape6evm_boards_compat_dt,
305+
.init_time = ape6evm_legacy_init_time,
286306
MACHINE_END

‎arch/arm/mach-shmobile/board-lager.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
#include <linux/input.h>
2222
#include <linux/interrupt.h>
2323
#include <linux/irq.h>
24+
#include <linux/irqchip.h>
25+
#include <linux/irqchip/arm-gic.h>
2426
#include <linux/kernel.h>
2527
#include <linux/leds.h>
2628
#include <linux/mfd/tmio.h>
@@ -811,6 +813,16 @@ static void __init lager_init(void)
811813
lager_ksz8041_fixup);
812814
}
813815

816+
static void __init lager_legacy_init_irq(void)
817+
{
818+
void __iomem *gic_dist_base = ioremap_nocache(0xf1001000, 0x1000);
819+
void __iomem *gic_cpu_base = ioremap_nocache(0xf1002000, 0x1000);
820+
821+
gic_init(0, 29, gic_dist_base, gic_cpu_base);
822+
823+
/* Do not invoke DT-based interrupt code via irqchip_init() */
824+
}
825+
814826
static const char * const lager_boards_compat_dt[] __initconst = {
815827
"renesas,lager",
816828
NULL,
@@ -819,6 +831,7 @@ static const char * const lager_boards_compat_dt[] __initconst = {
819831
DT_MACHINE_START(LAGER_DT, "lager")
820832
.smp = smp_ops(r8a7790_smp_ops),
821833
.init_early = shmobile_init_delay,
834+
.init_irq = lager_legacy_init_irq,
822835
.init_time = rcar_gen2_timer_init,
823836
.init_machine = lager_init,
824837
.init_late = shmobile_init_late,

‎arch/arm/mach-shmobile/setup-rcar-gen2.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,9 @@ void __init rcar_gen2_timer_init(void)
133133
#ifdef CONFIG_COMMON_CLK
134134
rcar_gen2_clocks_init(mode);
135135
#endif
136+
#ifdef CONFIG_ARCH_SHMOBILE_MULTI
136137
clocksource_of_init();
138+
#endif
137139
}
138140

139141
struct memory_reserve_config {

‎arch/arm/mach-shmobile/timer.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,18 @@ void __init shmobile_init_delay(void)
7070
if (!max_freq)
7171
return;
7272

73+
#ifdef CONFIG_ARCH_SHMOBILE_LEGACY
74+
/* Non-multiplatform r8a73a4 SoC cannot use arch timer due
75+
* to GIC being initialized from C and arch timer via DT */
76+
if (of_machine_is_compatible("renesas,r8a73a4"))
77+
has_arch_timer = false;
78+
79+
/* Non-multiplatform r8a7790 SoC cannot use arch timer due
80+
* to GIC being initialized from C and arch timer via DT */
81+
if (of_machine_is_compatible("renesas,r8a7790"))
82+
has_arch_timer = false;
83+
#endif
84+
7385
if (!has_arch_timer || !IS_ENABLED(CONFIG_ARM_ARCH_TIMER)) {
7486
if (is_a7_a8_a9)
7587
shmobile_setup_delay_hz(max_freq, 1, 3);

0 commit comments

Comments
 (0)