github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-22 20:54:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge zorro updates from Uwe Kleine-König.

Browse Source 
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Martin K. Petersen 2026-07-28 23:00:34 -04:00
commit 1451ea14f8
8 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/ata/pata_buddha.c
View File

@ -253,9 +253,9 @@ static void pata_buddha_remove(struct zorro_dev *z)
}
static const struct zorro_device_id pata_buddha_zorro_tbl[] = {
{ ZORRO_PROD_INDIVIDUAL_COMPUTERS_BUDDHA, BOARD_BUDDHA},
{ ZORRO_PROD_INDIVIDUAL_COMPUTERS_CATWEASEL, BOARD_CATWEASEL},
{ 0 }
{ .id = ZORRO_PROD_INDIVIDUAL_COMPUTERS_BUDDHA, .driver_data = BOARD_BUDDHA },
{ .id = ZORRO_PROD_INDIVIDUAL_COMPUTERS_CATWEASEL, .driver_data = BOARD_CATWEASEL },
{ }
};
MODULE_DEVICE_TABLE(zorro, pata_buddha_zorro_tbl);
@ -282,7 +282,7 @@ static int __init pata_buddha_late_init(void)
/* Manually bind to all X-Surf boards */
while ((z = zorro_find_device(ZORRO_PROD_INDIVIDUAL_COMPUTERS_X_SURF, z))) {
static struct zorro_device_id xsurf_ent = {
ZORRO_PROD_INDIVIDUAL_COMPUTERS_X_SURF, BOARD_XSURF
.id = ZORRO_PROD_INDIVIDUAL_COMPUTERS_X_SURF, .driver_data = BOARD_XSURF
};
pata_buddha_probe(z, &xsurf_ent);

6
drivers/scsi/a2091.c
View File

@ -275,9 +275,9 @@ static void a2091_remove(struct zorro_dev *z)
}
static struct zorro_device_id a2091_zorro_tbl[] = {
{ ZORRO_PROD_CBM_A590_A2091_1 },
{ ZORRO_PROD_CBM_A590_A2091_2 },
{ 0 }
{ .id = ZORRO_PROD_CBM_A590_A2091_1 },
{ .id = ZORRO_PROD_CBM_A590_A2091_2 },
{ }
};
MODULE_DEVICE_TABLE(zorro, a2091_zorro_tbl);

2
drivers/scsi/aha1542.c
View File

@ -1083,7 +1083,7 @@ static int isa_registered;
#ifdef CONFIG_PNP
static const struct pnp_device_id aha1542_pnp_ids[] = {
{ .id = "ADP1542" },
{ .id = "" }
{ }
};
MODULE_DEVICE_TABLE(pnp, aha1542_pnp_ids);

2
drivers/scsi/g_NCR5380.c
View File

@ -739,7 +739,7 @@ static struct isa_driver generic_NCR5380_isa_driver = {
#ifdef CONFIG_PNP
static const struct pnp_device_id generic_NCR5380_pnp_ids[] = {
{ .id = "DTC436e", .driver_data = BOARD_DTC3181E },
{ .id = "" }
{ }
};
MODULE_DEVICE_TABLE(pnp, generic_NCR5380_pnp_ids);

17
drivers/scsi/gvp11.c
View File

@ -442,14 +442,15 @@ static void gvp11_remove(struct zorro_dev *z)
*/
static struct zorro_device_id gvp11_zorro_tbl[] = {
{ ZORRO_PROD_GVP_COMBO_030_R3_SCSI, ~0x00ffffff },
{ ZORRO_PROD_GVP_SERIES_II, ~0x00ffffff },
{ ZORRO_PROD_GVP_GFORCE_030_SCSI, ~0x01ffffff },
{ ZORRO_PROD_GVP_A530_SCSI, ~0x01ffffff },
{ ZORRO_PROD_GVP_COMBO_030_R4_SCSI, ~0x01ffffff },
{ ZORRO_PROD_GVP_A1291, ~0x07ffffff },
{ ZORRO_PROD_GVP_GFORCE_040_SCSI_1, ~0x07ffffff },
{ 0 }
/* .driver_data specifies the DMA mask */
{ .id = ZORRO_PROD_GVP_COMBO_030_R3_SCSI, .driver_data = ~0x00ffffff },
{ .id = ZORRO_PROD_GVP_SERIES_II, .driver_data = ~0x00ffffff },
{ .id = ZORRO_PROD_GVP_GFORCE_030_SCSI, .driver_data = ~0x01ffffff },
{ .id = ZORRO_PROD_GVP_A530_SCSI, .driver_data = ~0x01ffffff },
{ .id = ZORRO_PROD_GVP_COMBO_030_R4_SCSI, .driver_data = ~0x01ffffff },
{ .id = ZORRO_PROD_GVP_A1291, .driver_data = ~0x07ffffff },
{ .id = ZORRO_PROD_GVP_GFORCE_040_SCSI_1, .driver_data = ~0x07ffffff },
{ }
};
MODULE_DEVICE_TABLE(zorro, gvp11_zorro_tbl);

16
drivers/scsi/zorro7xx.c
View File

@ -50,25 +50,25 @@ static struct zorro_driver_data {
static struct zorro_device_id zorro7xx_zorro_tbl[] = {
{
.id = ZORRO_PROD_PHASE5_BLIZZARD_603E_PLUS,
.driver_data = (unsigned long)&zorro7xx_driver_data[0],
.driver_data_ptr = &zorro7xx_driver_data[0],
},
{
.id = ZORRO_PROD_MACROSYSTEMS_WARP_ENGINE_40xx,
.driver_data = (unsigned long)&zorro7xx_driver_data[1],
.driver_data_ptr = &zorro7xx_driver_data[1],
},
{
.id = ZORRO_PROD_CBM_A4091_1,
.driver_data = (unsigned long)&zorro7xx_driver_data[2],
.driver_data_ptr = &zorro7xx_driver_data[2],
},
{
.id = ZORRO_PROD_CBM_A4091_2,
.driver_data = (unsigned long)&zorro7xx_driver_data[2],
.driver_data_ptr = &zorro7xx_driver_data[2],
},
{
.id = ZORRO_PROD_GVP_GFORCE_040_060,
.driver_data = (unsigned long)&zorro7xx_driver_data[3],
.driver_data_ptr = &zorro7xx_driver_data[3],
},
{ 0 }
{ }
};
MODULE_DEVICE_TABLE(zorro, zorro7xx_zorro_tbl);
@ -77,11 +77,11 @@ static int zorro7xx_init_one(struct zorro_dev *z,
{
struct Scsi_Host *host;
struct NCR_700_Host_Parameters *hostdata;
struct zorro_driver_data *zdd;
const struct zorro_driver_data *zdd;
unsigned long board, ioaddr;
board = zorro_resource_start(z);
zdd = (struct zorro_driver_data *)ent->driver_data;
zdd = ent->driver_data_ptr;
if (zdd->absolute) {
ioaddr = zdd->offset;

2
drivers/scsi/zorro_esp.c
View File

@ -706,7 +706,7 @@ static const struct zorro_device_id zorro_esp_zorro_tbl[] = {
.id = ZORRO_ID(PHASE5, 0x19, 0),
.driver_data = ZORRO_CYBERII,
},
{ 0 }
{ }
};
MODULE_DEVICE_TABLE(zorro, zorro_esp_zorro_tbl);

6
include/linux/mod_devicetable.h
View File

@ -640,7 +640,11 @@ struct mdio_device_id {
struct zorro_device_id {
__u32 id; /* Device ID or ZORRO_WILDCARD */
kernel_ulong_t driver_data; /* Data private to the driver */
union {
/* Data private to the driver */
kernel_ulong_t driver_data;
const void *driver_data_ptr;
};
};
#define ZORRO_WILDCARD (0xffffffff) /* not official */