| Message ID | 1447732444-30892-15-git-send-email-sjg@chromium.org |
|---|---|
| State | Superseded |
| Delegated to: | Simon Glass |
| Headers | show |
On Tue, Nov 17, 2015 at 11:53 AM, Simon Glass <sjg@chromium.org> wrote: > Adjust all Tegra boards to use driver model for Ethernet, now that the > required drivers are converted. > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > arch/arm/mach-tegra/Kconfig | 1 + > board/compulab/trimslice/trimslice.c | 8 -------- > board/nvidia/cardhu/cardhu.c | 6 ------ > board/nvidia/jetson-tk1/jetson-tk1.c | 6 ------ > board/nvidia/p2371-2180/p2371-2180.c | 6 ------ > board/toradex/apalis_t30/apalis_t30.c | 6 ------ > 6 files changed, 1 insertion(+), 32 deletions(-) > > diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig > index 3906fc1..74ff6fca 100644 > --- a/arch/arm/mach-tegra/Kconfig > +++ b/arch/arm/mach-tegra/Kconfig > @@ -14,6 +14,7 @@ config TEGRA_ARMV7_COMMON > select DM_GPIO > select DM_PCI > select DM_PCI_COMPAT > + select DM_ETH > > choice > prompt "Tegra SoC select" > diff --git a/board/compulab/trimslice/trimslice.c b/board/compulab/trimslice/trimslice.c > index c9da80d..723293f 100644 > --- a/board/compulab/trimslice/trimslice.c > +++ b/board/compulab/trimslice/trimslice.c > @@ -13,7 +13,6 @@ > #include <asm/arch/pinmux.h> > #include <asm/gpio.h> > #include <i2c.h> > -#include <netdev.h> > > void pin_mux_usb(void) > { > @@ -41,10 +40,3 @@ void pin_mux_mmc(void) > /* For CD GPIO PP1 */ > pinmux_tristate_disable(PMUX_PINGRP_DAP3); > } > - > -#ifdef CONFIG_PCI > -int board_eth_init(bd_t *bis) > -{ > - return pci_eth_init(bis); > -} > -#endif > diff --git a/board/nvidia/cardhu/cardhu.c b/board/nvidia/cardhu/cardhu.c > index 1540526..ba15e2e 100644 > --- a/board/nvidia/cardhu/cardhu.c > +++ b/board/nvidia/cardhu/cardhu.c > @@ -13,7 +13,6 @@ > #include <asm/gpio.h> > #include "pinmux-config-cardhu.h" > #include <i2c.h> > -#include <netdev.h> > > #define PMU_I2C_ADDRESS 0x2D > #define MAX_I2C_RETRY 3 > @@ -129,9 +128,4 @@ int tegra_pcie_board_init(void) > > return 0; > } > - > -int board_eth_init(bd_t *bis) > -{ > - return pci_eth_init(bis); > -} > #endif /* PCI */ > diff --git a/board/nvidia/jetson-tk1/jetson-tk1.c b/board/nvidia/jetson-tk1/jetson-tk1.c > index 52425a8..6f189aa 100644 > --- a/board/nvidia/jetson-tk1/jetson-tk1.c > +++ b/board/nvidia/jetson-tk1/jetson-tk1.c > @@ -6,7 +6,6 @@ > */ > > #include <common.h> > -#include <netdev.h> > #include <power/as3722.h> > > #include <asm/arch/gpio.h> > @@ -73,9 +72,4 @@ int tegra_pcie_board_init(void) > > return 0; > } > - > -int board_eth_init(bd_t *bis) > -{ > - return pci_eth_init(bis); > -} > #endif /* PCI */ > diff --git a/board/nvidia/p2371-2180/p2371-2180.c b/board/nvidia/p2371-2180/p2371-2180.c > index 57f577d8..0f587ea 100644 > --- a/board/nvidia/p2371-2180/p2371-2180.c > +++ b/board/nvidia/p2371-2180/p2371-2180.c > @@ -6,7 +6,6 @@ > */ > > #include <common.h> > -#include <netdev.h> > #include <i2c.h> > #include <asm/arch/gpio.h> > #include <asm/arch/pinmux.h> > @@ -73,9 +72,4 @@ int tegra_pcie_board_init(void) > > return 0; > } > - > -int board_eth_init(bd_t *bis) > -{ > - return pci_eth_init(bis); > -} > #endif /* PCI */ > diff --git a/board/toradex/apalis_t30/apalis_t30.c b/board/toradex/apalis_t30/apalis_t30.c > index 879006f..3f56971 100644 > --- a/board/toradex/apalis_t30/apalis_t30.c > +++ b/board/toradex/apalis_t30/apalis_t30.c > @@ -14,7 +14,6 @@ > #include <asm/io.h> > #include <dm.h> > #include <i2c.h> > -#include <netdev.h> > > #include "pinmux-config-apalis_t30.h" > > @@ -92,9 +91,4 @@ int tegra_pcie_board_init(void) > > return 0; > } > - > -int board_eth_init(bd_t *bis) > -{ > - return pci_eth_init(bis); > -} > #endif /* CONFIG_PCI_TEGRA */ > -- Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
On 11/16/2015 08:53 PM, Simon Glass wrote: > Adjust all Tegra boards to use driver model for Ethernet, now that the > required drivers are converted. > diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig > @@ -14,6 +14,7 @@ config TEGRA_ARMV7_COMMON > select DM_GPIO > select DM_PCI > select DM_PCI_COMPAT > + select DM_ETH This should be set for Tegra210 too. I suggest creating a "config TEGRA_COMMON" to contain all the shared settings, and making TEGRA_ARMV7_COMMON and TEGRA_ARMV8_COMMON (also new) select that. > diff --git a/board/compulab/trimslice/trimslice.c b/board/compulab/trimslice/trimslice.c > -#ifdef CONFIG_PCI > -int board_eth_init(bd_t *bis) > -{ > - return pci_eth_init(bis); > -} > -#endif Has the need to call this function already been removed by this point in the series. In other words, does each commit in this series compile and support using Ethernet? If not, anyone running "git bisect" is going to be very sad.
Hi Stephen, On 18 November 2015 at 14:35, Stephen Warren <swarren@wwwdotorg.org> wrote: > On 11/16/2015 08:53 PM, Simon Glass wrote: >> >> Adjust all Tegra boards to use driver model for Ethernet, now that the >> required drivers are converted. > > >> diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig > > >> @@ -14,6 +14,7 @@ config TEGRA_ARMV7_COMMON >> select DM_GPIO >> select DM_PCI >> select DM_PCI_COMPAT >> + select DM_ETH > > > This should be set for Tegra210 too. I suggest creating a "config > TEGRA_COMMON" to contain all the shared settings, and making > TEGRA_ARMV7_COMMON and TEGRA_ARMV8_COMMON (also new) select that. Would you mind doing a patch for that? It seems like it should be a separate patch. > >> diff --git a/board/compulab/trimslice/trimslice.c >> b/board/compulab/trimslice/trimslice.c > > >> -#ifdef CONFIG_PCI >> -int board_eth_init(bd_t *bis) >> -{ >> - return pci_eth_init(bis); >> -} >> -#endif > > > Has the need to call this function already been removed by this point in the > series. In other words, does each commit in this series compile and support > using Ethernet? If not, anyone running "git bisect" is going to be very sad. It's connected with CONFIG_DM_ETH, so we should be OK. Regards, Simon
On 11/18/2015 03:14 PM, Simon Glass wrote: > Hi Stephen, > > On 18 November 2015 at 14:35, Stephen Warren <swarren@wwwdotorg.org> wrote: >> On 11/16/2015 08:53 PM, Simon Glass wrote: >>> >>> Adjust all Tegra boards to use driver model for Ethernet, now that the >>> required drivers are converted. >> >> >>> diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig >> >> >>> @@ -14,6 +14,7 @@ config TEGRA_ARMV7_COMMON >>> select DM_GPIO >>> select DM_PCI >>> select DM_PCI_COMPAT >>> + select DM_ETH >> >> >> This should be set for Tegra210 too. I suggest creating a "config >> TEGRA_COMMON" to contain all the shared settings, and making >> TEGRA_ARMV7_COMMON and TEGRA_ARMV8_COMMON (also new) select that. > > Would you mind doing a patch for that? It seems like it should be a > separate patch. OK, I've sent it. I will point out that what with the merge conflicts you'll now have to resolve, it probably would have been quicker for you if you had written it yourself...
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index 3906fc1..74ff6fca 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -14,6 +14,7 @@ config TEGRA_ARMV7_COMMON select DM_GPIO select DM_PCI select DM_PCI_COMPAT + select DM_ETH choice prompt "Tegra SoC select" diff --git a/board/compulab/trimslice/trimslice.c b/board/compulab/trimslice/trimslice.c index c9da80d..723293f 100644 --- a/board/compulab/trimslice/trimslice.c +++ b/board/compulab/trimslice/trimslice.c @@ -13,7 +13,6 @@ #include <asm/arch/pinmux.h> #include <asm/gpio.h> #include <i2c.h> -#include <netdev.h> void pin_mux_usb(void) { @@ -41,10 +40,3 @@ void pin_mux_mmc(void) /* For CD GPIO PP1 */ pinmux_tristate_disable(PMUX_PINGRP_DAP3); } - -#ifdef CONFIG_PCI -int board_eth_init(bd_t *bis) -{ - return pci_eth_init(bis); -} -#endif diff --git a/board/nvidia/cardhu/cardhu.c b/board/nvidia/cardhu/cardhu.c index 1540526..ba15e2e 100644 --- a/board/nvidia/cardhu/cardhu.c +++ b/board/nvidia/cardhu/cardhu.c @@ -13,7 +13,6 @@ #include <asm/gpio.h> #include "pinmux-config-cardhu.h" #include <i2c.h> -#include <netdev.h> #define PMU_I2C_ADDRESS 0x2D #define MAX_I2C_RETRY 3 @@ -129,9 +128,4 @@ int tegra_pcie_board_init(void) return 0; } - -int board_eth_init(bd_t *bis) -{ - return pci_eth_init(bis); -} #endif /* PCI */ diff --git a/board/nvidia/jetson-tk1/jetson-tk1.c b/board/nvidia/jetson-tk1/jetson-tk1.c index 52425a8..6f189aa 100644 --- a/board/nvidia/jetson-tk1/jetson-tk1.c +++ b/board/nvidia/jetson-tk1/jetson-tk1.c @@ -6,7 +6,6 @@ */ #include <common.h> -#include <netdev.h> #include <power/as3722.h> #include <asm/arch/gpio.h> @@ -73,9 +72,4 @@ int tegra_pcie_board_init(void) return 0; } - -int board_eth_init(bd_t *bis) -{ - return pci_eth_init(bis); -} #endif /* PCI */ diff --git a/board/nvidia/p2371-2180/p2371-2180.c b/board/nvidia/p2371-2180/p2371-2180.c index 57f577d8..0f587ea 100644 --- a/board/nvidia/p2371-2180/p2371-2180.c +++ b/board/nvidia/p2371-2180/p2371-2180.c @@ -6,7 +6,6 @@ */ #include <common.h> -#include <netdev.h> #include <i2c.h> #include <asm/arch/gpio.h> #include <asm/arch/pinmux.h> @@ -73,9 +72,4 @@ int tegra_pcie_board_init(void) return 0; } - -int board_eth_init(bd_t *bis) -{ - return pci_eth_init(bis); -} #endif /* PCI */ diff --git a/board/toradex/apalis_t30/apalis_t30.c b/board/toradex/apalis_t30/apalis_t30.c index 879006f..3f56971 100644 --- a/board/toradex/apalis_t30/apalis_t30.c +++ b/board/toradex/apalis_t30/apalis_t30.c @@ -14,7 +14,6 @@ #include <asm/io.h> #include <dm.h> #include <i2c.h> -#include <netdev.h> #include "pinmux-config-apalis_t30.h" @@ -92,9 +91,4 @@ int tegra_pcie_board_init(void) return 0; } - -int board_eth_init(bd_t *bis) -{ - return pci_eth_init(bis); -} #endif /* CONFIG_PCI_TEGRA */
Adjust all Tegra boards to use driver model for Ethernet, now that the required drivers are converted. Signed-off-by: Simon Glass <sjg@chromium.org> --- arch/arm/mach-tegra/Kconfig | 1 + board/compulab/trimslice/trimslice.c | 8 -------- board/nvidia/cardhu/cardhu.c | 6 ------ board/nvidia/jetson-tk1/jetson-tk1.c | 6 ------ board/nvidia/p2371-2180/p2371-2180.c | 6 ------ board/toradex/apalis_t30/apalis_t30.c | 6 ------ 6 files changed, 1 insertion(+), 32 deletions(-)