* [PATCH v2 0/4] MIPS: BCM63xx: board improvements
@ 2020-08-07 10:04 Álvaro Fernández Rojas
2020-08-07 10:04 ` [PATCH v2 1/4] MIPS: BCM63xx: remove duplicated new lines Álvaro Fernández Rojas
` (3 more replies)
0 siblings, 4 replies; 13+ messages in thread
From: Álvaro Fernández Rojas @ 2020-08-07 10:04 UTC (permalink / raw)
To: tsbogend, f.fainelli, jonas.gorski, bcm-kernel-feedback-list,
linux-mips, linux-arm-kernel, linux-kernel
Cc: Álvaro Fernández Rojas
Theses patches improve BCM63xx board declarations and source code.
v2: switch to SPDX license identifier.
Álvaro Fernández Rojas (4):
MIPS: BCM63xx: remove duplicated new lines
MIPS: BCM63xx: remove EHCI from BCM6348 boards
MIPS: BCM63xx: enable EHCI for DWV-S0 board
MIPS: BCM63xx: refactor board declarations
arch/mips/bcm63xx/boards/board_bcm963xx.c | 625 +++++++++++-----------
1 file changed, 306 insertions(+), 319 deletions(-)
--
2.27.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 13+ messages in thread* [PATCH v2 1/4] MIPS: BCM63xx: remove duplicated new lines 2020-08-07 10:04 [PATCH v2 0/4] MIPS: BCM63xx: board improvements Álvaro Fernández Rojas @ 2020-08-07 10:04 ` Álvaro Fernández Rojas 2020-08-07 18:19 ` Florian Fainelli 2020-08-09 18:40 ` Philippe Mathieu-Daudé 2020-08-07 10:04 ` [PATCH v2 2/4] MIPS: BCM63xx: remove EHCI from BCM6348 boards Álvaro Fernández Rojas ` (2 subsequent siblings) 3 siblings, 2 replies; 13+ messages in thread From: Álvaro Fernández Rojas @ 2020-08-07 10:04 UTC (permalink / raw) To: tsbogend, f.fainelli, jonas.gorski, bcm-kernel-feedback-list, linux-mips, linux-arm-kernel, linux-kernel Cc: Álvaro Fernández Rojas There are 3 duplicated new lines, let's remove them. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> --- v2: no changes. arch/mips/bcm63xx/boards/board_bcm963xx.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c index 230bf27c1fb8..744aa16bab12 100644 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c @@ -32,7 +32,6 @@ #include <uapi/linux/bcm933xx_hcs.h> - #define HCS_OFFSET_128K 0x20000 static struct board_info board; @@ -337,7 +336,6 @@ static struct board_info __initdata board_96348gw_11 = { .force_duplex_full = 1, }, - .has_ohci0 = 1, .has_pccard = 1, .has_ehci0 = 1, @@ -580,7 +578,6 @@ static struct board_info __initdata board_96358vw2 = { .force_duplex_full = 1, }, - .has_ohci0 = 1, .has_pccard = 1, .has_ehci0 = 1, -- 2.27.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v2 1/4] MIPS: BCM63xx: remove duplicated new lines 2020-08-07 10:04 ` [PATCH v2 1/4] MIPS: BCM63xx: remove duplicated new lines Álvaro Fernández Rojas @ 2020-08-07 18:19 ` Florian Fainelli 2020-08-09 18:40 ` Philippe Mathieu-Daudé 1 sibling, 0 replies; 13+ messages in thread From: Florian Fainelli @ 2020-08-07 18:19 UTC (permalink / raw) To: Álvaro Fernández Rojas, tsbogend, jonas.gorski, bcm-kernel-feedback-list, linux-mips, linux-arm-kernel, linux-kernel On 8/7/2020 3:04 AM, Álvaro Fernández Rojas wrote: > There are 3 duplicated new lines, let's remove them. > > Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> Acked-by: Florian Fainelli <f.fainelli@gmail.com> -- Florian _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 1/4] MIPS: BCM63xx: remove duplicated new lines 2020-08-07 10:04 ` [PATCH v2 1/4] MIPS: BCM63xx: remove duplicated new lines Álvaro Fernández Rojas 2020-08-07 18:19 ` Florian Fainelli @ 2020-08-09 18:40 ` Philippe Mathieu-Daudé 1 sibling, 0 replies; 13+ messages in thread From: Philippe Mathieu-Daudé @ 2020-08-09 18:40 UTC (permalink / raw) To: Álvaro Fernández Rojas Cc: Florian Fainelli, open list:BROADCOM NVRAM DRIVER, open list, Thomas Bogendoerfer, bcm-kernel-feedback-list, Jonas Gorski, Linux ARM On Fri, Aug 7, 2020 at 12:06 PM Álvaro Fernández Rojas <noltari@gmail.com> wrote: > > There are 3 duplicated new lines, let's remove them. > > Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> =) > --- > v2: no changes. > > arch/mips/bcm63xx/boards/board_bcm963xx.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c > index 230bf27c1fb8..744aa16bab12 100644 > --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c > +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c > @@ -32,7 +32,6 @@ > > #include <uapi/linux/bcm933xx_hcs.h> > > - > #define HCS_OFFSET_128K 0x20000 > > static struct board_info board; > @@ -337,7 +336,6 @@ static struct board_info __initdata board_96348gw_11 = { > .force_duplex_full = 1, > }, > > - > .has_ohci0 = 1, > .has_pccard = 1, > .has_ehci0 = 1, > @@ -580,7 +578,6 @@ static struct board_info __initdata board_96358vw2 = { > .force_duplex_full = 1, > }, > > - > .has_ohci0 = 1, > .has_pccard = 1, > .has_ehci0 = 1, > -- > 2.27.0 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v2 2/4] MIPS: BCM63xx: remove EHCI from BCM6348 boards 2020-08-07 10:04 [PATCH v2 0/4] MIPS: BCM63xx: board improvements Álvaro Fernández Rojas 2020-08-07 10:04 ` [PATCH v2 1/4] MIPS: BCM63xx: remove duplicated new lines Álvaro Fernández Rojas @ 2020-08-07 10:04 ` Álvaro Fernández Rojas 2020-08-07 18:30 ` Florian Fainelli 2020-08-07 10:04 ` [PATCH v2 3/4] MIPS: BCM63xx: enable EHCI for DWV-S0 board Álvaro Fernández Rojas 2020-08-07 10:04 ` [PATCH v2 4/4] MIPS: BCM63xx: refactor board declarations Álvaro Fernández Rojas 3 siblings, 1 reply; 13+ messages in thread From: Álvaro Fernández Rojas @ 2020-08-07 10:04 UTC (permalink / raw) To: tsbogend, f.fainelli, jonas.gorski, bcm-kernel-feedback-list, linux-mips, linux-arm-kernel, linux-kernel Cc: Álvaro Fernández Rojas There's no EHCI controller on BCM6348. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> --- v2: no changes. arch/mips/bcm63xx/boards/board_bcm963xx.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c index 744aa16bab12..45f1bc437245 100644 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c @@ -285,7 +285,6 @@ static struct board_info __initdata board_96348gw_10 = { .has_ohci0 = 1, .has_pccard = 1, - .has_ehci0 = 1, .leds = { { @@ -338,7 +337,6 @@ static struct board_info __initdata board_96348gw_11 = { .has_ohci0 = 1, .has_pccard = 1, - .has_ehci0 = 1, .leds = { { @@ -441,7 +439,6 @@ static struct board_info __initdata board_FAST2404 = { .has_ohci0 = 1, .has_pccard = 1, - .has_ehci0 = 1, }; static struct board_info __initdata board_rta1025w_16 = { -- 2.27.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v2 2/4] MIPS: BCM63xx: remove EHCI from BCM6348 boards 2020-08-07 10:04 ` [PATCH v2 2/4] MIPS: BCM63xx: remove EHCI from BCM6348 boards Álvaro Fernández Rojas @ 2020-08-07 18:30 ` Florian Fainelli 0 siblings, 0 replies; 13+ messages in thread From: Florian Fainelli @ 2020-08-07 18:30 UTC (permalink / raw) To: Álvaro Fernández Rojas, tsbogend, f.fainelli, jonas.gorski, bcm-kernel-feedback-list, linux-mips, linux-arm-kernel, linux-kernel On 8/7/2020 3:04 AM, Álvaro Fernández Rojas wrote: > There's no EHCI controller on BCM6348. > > Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> Acked-by: Florian Fainelli <f.fainelli@gmail.com> -- Florian _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v2 3/4] MIPS: BCM63xx: enable EHCI for DWV-S0 board 2020-08-07 10:04 [PATCH v2 0/4] MIPS: BCM63xx: board improvements Álvaro Fernández Rojas 2020-08-07 10:04 ` [PATCH v2 1/4] MIPS: BCM63xx: remove duplicated new lines Álvaro Fernández Rojas 2020-08-07 10:04 ` [PATCH v2 2/4] MIPS: BCM63xx: remove EHCI from BCM6348 boards Álvaro Fernández Rojas @ 2020-08-07 10:04 ` Álvaro Fernández Rojas 2020-08-07 18:30 ` Florian Fainelli 2020-08-09 18:49 ` Philippe Mathieu-Daudé 2020-08-07 10:04 ` [PATCH v2 4/4] MIPS: BCM63xx: refactor board declarations Álvaro Fernández Rojas 3 siblings, 2 replies; 13+ messages in thread From: Álvaro Fernández Rojas @ 2020-08-07 10:04 UTC (permalink / raw) To: tsbogend, f.fainelli, jonas.gorski, bcm-kernel-feedback-list, linux-mips, linux-arm-kernel, linux-kernel Cc: Álvaro Fernández Rojas EHCI and OHCI share the same USB ports. Therefore, if the board has OHCI it should also have EHCI. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> --- v2: no changes. arch/mips/bcm63xx/boards/board_bcm963xx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c index 45f1bc437245..ac9570b66f37 100644 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c @@ -645,6 +645,7 @@ static struct board_info __initdata board_DWVS0 = { }, .has_ohci0 = 1, + .has_ehci0 = 1, }; #endif /* CONFIG_BCM63XX_CPU_6358 */ -- 2.27.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v2 3/4] MIPS: BCM63xx: enable EHCI for DWV-S0 board 2020-08-07 10:04 ` [PATCH v2 3/4] MIPS: BCM63xx: enable EHCI for DWV-S0 board Álvaro Fernández Rojas @ 2020-08-07 18:30 ` Florian Fainelli 2020-08-09 18:49 ` Philippe Mathieu-Daudé 1 sibling, 0 replies; 13+ messages in thread From: Florian Fainelli @ 2020-08-07 18:30 UTC (permalink / raw) To: Álvaro Fernández Rojas, tsbogend, f.fainelli, jonas.gorski, bcm-kernel-feedback-list, linux-mips, linux-arm-kernel, linux-kernel On 8/7/2020 3:04 AM, Álvaro Fernández Rojas wrote: > EHCI and OHCI share the same USB ports. Therefore, if the board has OHCI > it should also have EHCI. > > Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> Acked-by: Florian Fainelli <f.fainelli@gmail.com> -- Florian _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 3/4] MIPS: BCM63xx: enable EHCI for DWV-S0 board 2020-08-07 10:04 ` [PATCH v2 3/4] MIPS: BCM63xx: enable EHCI for DWV-S0 board Álvaro Fernández Rojas 2020-08-07 18:30 ` Florian Fainelli @ 2020-08-09 18:49 ` Philippe Mathieu-Daudé 2020-08-11 2:33 ` Florian Fainelli 1 sibling, 1 reply; 13+ messages in thread From: Philippe Mathieu-Daudé @ 2020-08-09 18:49 UTC (permalink / raw) To: Álvaro Fernández Rojas Cc: Florian Fainelli, open list:BROADCOM NVRAM DRIVER, open list, Thomas Bogendoerfer, bcm-kernel-feedback-list, Jonas Gorski, Linux ARM Hi Álvaro, On Fri, Aug 7, 2020 at 12:05 PM Álvaro Fernández Rojas <noltari@gmail.com> wrote: > > EHCI and OHCI share the same USB ports. Therefore, if the board has OHCI > it should also have EHCI. This statement isn't correct. OHCI doesn't imply EHCI... (although the opposite is almost always true). Now per 6358-PB01-R the bcm6358 indeed has a EHCI controller. Do you mind rewording the commit description? Regards, Phil. > > Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> > --- > v2: no changes. > > arch/mips/bcm63xx/boards/board_bcm963xx.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c > index 45f1bc437245..ac9570b66f37 100644 > --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c > +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c > @@ -645,6 +645,7 @@ static struct board_info __initdata board_DWVS0 = { > }, > > .has_ohci0 = 1, > + .has_ehci0 = 1, > }; > #endif /* CONFIG_BCM63XX_CPU_6358 */ > > -- > 2.27.0 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 3/4] MIPS: BCM63xx: enable EHCI for DWV-S0 board 2020-08-09 18:49 ` Philippe Mathieu-Daudé @ 2020-08-11 2:33 ` Florian Fainelli 2020-08-11 9:09 ` Philippe Mathieu-Daudé 0 siblings, 1 reply; 13+ messages in thread From: Florian Fainelli @ 2020-08-11 2:33 UTC (permalink / raw) To: Philippe Mathieu-Daudé, Álvaro Fernández Rojas Cc: Florian Fainelli, open list:BROADCOM NVRAM DRIVER, open list, Thomas Bogendoerfer, bcm-kernel-feedback-list, Jonas Gorski, Linux ARM On 8/9/2020 11:49 AM, Philippe Mathieu-Daudé wrote: > Hi Álvaro, > > On Fri, Aug 7, 2020 at 12:05 PM Álvaro Fernández Rojas > <noltari@gmail.com> wrote: >> >> EHCI and OHCI share the same USB ports. Therefore, if the board has OHCI >> it should also have EHCI. > > This statement isn't correct. OHCI doesn't imply EHCI... > (although the opposite is almost always true). > > Now per 6358-PB01-R the bcm6358 indeed has a EHCI controller. > > Do you mind rewording the commit description? Is not it that a single USB port is used and we need the EHCI controller active in order for the correct speed negotiation to occur? -- Florian _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 3/4] MIPS: BCM63xx: enable EHCI for DWV-S0 board 2020-08-11 2:33 ` Florian Fainelli @ 2020-08-11 9:09 ` Philippe Mathieu-Daudé 0 siblings, 0 replies; 13+ messages in thread From: Philippe Mathieu-Daudé @ 2020-08-11 9:09 UTC (permalink / raw) To: Florian Fainelli Cc: Álvaro Fernández Rojas, open list:BROADCOM NVRAM DRIVER, open list, Thomas Bogendoerfer, bcm-kernel-feedback-list, Jonas Gorski, Linux ARM Hi Florian, On Tue, Aug 11, 2020 at 4:33 AM Florian Fainelli <f.fainelli@gmail.com> wrote: > On 8/9/2020 11:49 AM, Philippe Mathieu-Daudé wrote: > > Hi Álvaro, > > > > On Fri, Aug 7, 2020 at 12:05 PM Álvaro Fernández Rojas > > <noltari@gmail.com> wrote: > >> > >> EHCI and OHCI share the same USB ports. Therefore, if the board has OHCI > >> it should also have EHCI. > > > > This statement isn't correct. OHCI doesn't imply EHCI... > > (although the opposite is almost always true). > > > > Now per 6358-PB01-R the bcm6358 indeed has a EHCI controller. > > > > Do you mind rewording the commit description? > > Is not it that a single USB port is used and we need the EHCI controller > active in order for the correct speed negotiation to occur? Yes. What sounds odd is "if the board has OHCI it should also have EHCI." This is true for this particular board because its chipset is a bcm6358, but I'm worried it might later confuse other developers. For example the bcm6348 has a OHCI controller, but that doesn't imply its port can be used as EHCI. Regards, Phil. > -- > Florian _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v2 4/4] MIPS: BCM63xx: refactor board declarations 2020-08-07 10:04 [PATCH v2 0/4] MIPS: BCM63xx: board improvements Álvaro Fernández Rojas ` (2 preceding siblings ...) 2020-08-07 10:04 ` [PATCH v2 3/4] MIPS: BCM63xx: enable EHCI for DWV-S0 board Álvaro Fernández Rojas @ 2020-08-07 10:04 ` Álvaro Fernández Rojas 2020-08-07 18:31 ` Florian Fainelli 3 siblings, 1 reply; 13+ messages in thread From: Álvaro Fernández Rojas @ 2020-08-07 10:04 UTC (permalink / raw) To: tsbogend, f.fainelli, jonas.gorski, bcm-kernel-feedback-list, linux-mips, linux-arm-kernel, linux-kernel Cc: Álvaro Fernández Rojas Current board declarations are a mess. Let's put some order and make them follow the same structure. Also board declarations tabs. Switch to SPDX license identifier. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> --- 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. - * * 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.27.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v2 4/4] MIPS: BCM63xx: refactor board declarations 2020-08-07 10:04 ` [PATCH v2 4/4] MIPS: BCM63xx: refactor board declarations Álvaro Fernández Rojas @ 2020-08-07 18:31 ` Florian Fainelli 0 siblings, 0 replies; 13+ messages in thread From: Florian Fainelli @ 2020-08-07 18:31 UTC (permalink / raw) To: Álvaro Fernández Rojas, tsbogend, f.fainelli, jonas.gorski, bcm-kernel-feedback-list, linux-mips, linux-arm-kernel, linux-kernel On 8/7/2020 3:04 AM, Á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 <noltari@gmail.com> That is a lot of churn, not sure if this is really worth it... in any case: Acked-by: Florian Fainelli <f.fainelli@gmail.com> -- Florian _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2020-08-11 9:11 UTC | newest] Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-08-07 10:04 [PATCH v2 0/4] MIPS: BCM63xx: board improvements Álvaro Fernández Rojas 2020-08-07 10:04 ` [PATCH v2 1/4] MIPS: BCM63xx: remove duplicated new lines Álvaro Fernández Rojas 2020-08-07 18:19 ` Florian Fainelli 2020-08-09 18:40 ` Philippe Mathieu-Daudé 2020-08-07 10:04 ` [PATCH v2 2/4] MIPS: BCM63xx: remove EHCI from BCM6348 boards Álvaro Fernández Rojas 2020-08-07 18:30 ` Florian Fainelli 2020-08-07 10:04 ` [PATCH v2 3/4] MIPS: BCM63xx: enable EHCI for DWV-S0 board Álvaro Fernández Rojas 2020-08-07 18:30 ` Florian Fainelli 2020-08-09 18:49 ` Philippe Mathieu-Daudé 2020-08-11 2:33 ` Florian Fainelli 2020-08-11 9:09 ` Philippe Mathieu-Daudé 2020-08-07 10:04 ` [PATCH v2 4/4] MIPS: BCM63xx: refactor board declarations Álvaro Fernández Rojas 2020-08-07 18:31 ` Florian Fainelli
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).