Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85e6f097 authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Russell King
Browse files

ARM: 8367/1: sa1100: prepare for moving irq driver to drivers/irqchip 



Prepare for moving sa1100 irq driver to irqchip infrastructure - split
sa1100_init_irq into helper code and irq parts.

Signed-off-by: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 60c06c4c

arch/arm/mach-sa1100/generic.c

+13 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/ioport.h>

#include <linux/platform_device.h>

#include <linux/reboot.h>

#include <linux/irqchip/irq-sa11x0.h>



#include <video/sa1100fb.h>
@@ -377,6 +378,18 @@ void __init sa1100_timer_init(void) 
	pxa_timer_nodt_init(IRQ_OST0, io_p2v(0x90000000), 3686400);

}



static struct resource irq_resource =

	DEFINE_RES_MEM_NAMED(0x90050000, SZ_64K, "irqs");



void __init sa1100_init_irq(void)

{

	request_resource(&iomem_resource, &irq_resource);



	sa11x0_init_irq_nodt(IRQ_GPIO0_SC, irq_resource.start);



	sa1100_init_gpio();

}



/*

 * Disable the memory bus request/grant signals on the SA1110 to

 * ensure that we don't receive spurious memory requests.  We set

arch/arm/mach-sa1100/irq.c

+6 −15
Original line number Diff line number Diff line 
/*

 * linux/arch/arm/mach-sa1100/irq.c

 *

 * Copyright (C) 2015 Dmitry Eremin-Solenikov

 * Copyright (C) 1999-2001 Nicolas Pitre

 *

 * Generic IRQ handling for the SA11x0, GPIO 11-27 IRQ demultiplexing.

 * Generic IRQ handling for the SA11x0.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as
@@ -15,16 +16,13 @@ 
#include <linux/io.h>

#include <linux/irq.h>

#include <linux/irqdomain.h>

#include <linux/ioport.h>

#include <linux/syscore_ops.h>

#include <linux/irqchip/irq-sa11x0.h>



#include <soc/sa1100/pwer.h>



#include <mach/irqs.h>

#include <asm/exception.h>



#include "generic.h"



#define ICIP	0x00  /* IC IRQ Pending reg. */

#define ICMR	0x04  /* IC Mask Reg.        */

#define ICLR	0x08  /* IC Level Reg.       */
@@ -86,9 +84,6 @@ static struct irq_domain_ops sa1100_normal_irqdomain_ops = { 


static struct irq_domain *sa1100_normal_irqdomain;



static struct resource irq_resource =

	DEFINE_RES_MEM_NAMED(0x90050000, SZ_64K, "irqs");



static struct sa1100irq_state {

	unsigned int	saved;

	unsigned int	icmr;
@@ -156,11 +151,9 @@ sa1100_handle_irq(struct pt_regs *regs) 
	} while (1);

}



void __init sa1100_init_irq(void)

void __init sa11x0_init_irq_nodt(int irq_start, resource_size_t io_start)

{

	request_resource(&iomem_resource, &irq_resource);



	iobase = ioremap(irq_resource.start, SZ_64K);

	iobase = ioremap(io_start, SZ_64K);

	if (WARN_ON(!iobase))

		return;
@@ -177,10 +170,8 @@ void __init sa1100_init_irq(void) 
	writel_relaxed(1, iobase + ICCR);



	sa1100_normal_irqdomain = irq_domain_add_simple(NULL,

			32, IRQ_GPIO0_SC,

			32, irq_start,

			&sa1100_normal_irqdomain_ops, NULL);



	set_handle_irq(sa1100_handle_irq);



	sa1100_init_gpio();

}

include/linux/irqchip/irq-sa11x0.h

0 → 100644
+17 −0
Original line number Diff line number Diff line 
/*

 * Generic IRQ handling for the SA11x0.

 *

 * Copyright (C) 2015 Dmitry Eremin-Solenikov

 * Copyright (C) 1999-2001 Nicolas Pitre

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#ifndef __INCLUDE_LINUX_IRQCHIP_IRQ_SA11x0_H

#define __INCLUDE_LINUX_IRQCHIP_IRQ_SA11x0_H



void __init sa11x0_init_irq_nodt(int irq_start, resource_size_t io_start);



#endif