Skip to content

Commit

Permalink
sh: hd64461: Handle virq offset for offchip IRQ base and HD64461 IRQ
Browse files Browse the repository at this point in the history
commit 7c28a35 upstream.

A recent change to start counting SuperH IRQ #s from 16 breaks support
for the Hitachi HD64461 companion chip.

Move the offchip IRQ base and HD64461 IRQ # by 16 in order to
accommodate for the new virq numbering rules.

Fixes: a8ac296 ("sh: Avoid using IRQ0 on SH3 and SH4")
Signed-off-by: Artur Rojek <contact@artur-rojek.eu>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Link: https://lore.kernel.org/r/20230710233132.69734-1-contact@artur-rojek.eu
Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Artur Rojek authored and Greg Kroah-Hartman committed Jul 19, 2023
1 parent 0ff5d21 commit c55b552
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions arch/sh/cchips/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ endchoice
config HD64461_IRQ
int "HD64461 IRQ"
depends on HD64461
default "36"
default "52"
help
The default setting of the HD64461 IRQ is 36.
The default setting of the HD64461 IRQ is 52.

Do not change this unless you know what you are doing.

Expand Down
2 changes: 1 addition & 1 deletion arch/sh/include/asm/hd64461.h
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@
#define HD64461_NIMR HD64461_IO_OFFSET(0x5002)

#define HD64461_IRQBASE OFFCHIP_IRQ_BASE
#define OFFCHIP_IRQ_BASE 64
#define OFFCHIP_IRQ_BASE (64 + 16)
#define HD64461_IRQ_NUM 16

#define HD64461_IRQ_UART (HD64461_IRQBASE+5)
Expand Down

0 comments on commit c55b552

Please sign in to comment.