Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1600498
| From | Corentin Labbe <clabbe.montjoie@gmail.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v2 02/20] net-next: stmmac: add optional setup function |
| Date | 2017-03-14 15:30 +0100 |
| Message-ID | <tkVCz-1ny-49@gated-at.bofh.it> (permalink) |
| References | <tkVCx-1ny-1@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Instead of ading more ifthen logic for adding a new mac_device_info
setup function, it is easier to add a function pointer to the function
needed.
Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
---
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 +++-
include/linux/stmmac.h | 3 +++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 4498a38..856ac57 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -3101,7 +3101,9 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
struct mac_device_info *mac;
/* Identify the MAC HW device */
- if (priv->plat->has_gmac) {
+ if (priv->plat->setup) {
+ mac = priv->plat->setup(priv);
+ } else if (priv->plat->has_gmac) {
priv->dev->priv_flags |= IFF_UNICAST_FLT;
mac = dwmac1000_setup(priv->ioaddr,
priv->plat->multicast_filter_bins,
diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index fc273e9..8f09f18 100644
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -109,6 +109,8 @@ struct stmmac_axi {
bool axi_rb;
};
+struct stmmac_priv;
+
struct plat_stmmacenet_data {
int bus_id;
int phy_addr;
@@ -136,6 +138,7 @@ struct plat_stmmacenet_data {
void (*fix_mac_speed)(void *priv, unsigned int speed);
int (*init)(struct platform_device *pdev, void *priv);
void (*exit)(struct platform_device *pdev, void *priv);
+ struct mac_device_info *(*setup)(struct stmmac_priv *priv);
void *bsp_priv;
struct clk *stmmac_clk;
struct clk *pclk;
--
2.10.2
Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread
[PATCH v2 00/20] net-next: stmmac: add dwmac-sun8i ethernet driver Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-03-14 15:30 +0100
[PATCH v2 03/20] ARM: sun8i: dt: Add DT bindings documentation for Allwinner dwmac-sun8i Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-03-14 15:30 +0100
Re: [PATCH v2 03/20] ARM: sun8i: dt: Add DT bindings documentation for Allwinner dwmac-sun8i Rob Herring <robh@kernel.org> - 2017-03-20 23:30 +0100
[PATCH v2 18/20] ARM: dts: sun50i-a64: enable dwmac-sun8i on the BananaPi M64 Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-03-14 15:30 +0100
[PATCH v2 06/20] ARM: dts: sunxi-h3-h5: Add dt node for the syscon control module Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-03-14 15:30 +0100
[PATCH v2 13/20] ARM: dts: sun8i: orangepi-pc-plus: Set EMAC activity LEDs to active high Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-03-14 15:30 +0100
[PATCH v2 16/20] ARM: dts: sun50i-a64: enable dwmac-sun8i on pine64 Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-03-14 15:30 +0100
Re: [PATCH v2 16/20] ARM: dts: sun50i-a64: enable dwmac-sun8i on pine64 Florian Fainelli <f.fainelli@gmail.com> - 2017-03-14 19:30 +0100
[PATCH v2 14/20] ARM64: dts: sun50i-a64: Add dt node for the syscon control module Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-03-14 15:30 +0100
Re: [PATCH v2 14/20] ARM64: dts: sun50i-a64: Add dt node for the syscon control module Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2017-03-15 12:10 +0100
[PATCH v2 17/20] ARM: dts: sun50i-a64: enable dwmac-sun8i on pine64 plus Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-03-14 15:30 +0100
[PATCH v2 01/20] net-next: stmmac: export stmmac_set_mac_addr/stmmac_get_mac_addr Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-03-14 15:30 +0100
[PATCH v2 04/20] ARM: sun8i: dt: Add DT bindings documentation for Allwinner syscon Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-03-14 15:30 +0100
Re: [PATCH v2 04/20] ARM: sun8i: dt: Add DT bindings documentation for Allwinner syscon Rob Herring <robh@kernel.org> - 2017-03-21 02:10 +0100
[PATCH v2 19/20] ARM: sunxi: Enable dwmac-sun8i driver on sunxi_defconfig Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-03-14 15:30 +0100
[PATCH v2 20/20] ARM: sunxi: Enable dwmac-sun8i driver on multi_v7_defconfig Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-03-14 15:30 +0100
[PATCH v2 09/20] ARM: dts: sun8i: Enable dwmac-sun8i on the Orange PI PC Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-03-14 15:30 +0100
[PATCH v2 12/20] ARM: dts: sun8i: Enable dwmac-sun8i on the Orange Pi plus Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-03-14 15:30 +0100
[PATCH v2 08/20] ARM: dts: sun8i: Enable dwmac-sun8i on the Banana Pi M2+ Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-03-14 15:30 +0100
[PATCH v2 05/20] net-next: stmmac: Add dwmac-sun8i Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-03-14 15:30 +0100
[PATCH v2 11/20] ARM: dts: sun8i: Enable dwmac-sun8i on the Orange PI One Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-03-14 15:30 +0100
[PATCH v2 10/20] ARM: dts: sun8i: Enable dwmac-sun8i on the Orange Pi 2 Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-03-14 15:30 +0100
[PATCH v2 15/20] ARM64: dts: sun50i-a64: add dwmac-sun8i Ethernet driver Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-03-14 15:30 +0100
[PATCH v2 07/20] ARM: dts: sunxi-h3-h5: add dwmac-sun8i ethernet driver Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-03-14 15:30 +0100
[PATCH v2 02/20] net-next: stmmac: add optional setup function Corentin Labbe <clabbe.montjoie@gmail.com> - 2017-03-14 15:30 +0100
csiph-web