github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

swim: Enable clock divider only where appropriate

Browse Source 
Some models have a 16 MHz FCLK oscillator and others 32 MHz. Put this
information into the swim device platform_data so that the driver can
correctly enable the clock divider. When this is enabled incorrectly,
nothing can be read and failures from the Error Correction Machine are
flagged in the error register.

Cc: Joshua Thompson <funaho@jurai.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Fixes: 8852ecd974 ("m68k: mac - Add SWIM floppy support")
Signed-off-by: Finn Thain <fthain@linux-m68k.org>
Tested-by: Stan Johnson <userm57@yahoo.com>
Link: https://patch.msgid.link/483efa2f8ac6beb2a2d4fa2d8b431cb1a8b560c7.1788513997.git.fthain@linux-m68k.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Finn Thain 2026-09-04 19:26:36 +10:00 committed by Jens Axboe
parent 62977e8ea9
commit 3c02a14c89
2 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
arch/m68k/mac/config.c
View File

@ -984,8 +984,37 @@ static int __init mac_platform_init(void)
.start = swim_base,
.end = swim_base + 0x1FFF,
};
bool fast_fclk = false;
platform_device_register_simple("swim", -1, &swim_rsrc, 1);
/* Models in this list are supposed to run FCLK at 32 MHz */
switch (macintosh_config->ident) {
case MAC_MODEL_CCL:
case MAC_MODEL_CCLII:
case MAC_MODEL_LCIII:
case MAC_MODEL_Q605:
case MAC_MODEL_Q605_ACC:
case MAC_MODEL_Q610:
case MAC_MODEL_Q630:
case MAC_MODEL_Q650:
case MAC_MODEL_Q800:
case MAC_MODEL_P460:
case MAC_MODEL_P475:
case MAC_MODEL_P475F:
case MAC_MODEL_P520:
case MAC_MODEL_P550:
case MAC_MODEL_P575:
case MAC_MODEL_P588:
case MAC_MODEL_TV:
case MAC_MODEL_C610:
case MAC_MODEL_C650:
case MAC_MODEL_PB190:
case MAC_MODEL_PB520:
fast_fclk = true;
break;
}
platform_device_register_resndata(NULL, "swim", -1, &swim_rsrc, 1,
&fast_fclk, sizeof(fast_fclk));
}
/*

9
drivers/block/swim.c
View File

@ -806,8 +806,11 @@ static void swim_set_parameters(struct swim __iomem *base)
swim_write(base, parameter, mem[i]);
}
static int swim_floppy_init(struct swim_priv *swd)
static int swim_floppy_init(struct platform_device *pdev)
{
struct swim_priv *swd = platform_get_drvdata(pdev);
bool *data = pdev->dev.platform_data;
bool fast_fclk = data && *data;
struct queue_limits lim = {
.features = BLK_FEAT_ROTATIONAL,
};
@ -815,7 +818,7 @@ static int swim_floppy_init(struct swim_priv *swd)
int drive;
struct swim __iomem *base = swd->base;
swim_write(base, setup, S_IBM_DRIVE | S_FCLK_DIV2);
swim_write(base, setup, S_IBM_DRIVE | (fast_fclk ? S_FCLK_DIV2 : 0));
swim_set_parameters(base);
@ -931,7 +934,7 @@ static int swim_probe(struct platform_device *dev)
swd->base = swim_base;
ret = swim_floppy_init(swd);
ret = swim_floppy_init(dev);
if (ret)
goto out_kfree;