MIPS: BCM63xx: board improvements
v2 cover MIPS: BCM63xx: board improvements
Theses patches improve BCM63xx board declarations and source code.
v2: switch to SPDX license identifier.
Álvaro Fernández Rojas (4):
MIPS: BCM63xx: remove duplicated new lines
MIPS: BCM63xx: remove EHCI from BCM6348 boards
MIPS: BCM63xx: enable EHCI for DWV-S0 board
MIPS: BCM63xx: refactor board declarations
arch/mips/bcm63xx/boards/board_bcm963xx.c | 625 +++++++++++----------- 1 file changed, 306 insertions(+), 319 deletions(-)
Signature · 1 line
2.27.0
PATCH v2 1/4 MIPS: BCM63xx: remove duplicated new lines
There are 3 duplicated new lines, let's remove them.
---
v2: no changes.
arch/mips/bcm63xx/boards/board_bcm963xx.c | 3 --- 1 file changed, 3 deletions(-)
arch/mips/bcm63xx/boards/board_bcm963xx.c +0 -3
@@ -32,7 +32,6 @@#include <uapi/linux/bcm933xx_hcs.h> -#define HCS_OFFSET_128K 0x20000static struct board_info board;
@@ -337,7 +336,6 @@ static struct board_info __initdata board_96348gw_11 = { .force_duplex_full = 1, }, - .has_ohci0 = 1, .has_pccard = 1, .has_ehci0 = 1,
@@ -580,7 +578,6 @@ static struct board_info __initdata board_96358vw2 = { .force_duplex_full = 1, }, - .has_ohci0 = 1, .has_pccard = 1, .has_ehci0 = 1,
Signature · 1 line
2.27.0
Re: [PATCH v2 1/4] MIPS: BCM63xx: remove duplicated new lines
Quoted 3 lines · Álvaro Fernández Rojas
There are 3 duplicated new lines, let's remove them.
Signed-off-by Álvaro Fernández Rojas <[email protected]>
Signature · 1 line
Florian
Re: [PATCH v2 1/4] MIPS: BCM63xx: remove duplicated new lines
In reply to Álvaro Fernández RojasQuoted 4 lines · Álvaro Fernández Rojas
There are 3 duplicated new lines, let's remove them.
Signed-off-by Álvaro Fernández Rojas <[email protected]>
=)
Quoted 37 lines
---
v2: no changes.arch/mips/bcm63xx/boards/board_bcm963xx.c | 3 --- 1 file changed, 3 deletions(-)arch/mips/bcm63xx/boards/board_bcm963xx.c +0
-4@@ -32,7 +32,6 @@#include <uapi/linux/bcm933xx_hcs.h> -#define HCS_OFFSET_128K 0x20000static struct board_info board;@@ -337,7 +336,6 @@ static struct board_info __initdata board_96348gw_11 = { .force_duplex_full = 1, }, - .has_ohci0 = 1, .has_pccard = 1, .has_ehci0 = 1,@@ -580,7 +578,6 @@ static struct board_info __initdata board_96358vw2 = { .force_duplex_full = 1, }, - .has_ohci0 = 1, .has_pccard = 1, .has_ehci0 = 1, --2.27.0
PATCH v2 2/4 MIPS: BCM63xx: remove EHCI from BCM6348 boards
In reply to Álvaro Fernández RojasThere's no EHCI controller on BCM6348.
---
v2: no changes.
arch/mips/bcm63xx/boards/board_bcm963xx.c | 3 --- 1 file changed, 3 deletions(-)
arch/mips/bcm63xx/boards/board_bcm963xx.c +0 -3
@@ -285,7 +285,6 @@ static struct board_info __initdata board_96348gw_10 = { .has_ohci0 = 1, .has_pccard = 1, - .has_ehci0 = 1, .leds = { {
@@ -338,7 +337,6 @@ static struct board_info __initdata board_96348gw_11 = { .has_ohci0 = 1, .has_pccard = 1, - .has_ehci0 = 1, .leds = { {
@@ -441,7 +439,6 @@ static struct board_info __initdata board_FAST2404 = { .has_ohci0 = 1, .has_pccard = 1, - .has_ehci0 = 1, };static struct board_info __initdata board_rta1025w_16 = {
Signature · 1 line
2.27.0
Re: [PATCH v2 2/4] MIPS: BCM63xx: remove EHCI from BCM6348 boards
Quoted 3 lines · Álvaro Fernández Rojas
There's no EHCI controller on BCM6348.
Signed-off-by Álvaro Fernández Rojas <[email protected]>
Signature · 1 line
Florian
PATCH v2 3/4 MIPS: BCM63xx: enable EHCI for DWV-S0 board
In reply to Álvaro Fernández RojasEHCI and OHCI share the same USB ports. Therefore, if the board has OHCI it should also have EHCI.
---
v2: no changes.
arch/mips/bcm63xx/boards/board_bcm963xx.c | 1 + 1 file changed, 1 insertion(+)
arch/mips/bcm63xx/boards/board_bcm963xx.c +1 -0
@@ -645,6 +645,7 @@ static struct board_info __initdata board_DWVS0 = { }, .has_ohci0 = 1, + .has_ehci0 = 1, };#endif /* CONFIG_BCM63XX_CPU_6358 */
Signature · 1 line
2.27.0
Re: [PATCH v2 3/4] MIPS: BCM63xx: enable EHCI for DWV-S0 board
Quoted 4 lines · Álvaro Fernández Rojas
EHCI and OHCI share the same USB ports. Therefore, if the board has OHCI it should also have EHCI.
Signed-off-by Álvaro Fernández Rojas <[email protected]>
Signature · 1 line
Florian
Re: [PATCH v2 3/4] MIPS: BCM63xx: enable EHCI for DWV-S0 board
In reply to Álvaro Fernández RojasHi Álvaro,
Quoted 3 lines · Álvaro Fernández Rojas
EHCI and OHCI share the same USB ports. Therefore, if the board has OHCI it should also have EHCI.
This statement isn't correct. OHCI doesn't imply EHCI... (although the opposite is almost always true).
Now per 6358-PB01-R the bcm6358 indeed has a EHCI controller.
Do you mind rewording the commit description?
Regards,
Phil.
Quoted 23 lines
Signed-off-by Álvaro Fernández Rojas <[email protected]>---
v2: no changes.arch/mips/bcm63xx/boards/board_bcm963xx.c | 1 + 1 file changed, 1 insertion(+)arch/mips/bcm63xx/boards/board_bcm963xx.c +1
-1@@ -645,6 +645,7 @@ static struct board_info __initdata board_DWVS0 = { }, .has_ohci0 = 1, + .has_ehci0 = 1, };#endif /* CONFIG_BCM63XX_CPU_6358 */ --2.27.0
Re: [PATCH v2 3/4] MIPS: BCM63xx: enable EHCI for DWV-S0 board
Quoted 8 lines · Philippe Mathieu-Daudé
Hi Álvaro,
Quoted 3 lines · Álvaro Fernández Rojas
EHCI and OHCI share the same USB ports. Therefore, if the board has OHCI it should also have EHCI.
Quoted 6 lines
This statement isn't correct. OHCI doesn't imply EHCI... (although the opposite is almost always true).
Now per 6358-PB01-R the bcm6358 indeed has a EHCI controller.
Do you mind rewording the commit description?
Is not it that a single USB port is used and we need the EHCI controller active in order for the correct speed negotiation to occur?
Signature · 1 line
Florian
Re: [PATCH v2 3/4] MIPS: BCM63xx: enable EHCI for DWV-S0 board
Hi Florian,
Quoted 12 lines · Florian Fainelli
Quoted 11 lines · Philippe Mathieu-Daudé
Hi Álvaro,
Quoted 3 lines · Álvaro Fernández Rojas
EHCI and OHCI share the same USB ports. Therefore, if the board has OHCI it should also have EHCI.
This statement isn't correct. OHCI doesn't imply EHCI... (although the opposite is almost always true).
Quoted 6 lines
Quoted 3 lines
Now per 6358-PB01-R the bcm6358 indeed has a EHCI controller.
Do you mind rewording the commit description?
Is not it that a single USB port is used and we need the EHCI controller active in order for the correct speed negotiation to occur?
Yes. What sounds odd is "if the board has OHCI it should also have EHCI."
This is true for this particular board because its chipset is a bcm6358, but I'm worried it might later confuse other developers. For example the bcm6348 has a OHCI controller, but that doesn't imply its port can be used as EHCI.
Regards,
Phil.
Quoted 2 lines
--
Florian
PATCH v2 4/4 MIPS: BCM63xx: refactor board declarations
In reply to Álvaro Fernández RojasCurrent board declarations are a mess. Let's put some order and make them follow the same structure. Also board declarations tabs. Switch to SPDX license identifier.
---
v2: switch to SPDX license identifier.
arch/mips/bcm63xx/boards/board_bcm963xx.c | 620 +++++++++++----------- 1 file changed, 306 insertions(+), 314 deletions(-)
arch/mips/bcm63xx/boards/board_bcm963xx.c +306 -314
@@ -1,8 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0-only /* -* This file is subject to the terms and conditions of the GNU General Public -* License. See the file "COPYING" in the main directory of this archive -* for more details. -* * Copyright (C) 2008 Maxime Bizon <[email protected]> * Copyright (C) 2008 Florian Fainelli <[email protected]> */
@@ -41,30 +38,28 @@ static struct board_info board;*/ #ifdef CONFIG_BCM63XX_CPU_3368 static struct board_info __initdata board_cvg834g = { - .name ="CVG834G_E15R3921" , - .expected_cpu_id =0x3368 , + .name ="CVG834G_E15R3921" , + .expected_cpu_id =0x3368 , - .has_uart0 =1 , - .has_uart1 =1 , - - .has_enet0 =1 , - .has_pci =1 , + .ephy_reset_gpio =36 , + .ephy_reset_gpio_flags =GPIOF_INIT_HIGH , + .has_pci =1 , + .has_uart0 =1 , + .has_uart1 =1 , + .has_enet0 =1 , .enet0 = { - .has_phy =1 , - .use_internal_phy =1 , + .has_phy =1 , + .use_internal_phy =1 , }, .leds = { { - .name ="CVG834G:green:power" , - .gpio =37 , + .name ="CVG834G:green:power" , + .gpio =37 , .default_trigger="default-on" , }, }, - - .ephy_reset_gpio =36 , - .ephy_reset_gpio_flags =GPIOF_INIT_HIGH , };#endif /* CONFIG_BCM63XX_CPU_3368 */
@@ -73,44 +68,44 @@ static struct board_info __initdata board_cvg834g = {*/ #ifdef CONFIG_BCM63XX_CPU_6328 static struct board_info __initdata board_96328avng = { - .name ="96328avng" , - .expected_cpu_id =0x6328 , + .name ="96328avng" , + .expected_cpu_id =0x6328 , - .has_uart0 =1 , - .has_pci =1 , - .has_usbd =0 , + .has_pci =1 , + .has_uart0 =1 , + .has_usbd =0 , .usbd = { - .use_fullspeed =0 , - .port_no =0 , + .use_fullspeed =0 , + .port_no =0 , }, .leds = { { - .name ="96328avng::ppp-fail" , - .gpio =2 , - .active_low =1 , + .name ="96328avng::ppp-fail" , + .gpio =2 , + .active_low =1 , }, { - .name ="96328avng::power" , - .gpio =4 , - .active_low =1 , + .name ="96328avng::power" , + .gpio =4 , + .active_low =1 , .default_trigger ="default-on" , }, { - .name ="96328avng::power-fail" , - .gpio =8 , - .active_low =1 , + .name ="96328avng::power-fail" , + .gpio =8 , + .active_low =1 , }, { - .name ="96328avng::wps" , - .gpio =9 , - .active_low =1 , + .name ="96328avng::wps" , + .gpio =9 , + .active_low =1 , }, { - .name ="96328avng::ppp" , - .gpio =11 , - .active_low =1 , + .name ="96328avng::ppp" , + .gpio =11 , + .active_low =1 , }, }, };
@@ -121,85 +116,86 @@ static struct board_info __initdata board_96328avng = {*/ #ifdef CONFIG_BCM63XX_CPU_6338 static struct board_info __initdata board_96338gw = { - .name ="96338GW" , - .expected_cpu_id =0x6338 , + .name ="96338GW" , + .expected_cpu_id =0x6338 , + + .has_ohci0 =1 , + .has_uart0 =1 , - .has_uart0 =1 , - .has_enet0 =1 , + .has_enet0 =1 , .enet0 = { - .force_speed_100 =1 , - .force_duplex_full =1 , + .force_speed_100 =1 , + .force_duplex_full =1 , }, - .has_ohci0 =1 , - .leds = { { - .name ="adsl" , - .gpio =3 , - .active_low =1 , + .name ="adsl" , + .gpio =3 , + .active_low =1 , }, { - .name ="ses" , - .gpio =5 , - .active_low =1 , + .name ="ses" , + .gpio =5 , + .active_low =1 , }, { - .name ="ppp-fail" , - .gpio =4 , - .active_low =1 , + .name ="ppp-fail" , + .gpio =4 , + .active_low =1 , }, { - .name ="power" , - .gpio =0 , - .active_low =1 , + .name ="power" , + .gpio =0 , + .active_low =1 , .default_trigger ="default-on" , }, { - .name ="stop" , - .gpio =1 , - .active_low =1 , + .name ="stop" , + .gpio =1 , + .active_low =1 , } }, };static struct board_info __initdata board_96338w = { - .name ="96338W" , - .expected_cpu_id =0x6338 , + .name ="96338W" , + .expected_cpu_id =0x6338 , + + .has_uart0 =1 , - .has_uart0 =1 , - .has_enet0 =1 , + .has_enet0 =1 , .enet0 = { - .force_speed_100 =1 , - .force_duplex_full =1 , + .force_speed_100 =1 , + .force_duplex_full =1 , }, .leds = { { - .name ="adsl" , - .gpio =3 , - .active_low =1 , + .name ="adsl" , + .gpio =3 , + .active_low =1 , }, { - .name ="ses" , - .gpio =5 , - .active_low =1 , + .name ="ses" , + .gpio =5 , + .active_low =1 , }, { - .name ="ppp-fail" , - .gpio =4 , - .active_low =1 , + .name ="ppp-fail" , + .gpio =4 , + .active_low =1 , }, { - .name ="power" , - .gpio =0 , - .active_low =1 , + .name ="power" , + .gpio =0 , + .active_low =1 , .default_trigger ="default-on" , }, { - .name ="stop" , - .gpio =1 , - .active_low =1 , + .name ="stop" , + .gpio =1 , + .active_low =1 , }, }, };
@@ -210,10 +206,10 @@ static struct board_info __initdata board_96338w = {*/ #ifdef CONFIG_BCM63XX_CPU_6345 static struct board_info __initdata board_96345gw2 = { - .name ="96345GW2" , - .expected_cpu_id =0x6345 , + .name ="96345GW2" , + .expected_cpu_id =0x6345 , - .has_uart0 =1 , + .has_uart0 =1 , };#endif /* CONFIG_BCM63XX_CPU_6345 */
@@ -222,282 +218,282 @@ static struct board_info __initdata board_96345gw2 = {*/ #ifdef CONFIG_BCM63XX_CPU_6348 static struct board_info __initdata board_96348r = { - .name ="96348R" , - .expected_cpu_id =0x6348 , + .name ="96348R" , + .expected_cpu_id =0x6348 , - .has_uart0 =1 , - .has_enet0 =1 , - .has_pci =1 , + .has_pci =1 , + .has_uart0 =1 , + .has_enet0 =1 , .enet0 = { - .has_phy =1 , - .use_internal_phy =1 , + .has_phy =1 , + .use_internal_phy =1 , }, .leds = { { - .name ="adsl-fail" , - .gpio =2 , - .active_low =1 , + .name ="adsl-fail" , + .gpio =2 , + .active_low =1 , }, { - .name ="ppp" , - .gpio =3 , - .active_low =1 , + .name ="ppp" , + .gpio =3 , + .active_low =1 , }, { - .name ="ppp-fail" , - .gpio =4 , - .active_low =1 , + .name ="ppp-fail" , + .gpio =4 , + .active_low =1 , }, { - .name ="power" , - .gpio =0 , - .active_low =1 , + .name ="power" , + .gpio =0 , + .active_low =1 , .default_trigger ="default-on" , }, { - .name ="stop" , - .gpio =1 , - .active_low =1 , + .name ="stop" , + .gpio =1 , + .active_low =1 , }, }, };static struct board_info __initdata board_96348gw_10 = { - .name ="96348GW-10" , - .expected_cpu_id =0x6348 , + .name ="96348GW-10" , + .expected_cpu_id =0x6348 , - .has_uart0 =1 , - .has_enet0 =1 , - .has_enet1 =1 , - .has_pci =1 , + .has_ohci0 =1 , + .has_pccard =1 , + .has_pci =1 , + .has_uart0 =1 , + .has_enet0 =1 , .enet0 = { - .has_phy =1 , - .use_internal_phy =1 , + .has_phy =1 , + .use_internal_phy =1 , }, + + .has_enet1 =1 , .enet1 = { - .force_speed_100 =1 , - .force_duplex_full =1 , + .force_speed_100 =1 , + .force_duplex_full =1 , }, - .has_ohci0 =1 , - .has_pccard =1 , - .leds = { { - .name ="adsl-fail" , - .gpio =2 , - .active_low =1 , + .name ="adsl-fail" , + .gpio =2 , + .active_low =1 , }, { - .name ="ppp" , - .gpio =3 , - .active_low =1 , + .name ="ppp" , + .gpio =3 , + .active_low =1 , }, { - .name ="ppp-fail" , - .gpio =4 , - .active_low =1 , + .name ="ppp-fail" , + .gpio =4 , + .active_low =1 , }, { - .name ="power" , - .gpio =0 , - .active_low =1 , + .name ="power" , + .gpio =0 , + .active_low =1 , .default_trigger ="default-on" , }, { - .name ="stop" , - .gpio =1 , - .active_low =1 , + .name ="stop" , + .gpio =1 , + .active_low =1 , }, }, };static struct board_info __initdata board_96348gw_11 = { - .name ="96348GW-11" , - .expected_cpu_id =0x6348 , + .name ="96348GW-11" , + .expected_cpu_id =0x6348 , - .has_uart0 =1 , - .has_enet0 =1 , - .has_enet1 =1 , - .has_pci =1 , + .has_ohci0 =1 , + .has_pccard =1 , + .has_pci =1 , + .has_uart0 =1 , + .has_enet0 =1 , .enet0 = { - .has_phy =1 , - .use_internal_phy =1 , + .has_phy =1 , + .use_internal_phy =1 , }, + .has_enet1 =1 , .enet1 = { - .force_speed_100 =1 , - .force_duplex_full =1 , + .force_speed_100 =1 , + .force_duplex_full =1 , }, - .has_ohci0 =1 , - .has_pccard =1 , - .leds = { { - .name ="adsl-fail" , - .gpio =2 , - .active_low =1 , + .name ="adsl-fail" , + .gpio =2 , + .active_low =1 , }, { - .name ="ppp" , - .gpio =3 , - .active_low =1 , + .name ="ppp" , + .gpio =3 , + .active_low =1 , }, { - .name ="ppp-fail" , - .gpio =4 , - .active_low =1 , + .name ="ppp-fail" , + .gpio =4 , + .active_low =1 , }, { - .name ="power" , - .gpio =0 , - .active_low =1 , + .name ="power" , + .gpio =0 , + .active_low =1 , .default_trigger ="default-on" , }, { - .name ="stop" , - .gpio =1 , - .active_low =1 , + .name ="stop" , + .gpio =1 , + .active_low =1 , }, }, };static struct board_info __initdata board_96348gw = { - .name ="96348GW" , - .expected_cpu_id =0x6348 , + .name ="96348GW" , + .expected_cpu_id =0x6348 , - .has_uart0 =1 , - .has_enet0 =1 , - .has_enet1 =1 , - .has_pci =1 , + .has_ohci0 =1 , + .has_pci =1 , + .has_uart0 =1 , + .has_enet0 =1 , .enet0 = { - .has_phy =1 , - .use_internal_phy =1 , + .has_phy =1 , + .use_internal_phy =1 , }, + + .has_enet1 =1 , .enet1 = { - .force_speed_100 =1 , - .force_duplex_full =1 , + .force_speed_100 =1 , + .force_duplex_full =1 , }, - .has_ohci0 =1 , - .leds = { { - .name ="adsl-fail" , - .gpio =2 , - .active_low =1 , + .name ="adsl-fail" , + .gpio =2 , + .active_low =1 , }, { - .name ="ppp" , - .gpio =3 , - .active_low =1 , + .name ="ppp" , + .gpio =3 , + .active_low =1 , }, { - .name ="ppp-fail" , - .gpio =4 , - .active_low =1 , + .name ="ppp-fail" , + .gpio =4 , + .active_low =1 , }, { - .name ="power" , - .gpio =0 , - .active_low =1 , + .name ="power" , + .gpio =0 , + .active_low =1 , .default_trigger ="default-on" , }, { - .name ="stop" , - .gpio =1 , - .active_low =1 , + .name ="stop" , + .gpio =1 , + .active_low =1 , }, }, };static struct board_info __initdata board_FAST2404 = { - .name ="F@ST2404" , - .expected_cpu_id =0x6348 , + .name ="F@ST2404" , + .expected_cpu_id =0x6348 , - .has_uart0 =1 , - .has_enet0 =1 , - .has_enet1 =1 , - .has_pci =1 , + .has_ohci0 =1 , + .has_pccard =1 , + .has_pci =1 , + .has_uart0 =1 , + .has_enet0 =1 , .enet0 = { - .has_phy =1 , - .use_internal_phy =1 , + .has_phy =1 , + .use_internal_phy =1 , }, + .has_enet1 =1 , .enet1 = { - .force_speed_100 =1 , - .force_duplex_full =1 , + .force_speed_100 =1 , + .force_duplex_full =1 , }, - - .has_ohci0 =1 , - .has_pccard =1 , };static struct board_info __initdata board_rta1025w_16 = { - .name ="RTA1025W_16" , - .expected_cpu_id =0x6348 , + .name ="RTA1025W_16" , + .expected_cpu_id =0x6348 , - .has_enet0 =1 , - .has_enet1 =1 , - .has_pci =1 , + .has_pci =1 , + .has_enet0 =1 , .enet0 = { - .has_phy =1 , - .use_internal_phy =1 , + .has_phy =1 , + .use_internal_phy =1 , }, + + .has_enet1 =1 , .enet1 = { - .force_speed_100 =1 , - .force_duplex_full =1 , + .force_speed_100 =1 , + .force_duplex_full =1 , }, };static struct board_info __initdata board_DV201AMR = { - .name ="DV201AMR" , - .expected_cpu_id =0x6348 , + .name ="DV201AMR" , + .expected_cpu_id =0x6348 , - .has_uart0 =1 , - .has_pci =1 , - .has_ohci0 =1 , + .has_ohci0 =1 , + .has_pci =1 , + .has_uart0 =1 , - .has_enet0 =1 , - .has_enet1 =1 , + .has_enet0 =1 , .enet0 = { - .has_phy =1 , - .use_internal_phy =1 , + .has_phy =1 , + .use_internal_phy =1 , }, + + .has_enet1 =1 , .enet1 = { - .force_speed_100 =1 , - .force_duplex_full =1 , + .force_speed_100 =1 , + .force_duplex_full =1 , }, };static struct board_info __initdata board_96348gw_a = { - .name ="96348GW-A" , - .expected_cpu_id =0x6348 , + .name ="96348GW-A" , + .expected_cpu_id =0x6348 , - .has_uart0 =1 , - .has_enet0 =1 , - .has_enet1 =1 , - .has_pci =1 , + .has_ohci0 =1 , + .has_pci =1 , + .has_uart0 =1 , + .has_enet0 =1 , .enet0 = { - .has_phy =1 , - .use_internal_phy =1 , + .has_phy =1 , + .use_internal_phy =1 , }, + + .has_enet1 =1 , .enet1 = { - .force_speed_100 =1 , - .force_duplex_full =1 , + .force_speed_100 =1 , + .force_duplex_full =1 , }, - - .has_ohci0 =1 , };#endif /* CONFIG_BCM63XX_CPU_6348 */
@@ -506,146 +502,142 @@ static struct board_info __initdata board_96348gw_a = {*/ #ifdef CONFIG_BCM63XX_CPU_6358 static struct board_info __initdata board_96358vw = { - .name ="96358VW" , - .expected_cpu_id =0x6358 , + .name ="96358VW" , + .expected_cpu_id =0x6358 , - .has_uart0 =1 , - .has_enet0 =1 , - .has_enet1 =1 , - .has_pci =1 , + .has_ehci0 =1 , + .has_ohci0 =1 , + .has_pccard =1 , + .has_pci =1 , + .has_uart0 =1 , + .has_enet0 =1 , .enet0 = { - .has_phy =1 , - .use_internal_phy =1 , + .has_phy =1 , + .use_internal_phy =1 , }, + .has_enet1 =1 , .enet1 = { - .force_speed_100 =1 , - .force_duplex_full =1 , + .force_speed_100 =1 , + .force_duplex_full =1 , }, - .has_ohci0 =1 , - .has_pccard =1 , - .has_ehci0 =1 , - .leds = { { - .name ="adsl-fail" , - .gpio =15 , - .active_low =1 , + .name ="adsl-fail" , + .gpio =15 , + .active_low =1 , }, { - .name ="ppp" , - .gpio =22 , - .active_low =1 , + .name ="ppp" , + .gpio =22 , + .active_low =1 , }, { - .name ="ppp-fail" , - .gpio =23 , - .active_low =1 , + .name ="ppp-fail" , + .gpio =23 , + .active_low =1 , }, { - .name ="power" , - .gpio =4 , + .name ="power" , + .gpio =4 , .default_trigger ="default-on" , }, { - .name ="stop" , - .gpio =5 , + .name ="stop" , + .gpio =5 , }, }, };static struct board_info __initdata board_96358vw2 = { - .name ="96358VW2" , - .expected_cpu_id =0x6358 , + .name ="96358VW2" , + .expected_cpu_id =0x6358 , - .has_uart0 =1 , - .has_enet0 =1 , - .has_enet1 =1 , - .has_pci =1 , + .has_ehci0 =1 , + .has_ohci0 =1 , + .has_pccard =1 , + .has_pci =1 , + .has_uart0 =1 , + .has_enet0 =1 , .enet0 = { - .has_phy =1 , - .use_internal_phy =1 , + .has_phy =1 , + .use_internal_phy =1 , }, + .has_enet1 =1 , .enet1 = { - .force_speed_100 =1 , - .force_duplex_full =1 , + .force_speed_100 =1 , + .force_duplex_full =1 , }, - .has_ohci0 =1 , - .has_pccard =1 , - .has_ehci0 =1 , - .leds = { { - .name ="adsl" , - .gpio =22 , - .active_low =1 , + .name ="adsl" , + .gpio =22 , + .active_low =1 , }, { - .name ="ppp-fail" , - .gpio =23 , + .name ="ppp-fail" , + .gpio =23 , }, { - .name ="power" , - .gpio =5 , - .active_low =1 , + .name ="power" , + .gpio =5 , + .active_low =1 , .default_trigger ="default-on" , }, { - .name ="stop" , - .gpio =4 , - .active_low =1 , + .name ="stop" , + .gpio =4 , + .active_low =1 , }, }, };static struct board_info __initdata board_AGPFS0 = { - .name ="AGPF-S0" , - .expected_cpu_id =0x6358 , + .name ="AGPF-S0" , + .expected_cpu_id =0x6358 , - .has_uart0 =1 , - .has_enet0 =1 , - .has_enet1 =1 , - .has_pci =1 , + .has_ehci0 =1 , + .has_ohci0 =1 , + .has_pci =1 , + .has_uart0 =1 , + .has_enet0 =1 , .enet0 = { - .has_phy =1 , - .use_internal_phy =1 , + .has_phy =1 , + .use_internal_phy =1 , }, + .has_enet1 =1 , .enet1 = { - .force_speed_100 =1 , - .force_duplex_full =1 , + .force_speed_100 =1 , + .force_duplex_full =1 , }, - - .has_ohci0 =1 , - .has_ehci0 =1 , };static struct board_info __initdata board_DWVS0 = { - .name ="DWV-S0" , - .expected_cpu_id =0x6358 , + .name ="DWV-S0" , + .expected_cpu_id =0x6358 , - .has_enet0 =1 , - .has_enet1 =1 , - .has_pci =1 , + .has_ehci0 =1 , + .has_ohci0 =1 , + .has_pci =1 , + .has_enet0 =1 , .enet0 = { - .has_phy =1 , - .use_internal_phy =1 , + .has_phy =1 , + .use_internal_phy =1 , }, + .has_enet1 =1 , .enet1 = { - .force_speed_100 =1 , - .force_duplex_full =1 , + .force_speed_100 =1 , + .force_duplex_full =1 , }, - - .has_ohci0 =1 , - .has_ehci0 =1 , };#endif /* CONFIG_BCM63XX_CPU_6358 */
Signature · 1 line
2.27.0
Re: [PATCH v2 4/4] MIPS: BCM63xx: refactor board declarations
Quoted 5 lines · Álvaro Fernández Rojas
Current board declarations are a mess. Let's put some order and make them follow the same structure. Also board declarations tabs. Switch to SPDX license identifier.
Signed-off-by Álvaro Fernández Rojas <[email protected]>
That is a lot of churn, not sure if this is really worth it... in any case:
Signature · 1 line
Florian