ARM: SAMSUNG: Convert irq-uart to use new irq_ functions
Subsystems (2)
PATCH 1/2 ARM: SAMSUNG: Convert irq-uart to use new irq_ functions
Convert to the new irq_ versions of the IRQ operations. As well as the textual substituion of irq_data for the raw IRQ number we also convert the register base lookup to in s3c_irq_uart_base() to pick the irq_data up directly.
--- arch/arm/plat-samsung/irq-uart.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-)
arch/arm/plat-samsung/irq-uart.c +18 -18
@@ -28,9 +28,9 @@* are consecutive when looking up the interrupt in the demux routines. */ -static inline void __iomem *s3c_irq_uart_base (unsigned int irq) +static inline void __iomem *s3c_irq_uart_base (struct irq_data *data) { -struct s3c_uart_irq *uirq =get_irq_chip_data (irq); +struct s3c_uart_irq *uirq = data->chip_data;return uirq->regs; }
@@ -39,10 +39,10 @@ static inline unsigned int s3c_irq_uart_bit(unsigned int irq)return irq &3 ; } -static void s3c_irq_uart_mask (unsigned int irq) +static void s3c_irq_uart_mask (struct irq_data *data) { -void __iomem *regs =s3c_irq_uart_base (irq); -unsigned int bit =s3c_irq_uart_bit (irq); +void __iomem *regs =s3c_irq_uart_base (data); +unsigned int bit =s3c_irq_uart_bit (data->irq);u32 reg; reg =__raw_readl (regs +S3C64XX_UINTM );
@@ -50,10 +50,10 @@ static void s3c_irq_uart_mask(unsigned int irq)__raw_writel (reg, regs +S3C64XX_UINTM ); } -static void s3c_irq_uart_maskack (unsigned int irq) +static void s3c_irq_uart_maskack (struct irq_data *data) { -void __iomem *regs =s3c_irq_uart_base (irq); -unsigned int bit =s3c_irq_uart_bit (irq); +void __iomem *regs =s3c_irq_uart_base (data); +unsigned int bit =s3c_irq_uart_bit (data->irq);u32 reg; reg =__raw_readl (regs +S3C64XX_UINTM );
@@ -62,10 +62,10 @@ static void s3c_irq_uart_maskack(unsigned int irq)__raw_writel (1 << bit, regs +S3C64XX_UINTP ); } -static void s3c_irq_uart_unmask (unsigned int irq) +static void s3c_irq_uart_unmask (struct irq_data *data) { -void __iomem *regs =s3c_irq_uart_base (irq); -unsigned int bit =s3c_irq_uart_bit (irq); +void __iomem *regs =s3c_irq_uart_base (data); +unsigned int bit =s3c_irq_uart_bit (data->irq);u32 reg; reg =__raw_readl (regs +S3C64XX_UINTM );
@@ -73,10 +73,10 @@ static void s3c_irq_uart_unmask(unsigned int irq)__raw_writel (reg, regs +S3C64XX_UINTM ); } -static void s3c_irq_uart_ack (unsigned int irq) +static void s3c_irq_uart_ack (struct irq_data *data) { -void __iomem *regs =s3c_irq_uart_base (irq); -unsigned int bit =s3c_irq_uart_bit (irq); +void __iomem *regs =s3c_irq_uart_base (data); +unsigned int bit =s3c_irq_uart_bit (data->irq);__raw_writel (1 << bit, regs +S3C64XX_UINTP ); }
@@ -99,10 +99,10 @@ static void s3c_irq_demux_uart(unsigned int irq, struct irq_desc *desc)static struct irq_chip s3c_irq_uart = { .name ="s3c-uart" , - .mask = s3c_irq_uart_mask, - .unmask = s3c_irq_uart_unmask, - .mask_ack = s3c_irq_uart_maskack, - .ack = s3c_irq_uart_ack, + .irq_mask = s3c_irq_uart_mask, + .irq_unmask = s3c_irq_uart_unmask, + .irq_mask_ack = s3c_irq_uart_maskack, + .irq_ack = s3c_irq_uart_ack, };static void __init s3c_init_uart_irq (struct s3c_uart_irq *uirq)
Signature · 1 line
1.7.1
PATCH 2/2 ARM: SAMSUNG: Convert irq-vic-timer to irq_ functions
Conver the VIC timer interrupts to use the irq_ versions of the IRQ operatiosn introduced in 2.6.37, storing the mask for the timer interrupt in the chip_data of the irq_data in order to save having to do a substraction and a shift on every operation.
--- arch/arm/plat-samsung/irq-vic-timer.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-)
arch/arm/plat-samsung/irq-vic-timer.c +13 -9
@@ -29,38 +29,41 @@ static void s3c_irq_demux_vic_timer(unsigned int irq, struct irq_desc *desc)/* We assume the IRQ_TIMER0..IRQ_TIMER4 range is continuous. */ -static void s3c_irq_timer_mask (unsigned int irq) +static void s3c_irq_timer_mask (struct irq_data *data) {u32 reg =__raw_readl (S3C64XX_TINT_CSTAT ); +u32 mask = (u32 )data->chip_data; reg &=0x1f ;/* mask out pending interrupts */ - reg &= ~(1 << (irq -IRQ_TIMER0 )); + reg &= ~mask;__raw_writel (reg,S3C64XX_TINT_CSTAT ); } -static void s3c_irq_timer_unmask (unsigned int irq) +static void s3c_irq_timer_unmask (struct irq_data *data) {u32 reg =__raw_readl (S3C64XX_TINT_CSTAT ); +u32 mask = (u32 )data->chip_data; reg &=0x1f ;/* mask out pending interrupts */ - reg |=1 << (irq -IRQ_TIMER0 ); + reg |= mask;__raw_writel (reg,S3C64XX_TINT_CSTAT ); } -static void s3c_irq_timer_ack (unsigned int irq) +static void s3c_irq_timer_ack (struct irq_data *data) {u32 reg =__raw_readl (S3C64XX_TINT_CSTAT ); +u32 mask = (u32 )data->chip_data; reg &=0x1f ; - reg |= (1 <<5 ) << (irq -IRQ_TIMER0 ); + reg |= mask <<5 ;__raw_writel (reg,S3C64XX_TINT_CSTAT ); }static struct irq_chip s3c_irq_timer = { .name ="s3c-timer" , - .mask = s3c_irq_timer_mask, - .unmask = s3c_irq_timer_unmask, - .ack = s3c_irq_timer_ack, + .irq_mask = s3c_irq_timer_mask, + .irq_unmask = s3c_irq_timer_unmask, + .irq_ack = s3c_irq_timer_ack, };/**
@@ -79,6 +82,7 @@ void __init s3c_init_vic_timer_irq(unsigned int parent_irq,set_irq_chained_handler (parent_irq, s3c_irq_demux_vic_timer);set_irq_chip (timer_irq, &s3c_irq_timer); +set_irq_chip_data (timer_irq, (void *)(1 << (timer_irq -IRQ_TIMER0 )));set_irq_handler (timer_irq, handle_level_irq);set_irq_flags (timer_irq,IRQF_VALID );
Signature · 1 line
1.7.1
PATCH 2/2 ARM: SAMSUNG: Convert irq-vic-timer to irq_ functions
arch/arm/plat-samsung/irq-vic-timer.c void __init s3c_init_vic_timer_irq(unsigned int
Quoted 69 lines · Mark Brown
Conver the VIC timer interrupts to use the
irq_versions of the IRQ operatiosn introduced in 2.6.37, storing the mask for the timer interrupt in thechip_dataof theirq_datain order to save having to do a substraction and a shift on every operation.Signed-off-by Mark Brown <[email protected]>--- arch/arm/plat-samsung/irq-vic-timer.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-)arch/arm/plat- renamed from arch/arm/plat-samsung/irq-vic-timer.c +0
-0
samsung/irq-vic-timer.c
index 0270519..7ce77dd 100644arch/arm/plat-samsung/irq-vic-timer.c +12
-9@@ -29,38 +29,41 @@ static void s3c_irq_demux_vic_timer(unsigned int irq, struct irq_desc *desc)/* We assume the IRQ_TIMER0..IRQ_TIMER4 range is continuous. */ -static void s3c_irq_timer_mask (unsigned int irq) +static void s3c_irq_timer_mask (struct irq_data *data) {u32 reg =__raw_readl (S3C64XX_TINT_CSTAT ); +u32 mask = (u32 )data->chip_data; reg &=0x1f ;/* mask out pending interrupts */ - reg &= ~(1 << (irq -IRQ_TIMER0 )); + reg &= ~mask;__raw_writel (reg,S3C64XX_TINT_CSTAT ); } -static void s3c_irq_timer_unmask (unsigned int irq) +static void s3c_irq_timer_unmask (struct irq_data *data) {u32 reg =__raw_readl (S3C64XX_TINT_CSTAT ); +u32 mask = (u32 )data->chip_data; reg &=0x1f ;/* mask out pending interrupts */ - reg |=1 << (irq -IRQ_TIMER0 ); + reg |= mask;__raw_writel (reg,S3C64XX_TINT_CSTAT ); } -static void s3c_irq_timer_ack (unsigned int irq) +static void s3c_irq_timer_ack (struct irq_data *data) {u32 reg =__raw_readl (S3C64XX_TINT_CSTAT ); +u32 mask = (u32 )data->chip_data; reg &=0x1f ; - reg |= (1 <<5 ) << (irq -IRQ_TIMER0 ); + reg |= mask <<5 ;__raw_writel (reg,S3C64XX_TINT_CSTAT ); }static struct irq_chip s3c_irq_timer = { .name ="s3c-timer" , - .mask = s3c_irq_timer_mask, - .unmask = s3c_irq_timer_unmask, - .ack = s3c_irq_timer_ack, + .irq_mask = s3c_irq_timer_mask, + .irq_unmask = s3c_irq_timer_unmask, + .irq_ack = s3c_irq_timer_ack, };/**
arch/arm/plat-samsung/irq-vic-timer.c +0
-0@@ -79,6 +82,7 @@ void __init s3c_init_vic_timer_irq(unsigned int
parent_irq,
arch/arm/plat-samsung/irq-vic-timer.c void __init s3c_init_vic_timer_irq(unsigned int parent_irq,
Quoted 4 lines
arch/arm/plat-samsung/irq-vic-timer.c +1
-0set_irq_chained_handler (parent_irq, s3c_irq_demux_vic_timer);set_irq_chip (timer_irq, &s3c_irq_timer); + set_irq_chip_data(timer_irq, (void *)(1 << (timer_irq -
IRQ_TIMER0)));
arch/arm/plat-samsung/irq-vic-timer.c void __init s3c_init_vic_timer_irq(unsigned int parent_irq,
Quoted 4 lines
arch/arm/plat-samsung/irq-vic-timer.c +0
-1set_irq_handler (timer_irq, handle_level_irq);set_irq_flags (timer_irq,IRQF_VALID ); --
Looks ok to me..will apply :-)
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
PATCH 1/2 ARM: SAMSUNG: Convert irq-uart to use new irq_ functions
In reply to Mark BrownQuoted 9 lines · Mark Brown
Convert to the new
irq_versions of the IRQ operations. As well as the textual substituion ofirq_datafor the raw IRQ number we also convert the register base lookup to ins3c_irq_uart_base()to pick theirq_dataup directly.Signed-off-by Mark Brown <[email protected]>--- arch/arm/plat-samsung/irq-uart.c | 36
++++++++++++++++++------------------
arch/arm/plat-samsung/irq-uart.c static inline unsigned int s3c_irq_uart_bit(unsigned
Quoted 20 lines
1 files changed, 18 insertions(+), 18 deletions(-)arch/arm/plat-samsung/irq- renamed from arch/arm/plat-samsung/irq-uart.c +0
-0
uart.c
index 4f8c102..da31d78 100644arch/arm/plat-samsung/irq-uart.c +2
-2@@ -28,9 +28,9 @@* are consecutive when looking up the interrupt in the demux routines. */ -static inline void __iomem *s3c_irq_uart_base (unsigned int irq) +static inline void __iomem *s3c_irq_uart_base (struct irq_data *data) { -struct s3c_uart_irq *uirq =get_irq_chip_data (irq); +struct s3c_uart_irq *uirq = data->chip_data;return uirq->regs; }@@ -39,10 +39,10 @@ static inline unsigned int s3c_irq_uart_bit(unsigned
int
arch/arm/plat-samsung/irq-uart.c static void s3c_irq_demux_uart(unsigned int irq,
Quoted 57 lines
arch/arm/plat-samsung/irq-uart.c +3
-3irq)return irq &3 ; } -static void s3c_irq_uart_mask (unsigned int irq) +static void s3c_irq_uart_mask (struct irq_data *data) { -void __iomem *regs =s3c_irq_uart_base (irq); -unsigned int bit =s3c_irq_uart_bit (irq); +void __iomem *regs =s3c_irq_uart_base (data); +unsigned int bit =s3c_irq_uart_bit (data->irq);u32 reg;arch/arm/plat-samsung/irq-uart.c +9
-9reg =__raw_readl (regs +S3C64XX_UINTM );@@ -50,10 +50,10 @@ static void s3c_irq_uart_mask(unsigned int irq)__raw_writel (reg, regs +S3C64XX_UINTM ); } -static void s3c_irq_uart_maskack (unsigned int irq) +static void s3c_irq_uart_maskack (struct irq_data *data) { -void __iomem *regs =s3c_irq_uart_base (irq); -unsigned int bit =s3c_irq_uart_bit (irq); +void __iomem *regs =s3c_irq_uart_base (data); +unsigned int bit =s3c_irq_uart_bit (data->irq);u32 reg; reg =__raw_readl (regs +S3C64XX_UINTM );@@ -62,10 +62,10 @@ static void s3c_irq_uart_maskack(unsigned int irq)__raw_writel (1 << bit, regs +S3C64XX_UINTP ); } -static void s3c_irq_uart_unmask (unsigned int irq) +static void s3c_irq_uart_unmask (struct irq_data *data) { -void __iomem *regs =s3c_irq_uart_base (irq); -unsigned int bit =s3c_irq_uart_bit (irq); +void __iomem *regs =s3c_irq_uart_base (data); +unsigned int bit =s3c_irq_uart_bit (data->irq);u32 reg; reg =__raw_readl (regs +S3C64XX_UINTM );@@ -73,10 +73,10 @@ static void s3c_irq_uart_unmask(unsigned int irq)__raw_writel (reg, regs +S3C64XX_UINTM ); } -static void s3c_irq_uart_ack (unsigned int irq) +static void s3c_irq_uart_ack (struct irq_data *data) { -void __iomem *regs =s3c_irq_uart_base (irq); -unsigned int bit =s3c_irq_uart_bit (irq); +void __iomem *regs =s3c_irq_uart_base (data); +unsigned int bit =s3c_irq_uart_bit (data->irq);__raw_writel (1 << bit, regs +S3C64XX_UINTP ); }@@ -99,10 +99,10 @@ static void s3c_irq_demux_uart(unsigned int irq,
struct
Quoted 14 lines
arch/arm/plat-samsung/irq-uart.c +4
-4irq_desc *desc)static struct irq_chip s3c_irq_uart = { .name ="s3c-uart" , - .mask = s3c_irq_uart_mask, - .unmask = s3c_irq_uart_unmask, - .mask_ack = s3c_irq_uart_maskack, - .ack = s3c_irq_uart_ack, + .irq_mask = s3c_irq_uart_mask, + .irq_unmask = s3c_irq_uart_unmask, + .irq_mask_ack = s3c_irq_uart_maskack, + .irq_ack = s3c_irq_uart_ack, };
Quoted 2 lines
static void
__inits3c_init_uart_irq(struct s3c_uart_irq *uirq)
--
Looks ok to me...will apply.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.