diff mbox series

[v3,4/4] MIPS: BCM63xx: refactor board declarations

Message ID 20200811150117.254620-5-noltari@gmail.com (mailing list archive)
State New, archived
Headers show
Series MIPS: BCM63xx: board improvements | expand

Commit Message

Álvaro Fernández Rojas Aug. 11, 2020, 3:01 p.m. UTC
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 <noltari@gmail.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
---
 v3: no changes.
 v2: switch to SPDX license identifier.

 arch/mips/bcm63xx/boards/board_bcm963xx.c | 620 +++++++++++-----------
 1 file changed, 306 insertions(+), 314 deletions(-)

Comments

Philippe Mathieu-Daudé Aug. 11, 2020, 4:48 p.m. UTC | #1
On Tue, Aug 11, 2020 at 5:01 PM Álvaro Fernández Rojas
<noltari@gmail.com> wrote:
>
> 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 <noltari@gmail.com>
> Acked-by: Florian Fainelli <f.fainelli@gmail.com>
> ---
>  v3: no changes.
>  v2: switch to SPDX license identifier.
>
>  arch/mips/bcm63xx/boards/board_bcm963xx.c | 620 +++++++++++-----------
>  1 file changed, 306 insertions(+), 314 deletions(-)
>
> diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c
> index ac9570b66f37..01aff80a5967 100644
> --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
> +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
> @@ -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.
> - *

Sorry for missing this earlier and being picky, but doing license
change and code
change in the same commit is not recommended. Adding a SPDX tag is easy to
review, removing a license is another story. IANAL so up to the maintainer...

>   * Copyright (C) 2008 Maxime Bizon <mbizon@freebox.fr>
>   * Copyright (C) 2008 Florian Fainelli <florian@openwrt.org>
>   */
> @@ -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 */
>
> --
> 2.28.0
>
Philippe Mathieu-Daudé Aug. 11, 2020, 7:25 p.m. UTC | #2
On Tue, Aug 11, 2020 at 6:48 PM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
> On Tue, Aug 11, 2020 at 5:01 PM Álvaro Fernández Rojas
> <noltari@gmail.com> wrote:
> >
> > 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 <noltari@gmail.com>
> > Acked-by: Florian Fainelli <f.fainelli@gmail.com>
> > ---
> >  v3: no changes.
> >  v2: switch to SPDX license identifier.
> >
> >  arch/mips/bcm63xx/boards/board_bcm963xx.c | 620 +++++++++++-----------
> >  1 file changed, 306 insertions(+), 314 deletions(-)
> >
> > diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c
> > index ac9570b66f37..01aff80a5967 100644
> > --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
> > +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
> > @@ -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.
> > - *
>
> Sorry for missing this earlier and being picky, but doing license
> change and code
> change in the same commit is not recommended.

Rationale for this is you might revert a code change, but you
certainly don't want to revert a license change.

> Adding a SPDX tag is easy to
> review, removing a license is another story. IANAL so up to the maintainer...
>
> >   * Copyright (C) 2008 Maxime Bizon <mbizon@freebox.fr>
> >   * Copyright (C) 2008 Florian Fainelli <florian@openwrt.org>
> >   */
> > @@ -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 */
> >
> > --
> > 2.28.0
> >
diff mbox series

Patch

diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c
index ac9570b66f37..01aff80a5967 100644
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -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 <mbizon@freebox.fr>
  * Copyright (C) 2008 Florian Fainelli <florian@openwrt.org>
  */
@@ -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 */