Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp578287pxa; Tue, 11 Aug 2020 09:51:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy02kWZzM6VRP6iHSfZloc/CL/27yLm8MI9mRENIZBpv/O+HQfMj5MAcWopSZBGH2GrKFYh X-Received: by 2002:aa7:ce0b:: with SMTP id d11mr26161253edv.357.1597164682881; Tue, 11 Aug 2020 09:51:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597164682; cv=none; d=google.com; s=arc-20160816; b=u1hhBjlBg00wzwIh0c8HJ7dcpPDGhOz/VLXXcHQDNOXQEv/mnplMig6F2xtciNfpj7 23d1m8YrvhaVlkOD+amck19EzYmtmvqLm+w4GvlkK+Gd15cRQEBJIhhh1+S9Ytioaa2j 62c9qGif9N63ekgbX4N664Tvtw369HrdoSzJCEcB/zIbK4OUHD7RnwbGQ7tCPEK8GwQF jwnUiK2X5T/DmHpPaTpERSJbUrnzqMoXStVc4qcxnt+W5kYHbZlR3OoYydENtv9XidvT +5sqhznLdZ+Dn8GRijE1mzCK2M/pdO7VDBg5JN7cguAcbWQTECs1y3owqZBzYmEvpyzz pVww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:cc:to:subject :message-id:date:from:in-reply-to:references:mime-version; bh=c0T9QAw8xv/EgpcsqApBNXyoZRwApPKF5rlVb7vB4wo=; b=tb3/5nP/QvTZ4gWpaXomtLV/acP3DTEDPm/2CatduaGpkISABlTAbb7MvFNnzieRBW Egx5UYQgyNVqOPXmmqkDFiaD7joGECke1ZjICXa9/b3gKAmBfJ8oXfJyLr3XYu3nrVsg s3vxUWdVOaG0YPShBoXTBnN4MNsirqaqvItF1Zwy7LPst22NP0VnGX2gX8av9Grkd6MO 0FcZO4LH7/p1scEs7MAg5Wo1ob8vSXwWaZH4sf71vbTRP8ZqqrbMharm01MOGlGc2ZgO boHcbSzvXDqsOB5/5rQJP4s00e5JOvHajRAcixVWRFyiO/hazdmSi+RW/tZTwJonwvJJ W9RQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=amsat.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j21si12669508edh.20.2020.08.11.09.50.59; Tue, 11 Aug 2020 09:51:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=amsat.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729039AbgHKQsZ convert rfc822-to-8bit (ORCPT + 99 others); Tue, 11 Aug 2020 12:48:25 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:40409 "EHLO mail-ed1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728962AbgHKQsY (ORCPT ); Tue, 11 Aug 2020 12:48:24 -0400 Received: by mail-ed1-f68.google.com with SMTP id a14so9587306edx.7; Tue, 11 Aug 2020 09:48:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=BA+WL9stkz0wGiKjuA4yVOy/QJqM4LdAj4DBM99qc54=; b=hXpr4pBVsklereTy8TrLb5H5cSAC72t+Jw2q0rmlj5SUbYlXAFhDAiEq0znxGc/LK9 OwZqGQUgWxS4kMQixkshe1A+dgmOEoCfRuIMOEykD+IJ4T4lsO5oz51fUcmt/6tfT061 oGD/YHU1YYiEjzADjMNf0VT2SGHbCsNc9FL37uaWWs1LQfedx3cPKdsPLEMPnVs6Ws5b NfJE3VGjFVC3N1KKzDWqboLZLm2ZW5ZDYRH/G6aHYJOBVzeVvf4JPQPPCxECbm5bH6Ra xWdtGyCAglPguz62l5abPODIGU+JsxfWNIewpO2kDaxyk8dSTLR/CdbUHmd7y5kttn06 Wclg== X-Gm-Message-State: AOAM530jhTKRpZ4ZSzJ+eGDh1Uv5W9ZOYn3Blecrl1V2n7x3tegJ/k2B FEG+Mxsl7aAie5HjBquZOLJDdR16b222eq3Sqoc= X-Received: by 2002:a50:e70e:: with SMTP id a14mr11675003edn.93.1597164498882; Tue, 11 Aug 2020 09:48:18 -0700 (PDT) MIME-Version: 1.0 References: <20200811150117.254620-1-noltari@gmail.com> <20200811150117.254620-5-noltari@gmail.com> In-Reply-To: <20200811150117.254620-5-noltari@gmail.com> From: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= Date: Tue, 11 Aug 2020 18:48:07 +0200 Message-ID: Subject: Re: [PATCH v3 4/4] MIPS: BCM63xx: refactor board declarations To: =?UTF-8?B?w4FsdmFybyBGZXJuw6FuZGV6IFJvamFz?= Cc: Thomas Bogendoerfer , Florian Fainelli , Jonas Gorski , bcm-kernel-feedback-list , "open list:BROADCOM NVRAM DRIVER" , Linux ARM , open list Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Aug 11, 2020 at 5:01 PM Álvaro Fernández Rojas 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 > Acked-by: Florian Fainelli > --- > 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 > * Copyright (C) 2008 Florian Fainelli > */ > @@ -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 >