diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-06-12 23:18:13 +0300 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-06-12 23:18:13 +0300 |
| commit | c62af70ff3015a4412c6655de602fdf7f1ecdaa6 (patch) | |
| tree | 261e77bd7c81f54a65a15c61ddc823ecaa61bccd /include | |
| parent | 9de44aa4dc969e4a46c2bfbd33d65bfa6ad2a15d (diff) | |
| parent | 22b67acd99c00e3fdc66869cd43fd539bab0ef8c (diff) | |
| download | linux-c62af70ff3015a4412c6655de602fdf7f1ecdaa6.tar.xz | |
Merge branch 'sa1100' into for-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/irqchip/irq-sa11x0.h | 17 | ||||
| -rw-r--r-- | include/soc/sa1100/pwer.h | 15 |
2 files changed, 32 insertions, 0 deletions
diff --git a/include/linux/irqchip/irq-sa11x0.h b/include/linux/irqchip/irq-sa11x0.h new file mode 100644 index 000000000000..15db6829c1e4 --- /dev/null +++ b/include/linux/irqchip/irq-sa11x0.h @@ -0,0 +1,17 @@ +/* + * 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 diff --git a/include/soc/sa1100/pwer.h b/include/soc/sa1100/pwer.h new file mode 100644 index 000000000000..15a545b5a1f6 --- /dev/null +++ b/include/soc/sa1100/pwer.h @@ -0,0 +1,15 @@ +#ifndef SOC_SA1100_PWER_H +#define SOC_SA1100_PWER_H + +/* + * Copyright (C) 2015, Dmitry Eremin-Solenikov + * + * 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. + */ + +int sa11x0_gpio_set_wake(unsigned int gpio, unsigned int on); +int sa11x0_sc_set_wake(unsigned int irq, unsigned int on); + +#endif |