xtensa: allow platform and variant to initialize own irq chips
PATCH 1/2 xtensa: allow platform and variant to initialize own irq chips
There was already a PLATFORM_NR_IRQS define, which is now accompanied by a VARIANT_NR_IRQS. To be able to initialize these interrupts, init_IRQ now calls variant and platform specific hooks.
--- arch/xtensa/include/asm/irq.h | 21 ++++++++++++++++++--- arch/xtensa/kernel/irq.c | 3 +++ arch/xtensa/variants/dc232b/include/variant/irq.h | 4 ++++ arch/xtensa/variants/fsf/include/variant/irq.h | 4 ++++ 4 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 arch/xtensa/variants/dc232b/include/variant/irq.h create mode 100644 arch/xtensa/variants/fsf/include/variant/irq.h
arch/xtensa/include/asm/irq.h +18 -3
@@ -11,21 +11,36 @@#ifndef _XTENSA_IRQ_H#define _XTENSA_IRQ_H +#include <linux/init.h> #include <platform/hardware.h> #include <variant/core.h> -#ifdef CONFIG_VARIANT_IRQ_SWITCH #include <variant/irq.h> -#else +#ifndef CONFIG_VARIANT_IRQ_SWITCH static inline void variant_irq_enable (unsigned int irq) { }static inline void variant_irq_disable (unsigned int irq) { }#endif +#ifndef VARIANT_NR_IRQS +# define VARIANT_NR_IRQS 0 +#endif #ifndef PLATFORM_NR_IRQS # define PLATFORM_NR_IRQS 0#endif #define XTENSA_NR_IRQS XCHAL_NUM_INTERRUPTS -#define NR_IRQS (XTENSA_NR_IRQS + PLATFORM_NR_IRQS) +#define NR_IRQS (XTENSA_NR_IRQS + VARIANT_NR_IRQS + PLATFORM_NR_IRQS) + +#if VARIANT_NR_IRQS ==0 +static inline void variant_init_IRQ (void ) { } +#else +void variant_init_IRQ (void )__init ; +#endif + +#if PLATFORM_NR_IRQS ==0 +static inline void platform_init_IRQ (void ) { } +#else +void platform_init_IRQ (void )__init ; +#endif static __inline__int irq_canonicalize (int irq) {
arch/xtensa/kernel/irq.c +3 -0
@@ -197,4 +197,7 @@ void __init init_IRQ(void) } cached_irq_mask =0 ; + +variant_init_IRQ (); +platform_init_IRQ (); }
arch/xtensa/variants/dc232b/include/variant/irq.h new file +4 -0
@@ -0,0 +1,4 @@ +#ifndef __XTENSA_VARIANT_IRQ_H +#define __XTENSA_VARIANT_IRQ_H + +#endif
arch/xtensa/variants/fsf/include/variant/irq.h new file +4 -0
@@ -0,0 +1,4 @@ +#ifndef __XTENSA_VARIANT_IRQ_H +#define __XTENSA_VARIANT_IRQ_H + +#endif
Signature · 1 line
1.6.2.107.ge47ee
PATCH 2/2 xtensa: support s6000 gpio irqs and alternate function selection
The patch implements an irq chip to handle interrupts via gpio.
As interrupts may be needed very early it is up to platform setup code to initialize gpio by calling s6_setup_gpio. Its parameter is a bitmask of those pins that should be configured for their alternative function.
--- arch/xtensa/include/asm/gpio.h | 8 +- arch/xtensa/platforms/s6105/setup.c | 3 + arch/xtensa/variants/s6000/gpio.c | 164 ++++++++++++++++++++- arch/xtensa/variants/s6000/include/variant/gpio.h | 6 + arch/xtensa/variants/s6000/include/variant/irq.h | 1 + 5 files changed, 176 insertions(+), 6 deletions(-) create mode 100644 arch/xtensa/variants/s6000/include/variant/gpio.h
arch/xtensa/include/asm/gpio.h +4 -4
@@ -38,14 +38,14 @@ static inline int gpio_cansleep(unsigned int gpio)return __gpio_cansleep (gpio); } -/* -* Not implemented, yet. -*/ static inline int gpio_to_irq (unsigned int gpio) { -return -ENOSYS ; +return __gpio_to_irq (gpio); } +/* +* Not implemented, yet. +*/ static inline int irq_to_gpio (unsigned int irq) {return -EINVAL ;
arch/xtensa/platforms/s6105/setup.c +3 -0
@@ -10,6 +10,8 @@#include <asm/bootparam.h> #include <variant/hardware.h> +#include <variant/gpio.h> +#include <platform/gpio.h> void platform_halt (void )
@@ -47,6 +49,7 @@ void __init platform_setup(char **cmdline)void __init platform_init (bp_tag_t *first) { +s6_setup_gpio (0 );gpio_request (GPIO_LED1_NGREEN ,"led1_green" );gpio_request (GPIO_LED1_RED ,"led1_red" );gpio_direction_output (GPIO_LED1_NGREEN ,1 );
arch/xtensa/variants/s6000/gpio.c +162 -2
197 lines not on this page · raw message
arch/xtensa/variants/s6000/include/variant/gpio.h new file +6 -0
@@ -0,0 +1,6 @@ +#ifndef __XTENSA_VARIANT_S6000_GPIO_H +#define __XTENSA_VARIANT_S6000_GPIO_H + +int s6_setup_gpio (u32 afsel)__init ; + +#endif
arch/xtensa/variants/s6000/include/variant/irq.h +1 -0
@@ -2,6 +2,7 @@#define __XTENSA_S6000_IRQ_H#define NO_IRQ (-1) +#define VARIANT_NR_IRQS 8/* GPIO interrupts */ extern void variant_irq_enable (unsigned int irq);extern void variant_irq_disable (unsigned int irq);
Signature · 1 line
1.6.2.107.ge47ee
PATCH v2 1/2 xtensa: allow variant to initialize own irq chips
In reply to Daniel GlöcknerThere was already a PLATFORM_NR_IRQS define, which is now accompanied by a VARIANT_NR_IRQS. To be able to initialize these interrupts, init_IRQ now calls a variant specific hook.
Changes compared to v1:
- adapted to new CONFIG_VARIANT_IRQ_EXT
- removed definition and call of platform_init_IRQ as there already is a platform_init_irq defined in asm/platform.h with a weak default in kernel/platform.c
- renamed variant_init_IRQ to variant_init_irq
Note that I could not find the call site of platform_init_irq although it is stated in platform.h that it is called from init_IRQ.
--- arch/xtensa/include/asm/irq.h | 12 +++++++++++- arch/xtensa/kernel/irq.c | 2 ++ 2 files changed, 13 insertions(+), 1 deletions(-)
arch/xtensa/include/asm/irq.h +11 -1
@@ -11,6 +11,7 @@#ifndef _XTENSA_IRQ_H#define _XTENSA_IRQ_H +#include <linux/init.h> #include <platform/hardware.h> #include <variant/core.h>
@@ -23,11 +24,20 @@ static inline void variant_irq_enable(unsigned int irq) { }static inline void variant_irq_disable (unsigned int irq) { }#endif +#ifndef VARIANT_NR_IRQS +# define VARIANT_NR_IRQS 0 +#endif #ifndef PLATFORM_NR_IRQS # define PLATFORM_NR_IRQS 0#endif #define XTENSA_NR_IRQS XCHAL_NUM_INTERRUPTS -#define NR_IRQS (XTENSA_NR_IRQS + PLATFORM_NR_IRQS) +#define NR_IRQS (XTENSA_NR_IRQS + VARIANT_NR_IRQS + PLATFORM_NR_IRQS) + +#if VARIANT_NR_IRQS ==0 +static inline void variant_init_irq (void ) { } +#else +void variant_init_irq (void )__init ; +#endif static __inline__int irq_canonicalize (int irq) {
arch/xtensa/kernel/irq.c +2 -0
@@ -197,4 +197,6 @@ void __init init_IRQ(void) } cached_irq_mask =0 ; + +variant_init_irq (); }
Signature · 1 line
1.6.1.3
PATCH v2 2/2 xtensa: support s6000 gpio irqs and alternate function selection
Implement an irq chip to handle interrupts via gpio. The GPIO chip initialization function now takes a bitmask denoting pins that should be configured for their alternate function.
changes compared to v1:
- fixed bug on edge interrupt configuration
- accommodated to function name change
- moved definition of VARIANT_NR_IRQS to this patch
- renamed __XTENSA_S6000_IRQ_H to _XTENSA_S6000_IRQ_H as requested
--- arch/xtensa/include/asm/gpio.h | 8 +- arch/xtensa/platforms/s6105/setup.c | 2 +- arch/xtensa/variants/s6000/gpio.c | 163 ++++++++++++++++++++- arch/xtensa/variants/s6000/include/variant/gpio.h | 2 +- arch/xtensa/variants/s6000/include/variant/irq.h | 5 +- 5 files changed, 171 insertions(+), 9 deletions(-)
arch/xtensa/include/asm/gpio.h +4 -4
@@ -38,14 +38,14 @@ static inline int gpio_cansleep(unsigned int gpio)return __gpio_cansleep (gpio); } -/* -* Not implemented, yet. -*/ static inline int gpio_to_irq (unsigned int gpio) { -return -ENOSYS ; +return __gpio_to_irq (gpio); } +/* +* Not implemented, yet. +*/ static inline int irq_to_gpio (unsigned int irq) {return -EINVAL ;
arch/xtensa/platforms/s6105/setup.c +1 -1
@@ -49,7 +49,7 @@ void __init platform_setup(char **cmdline)void __init platform_init (bp_tag_t *first) { -s6_gpio_init (); +s6_gpio_init (0 );gpio_request (GPIO_LED1_NGREEN ,"led1_green" );gpio_request (GPIO_LED1_RED ,"led1_red" );gpio_direction_output (GPIO_LED1_NGREEN ,1 );
arch/xtensa/variants/s6000/gpio.c +162 -1
196 lines not on this page · raw message
arch/xtensa/variants/s6000/include/variant/gpio.h +1 -1
@@ -1,6 +1,6 @@#ifndef _XTENSA_VARIANT_S6000_GPIO_H#define _XTENSA_VARIANT_S6000_GPIO_H -extern int s6_gpio_init (void ); +extern int s6_gpio_init (u32 afsel);#endif /* _XTENSA_VARIANT_S6000_GPIO_H */
arch/xtensa/variants/s6000/include/variant/irq.h +3 -2
@@ -1,7 +1,8 @@ -#ifndef __XTENSA_S6000_IRQ_H -#define __XTENSA_S6000_IRQ_H +#ifndef _XTENSA_S6000_IRQ_H +#define _XTENSA_S6000_IRQ_H#define NO_IRQ (-1) +#define VARIANT_NR_IRQS 8/* GPIO interrupts */ #define VARIANT_HAS_IRQ_ENABLE extern void variant_irq_enable (unsigned int irq);
Signature · 1 line
1.6.1.3