diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 364d99d887fc137cb0147fa6c4fc218fbcb5fde3..62f3a551c88f237c7da504d1bdb51c42c394819d 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -96,6 +96,10 @@ */ #define MACB_HALT_TIMEOUT 1230 +static int cards[2] = { [0 ... (2-1)] = 1 }; +module_param_array(cards, int, NULL, 0444); +MODULE_PARM_DESC(cards, "array of cards to be supported (eg. 1,0,1)"); + /* DMA buffer descriptor might be different size * depends on hardware configuration: * @@ -4578,6 +4582,12 @@ static int macb_probe(struct platform_device *pdev) struct macb *bp; int err, val; + static int cards_found = 0; + if (cards[cards_found++] == 0) + { + return -ENODEV; + } + regs = platform_get_resource(pdev, IORESOURCE_MEM, 0); mem = devm_ioremap_resource(&pdev->dev, regs); if (IS_ERR(mem)) @@ -4906,4 +4916,4 @@ module_platform_driver(macb_driver); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Cadence MACB/GEM Ethernet driver"); MODULE_AUTHOR("Haavard Skinnemoen (Atmel)"); -MODULE_ALIAS("platform:macb"); +MODULE_ALIAS("platform:macb"); \ No newline at end of file diff --git a/drivers/xenomai/net/drivers/macb.c b/drivers/xenomai/net/drivers/macb.c index 5c2df04fbce13a8ec7266cd937650e65f0afc256..49028326cd6cad563d23efb8db83ab14dac12f3b 100644 --- a/drivers/xenomai/net/drivers/macb.c +++ b/drivers/xenomai/net/drivers/macb.c @@ -109,6 +109,10 @@ */ #define MACB_HALT_TIMEOUT 1230 +static int cards[2] = { [0 ... (2-1)] = 1 }; +module_param_array(cards, int, NULL, 0444); +MODULE_PARM_DESC(cards, "array of cards to be supported (eg. 1,0,1)"); + /* DMA buffer descriptor might be different size * depends on hardware configuration: * @@ -3004,6 +3008,12 @@ static int macb_probe(struct platform_device *pdev) struct macb *bp; int err, val; + static int cards_found = 0; + if (cards[cards_found++] == 0) + { + return -ENODEV; + } + printk(KERN_INFO "%s RTnet: macb probe begin\n", __FUNCTION__); regs = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (regs == NULL) { @@ -3255,7 +3265,7 @@ static struct platform_driver macb_driver = { .probe = macb_probe, .remove = macb_remove, .driver = { - .name = "macb", + .name = "rt_macb", .of_match_table = of_match_ptr(macb_dt_ids), .acpi_match_table = macb_acpi_ids, }, @@ -3266,4 +3276,4 @@ module_platform_driver(macb_driver); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("RTDM-based driver for Cadence MACB/GEM Ethernet driver"); MODULE_AUTHOR("Haavard Skinnemoen (Atmel) zhanglin1040@phytium.com.cn"); -MODULE_ALIAS("platform:macb"); +MODULE_ALIAS("platform:macb"); \ No newline at end of file