Commit 90e27a05 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Simon Horman

ARM: shmobile: r8a7779: split r8a7779_init_irq_extpin() for DT

r8a7779 INTC needs IRL pin mode settings to determine
behavior of IRQ0 - IRQ3, and r8a7779_init_irq_extpin()
is controlling it via irlm parameter.
But this function registers renesas_intc_irqpin driver
if irlm was set, and this value depends on platform.
This is not good for DT.
This patch splits r8a7779_init_irq_extpin() function
into "mode settings" and "funtion register" parts
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent f564244f
...@@ -33,6 +33,7 @@ static inline struct r8a7779_pm_ch *to_r8a7779_ch(struct generic_pm_domain *d) ...@@ -33,6 +33,7 @@ static inline struct r8a7779_pm_ch *to_r8a7779_ch(struct generic_pm_domain *d)
extern void r8a7779_init_delay(void); extern void r8a7779_init_delay(void);
extern void r8a7779_init_irq_extpin(int irlm); extern void r8a7779_init_irq_extpin(int irlm);
extern void r8a7779_init_irq_extpin_dt(int irlm);
extern void r8a7779_init_irq_dt(void); extern void r8a7779_init_irq_dt(void);
extern void r8a7779_map_io(void); extern void r8a7779_map_io(void);
extern void r8a7779_earlytimer_init(void); extern void r8a7779_earlytimer_init(void);
......
...@@ -98,7 +98,7 @@ static struct resource irqpin0_resources[] __initdata = { ...@@ -98,7 +98,7 @@ static struct resource irqpin0_resources[] __initdata = {
DEFINE_RES_IRQ(gic_spi(30)), /* IRQ3 */ DEFINE_RES_IRQ(gic_spi(30)), /* IRQ3 */
}; };
void __init r8a7779_init_irq_extpin(int irlm) void __init r8a7779_init_irq_extpin_dt(int irlm)
{ {
void __iomem *icr0 = ioremap_nocache(0xfe780000, PAGE_SIZE); void __iomem *icr0 = ioremap_nocache(0xfe780000, PAGE_SIZE);
u32 tmp; u32 tmp;
...@@ -116,7 +116,11 @@ void __init r8a7779_init_irq_extpin(int irlm) ...@@ -116,7 +116,11 @@ void __init r8a7779_init_irq_extpin(int irlm)
tmp |= (1 << 21); /* LVLMODE = 1 */ tmp |= (1 << 21); /* LVLMODE = 1 */
iowrite32(tmp, icr0); iowrite32(tmp, icr0);
iounmap(icr0); iounmap(icr0);
}
void __init r8a7779_init_irq_extpin(int irlm)
{
r8a7779_init_irq_extpin_dt(irlm);
if (irlm) if (irlm)
platform_device_register_resndata( platform_device_register_resndata(
&platform_bus, "renesas_intc_irqpin", -1, &platform_bus, "renesas_intc_irqpin", -1,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment