[PATCH] m68k: amiga: Fix Denise detection on OCS

[PATCH] m68k: amiga: Fix Denise detection on OCS

[Geert Uytterhoeven]

The "default" statement for detecting an original Denise chip seems to
be misplaced, causing original Denise chips not being detected.

Fix this by moving it from the outer to the inner "switch" statement.

Fortunately no code relies on this, but the detected version is printed
during boot, and available through /proc/hardware.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
Untested due to lack of hardware.

  - Anyone with an old A2000 with accelerator running Linux?
  - The initital version of Denise does not have the DENISEID register,
    and reading it returns random data (last value seen on the bus).
    Has anyone ever seen it being mis-identified by Linux as Denise HR
    or Lisa?
---
 arch/m68k/amiga/config.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c
index c32ab8041cf6b8dc..95bcd4a13bf86741 100644
--- a/arch/m68k/amiga/config.c
+++ b/arch/m68k/amiga/config.c
@@ -278,11 +278,11 @@ static void __init amiga_identify(void)
 			case 0x08:
 				AMIGAHW_SET(LISA);
 				break;
+			default:
+				AMIGAHW_SET(DENISE);
+				break;
 			}
 			break;
-		default:
-			AMIGAHW_SET(DENISE);
-			break;
 		}
 		switch ((amiga_custom.vposr>>8) & 0x7f) {
 		case 0x00:
-- 
2.17.1

Re: [PATCH] m68k: amiga: Fix Denise detection on OCS

[Geert Uytterhoeven]

On Sun, Jan 12, 2020 at 6:17 PM Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> The "default" statement for detecting an original Denise chip seems to
> be misplaced, causing original Denise chips not being detected.
>
> Fix this by moving it from the outer to the inner "switch" statement.
>
> Fortunately no code relies on this, but the detected version is printed
> during boot, and available through /proc/hardware.
>
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

Applied, and queued in the m68k for-v5.10 branch.

Gr{oetje,eeting}s,

                        Geert


--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds