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

Commit 4342ec5f authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge branch 'irq/for-gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into devel

parents 5751d3dc 495c38d3

Documentation/driver-model/devres.txt

+1 −0
Original line number Diff line number Diff line
@@ -312,6 +312,7 @@ IRQ 
  devm_irq_alloc_descs_from()

  devm_irq_alloc_generic_chip()

  devm_irq_setup_generic_chip()

  devm_irq_sim_init()



LED

  devm_led_classdev_register()

include/linux/irq.h

+2 −0
Original line number Diff line number Diff line
@@ -568,6 +568,8 @@ extern int irq_chip_compose_msi_msg(struct irq_data *data, struct msi_msg *msg); 
extern int irq_chip_pm_get(struct irq_data *data);

extern int irq_chip_pm_put(struct irq_data *data);

#ifdef	CONFIG_IRQ_DOMAIN_HIERARCHY

extern void handle_fasteoi_ack_irq(struct irq_desc *desc);

extern void handle_fasteoi_mask_irq(struct irq_desc *desc);

extern void irq_chip_enable_parent(struct irq_data *data);

extern void irq_chip_disable_parent(struct irq_data *data);

extern void irq_chip_ack_parent(struct irq_data *data);

include/linux/irq_sim.h

0 → 100644
+44 −0
Original line number Diff line number Diff line 
#ifndef _LINUX_IRQ_SIM_H

#define _LINUX_IRQ_SIM_H

/*

 * Copyright (C) 2017 Bartosz Golaszewski <brgl@bgdev.pl>

 *

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

 * under  the terms of  the GNU General  Public License as published by the

 * Free Software Foundation;  either version 2 of the  License, or (at your

 * option) any later version.

 */



#include <linux/irq_work.h>

#include <linux/device.h>



/*

 * Provides a framework for allocating simulated interrupts which can be

 * requested like normal irqs and enqueued from process context.

 */



struct irq_sim_work_ctx {

	struct irq_work		work;

	int			irq;

};



struct irq_sim_irq_ctx {

	int			irqnum;

	bool			enabled;

};



struct irq_sim {

	struct irq_sim_work_ctx	work_ctx;

	int			irq_base;

	unsigned int		irq_count;

	struct irq_sim_irq_ctx	*irqs;

};



int irq_sim_init(struct irq_sim *sim, unsigned int num_irqs);

int devm_irq_sim_init(struct device *dev, struct irq_sim *sim,

		      unsigned int num_irqs);

void irq_sim_fini(struct irq_sim *sim);

void irq_sim_fire(struct irq_sim *sim, unsigned int offset);

int irq_sim_irqnum(struct irq_sim *sim, unsigned int offset);



#endif /* _LINUX_IRQ_SIM_H */

include/linux/irqdomain.h

+3 −0
Original line number Diff line number Diff line
@@ -460,6 +460,9 @@ extern void irq_domain_free_irqs_common(struct irq_domain *domain, 
extern void irq_domain_free_irqs_top(struct irq_domain *domain,

				     unsigned int virq, unsigned int nr_irqs);



extern int irq_domain_push_irq(struct irq_domain *domain, int virq, void *arg);

extern int irq_domain_pop_irq(struct irq_domain *domain, int virq);



extern int irq_domain_alloc_irqs_parent(struct irq_domain *domain,

					unsigned int irq_base,

					unsigned int nr_irqs, void *arg);

kernel/irq/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -63,11 +63,20 @@ config GENERIC_IRQ_CHIP 
config IRQ_DOMAIN

	bool



# Support for simulated interrupts

config IRQ_SIM

	bool

	select IRQ_WORK



# Support for hierarchical irq domains

config IRQ_DOMAIN_HIERARCHY

	bool

	select IRQ_DOMAIN



# Support for hierarchical fasteoi+edge and fasteoi+level handlers

config IRQ_FASTEOI_HIERARCHY_HANDLERS

	bool



# Generic IRQ IPI support

config GENERIC_IRQ_IPI

	bool