iCE40/yosys - clone of https://github.com/YosysHQ/yosys

diff options

author	Marcelina Kościelnicka <mwk@0x04.net>	2021-07-10 20:46:48 +0200
committer	Marcelina Kościelnicka <mwk@0x04.net>	2021-07-10 21:30:01 +0200
commit	726fabd65e51c7a15a2a2dc24d3b99426ef43ad2 (patch)
tree	b6e906608b5c2811df550b3c0fa906085c2b10d7 /examples/smtbmc/demo4.v
parent	7a5ac909858c22f2daf2f7ca63869c554dc3b9b5 (diff)
download	yosys-726fabd65e51c7a15a2a2dc24d3b99426ef43ad2.tar.gz yosys-726fabd65e51c7a15a2a2dc24d3b99426ef43ad2.tar.bz2 yosys-726fabd65e51c7a15a2a2dc24d3b99426ef43ad2.zip

ice40: Fix LUT input indices in opt_lut -dlogic (again).

Fixes #2061.

Diffstat (limited to 'examples/smtbmc/demo4.v')

0 files changed, 0 insertions, 0 deletions

--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c @@ -336,24 +336,39 @@ static struct board_info __initdata boar .active_low = 1, }, { - .name = "ppp", - .gpio = 3, + .name = "power", + .gpio = 0, .active_low = 1, + .default_trigger = "default-on", }, { - .name = "ppp-fail", + .name = "stop", + .gpio = 1, + .active_low = 1, + }, + { + .name = "line1", .gpio = 4, .active_low = 1, }, { - .name = "power", - .gpio = 0, + .name = "line2", + .gpio = 5, .active_low = 1, - .default_trigger = "default-on", }, { - .name = "stop", - .gpio = 1, + .name = "line3", + .gpio = 6, + .active_low = 1, + }, + { + .name = "tel", + .gpio = 7, + .active_low = 1, + }, + { + .name = "eth", + .gpio = 35, .active_low = 1, }, }, @@ -855,6 +870,7 @@ static struct platform_device bcm63xx_gp int __init board_register_devices(void) { u32 val; + int led_count = 0; if (board.has_pccard) bcm63xx_pcmcia_register(); @@ -901,7 +917,11 @@ int __init board_register_devices(void) platform_device_register_simple("GPIODEV", 0, &gpiodev_resource, 1); - bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds); + /* count number of LEDs defined by this device */ + while (led_count < ARRAY_SIZE(board.leds) && board.leds[led_count].name) + led_count++; + + bcm63xx_led_data.num_leds = led_count; bcm63xx_led_data.leds = board.leds; platform_device_register(&bcm63xx_gpio_leds); --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h @@ -54,7 +54,7 @@ struct board_info { struct bcm63xx_dsp_platform_data dsp; /* GPIO LEDs */ - struct gpio_led leds[5]; + struct gpio_led leds[8]; /* Reset button */ struct gpio_button reset_buttons[1];


context:
space:
mode: