Commit 5a256347 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'stmmac-STM32F429' 



Alexandre TORGUE says:

====================
Add Ethernet support on STM32F429

STM32F429 Chip embeds a Synopsys 3.50a MAC IP.

This series enhance current stmmac driver to control it (code already
available) and adds basic glue for STM32F429 chip.

Changes since v5:
 -Fix typo in bindings documentation patch.
 -Change clocks names in stm32-dwmac glue driver / Documentation.
 -After rebase, stm32 ethernet node is now available. It has to be updated
according to new clocks names.

Changes since v4:
 -Fix dirty copy/past in bindings documentation patch.

Changes since v3:
 -Fix "tx-clk" and "rx-clk" as required clocks. Driver and bindings are
modified.

Changes since v2:
 -Fix alphabetic order in Kconfig and Makefile.
 -Improve code according to Joachim review.
 -Binding: remove useless entry.

Changes since v1:
 -Fix Kbuild issue in Kconfig.
 -Remove init/exit callbacks. Suspend/Resume and remove driver is no more
driven in stmmac_pltfr but directly in dwmac-stm32 glue driver.
 -Take into account Joachim review.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ce927bf1 f9a09687

Documentation/devicetree/bindings/net/stm32-dwmac.txt

0 → 100644
+32 −0
Original line number Diff line number Diff line 
STMicroelectronics STM32 / MCU DWMAC glue layer controller



This file documents platform glue layer for stmmac.

Please see stmmac.txt for the other unchanged properties.



The device node has following properties.



Required properties:

- compatible:  Should be "st,stm32-dwmac" to select glue, and

	       "snps,dwmac-3.50a" to select IP version.

- clocks: Must contain a phandle for each entry in clock-names.

- clock-names: Should be "stmmaceth" for the host clock.

	       Should be "mac-clk-tx" for the MAC TX clock.

	       Should be "mac-clk-rx" for the MAC RX clock.

- st,syscon : Should be phandle/offset pair. The phandle to the syscon node which

	      encompases the glue register, and the offset of the control register.

Example:



	ethernet@40028000 {

		compatible = "st,stm32-dwmac", "snps,dwmac-3.50a";

		status = "disabled";

		reg = <0x40028000 0x8000>;

		reg-names = "stmmaceth";

		interrupts = <0 61 0>, <0 62 0>;

		interrupt-names = "macirq", "eth_wake_irq";

		clock-names = "stmmaceth", "mac-clk-tx", "mac-clk-rx";

		clocks = <&rcc 0 25>, <&rcc 0 26>, <&rcc 0 27>;

		st,syscon = <&syscfg 0x4>;

		snps,pbl = <8>;

		snps,mixed-burst;

		dma-ranges;

	};

drivers/net/ethernet/stmicro/stmmac/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -104,6 +104,18 @@ config DWMAC_STI 
	  device driver. This driver is used on for the STi series

	  SOCs GMAC ethernet controller.



config DWMAC_STM32

	tristate "STM32 DWMAC support"

	default ARCH_STM32

	depends on OF && HAS_IOMEM

	select MFD_SYSCON

	---help---

	  Support for ethernet controller on STM32 SOCs.



	  This selects STM32 SoC glue layer support for the stmmac

	  device driver. This driver is used on for the STM32 series

	  SOCs GMAC ethernet controller.



config DWMAC_SUNXI

	tristate "Allwinner GMAC support"

	default ARCH_SUNXI

drivers/net/ethernet/stmicro/stmmac/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ obj-$(CONFIG_DWMAC_MESON) += dwmac-meson.o 
obj-$(CONFIG_DWMAC_ROCKCHIP)	+= dwmac-rk.o

obj-$(CONFIG_DWMAC_SOCFPGA)	+= dwmac-altr-socfpga.o

obj-$(CONFIG_DWMAC_STI)		+= dwmac-sti.o

obj-$(CONFIG_DWMAC_STM32)	+= dwmac-stm32.o

obj-$(CONFIG_DWMAC_SUNXI)	+= dwmac-sunxi.o

obj-$(CONFIG_DWMAC_GENERIC)	+= dwmac-generic.o

stmmac-platform-objs:= stmmac_platform.o

drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c

0 → 100644
+193 −0
Original line number Diff line number Diff line 
/*

 * dwmac-stm32.c - DWMAC Specific Glue layer for STM32 MCU

 *

 * Copyright (C) Alexandre Torgue 2015

 * Author:  Alexandre Torgue <alexandre.torgue@gmail.com>

 * License terms:  GNU General Public License (GPL), version 2

 *

 */



#include <linux/clk.h>

#include <linux/kernel.h>

#include <linux/mfd/syscon.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/of_net.h>

#include <linux/phy.h>

#include <linux/platform_device.h>

#include <linux/regmap.h>

#include <linux/slab.h>

#include <linux/stmmac.h>



#include "stmmac_platform.h"



#define MII_PHY_SEL_MASK	BIT(23)



struct stm32_dwmac {

	struct clk *clk_tx;

	struct clk *clk_rx;

	u32 mode_reg;		/* MAC glue-logic mode register */

	struct regmap *regmap;

	u32 speed;

};



static int stm32_dwmac_init(struct plat_stmmacenet_data *plat_dat)

{

	struct stm32_dwmac *dwmac = plat_dat->bsp_priv;

	u32 reg = dwmac->mode_reg;

	u32 val;

	int ret;



	val = (plat_dat->interface == PHY_INTERFACE_MODE_MII) ? 0 : 1;

	ret = regmap_update_bits(dwmac->regmap, reg, MII_PHY_SEL_MASK, val);

	if (ret)

		return ret;



	ret = clk_prepare_enable(dwmac->clk_tx);

	if (ret)

		return ret;



	ret = clk_prepare_enable(dwmac->clk_rx);

	if (ret)

		clk_disable_unprepare(dwmac->clk_tx);



	return ret;

}



static void stm32_dwmac_clk_disable(struct stm32_dwmac *dwmac)

{

	clk_disable_unprepare(dwmac->clk_tx);

	clk_disable_unprepare(dwmac->clk_rx);

}



static int stm32_dwmac_parse_data(struct stm32_dwmac *dwmac,

				  struct device *dev)

{

	struct device_node *np = dev->of_node;

	int err;



	/*  Get TX/RX clocks */

	dwmac->clk_tx = devm_clk_get(dev, "mac-clk-tx");

	if (IS_ERR(dwmac->clk_tx)) {

		dev_err(dev, "No tx clock provided...\n");

		return PTR_ERR(dwmac->clk_tx);

	}

	dwmac->clk_rx = devm_clk_get(dev, "mac-clk-rx");

	if (IS_ERR(dwmac->clk_rx)) {

		dev_err(dev, "No rx clock provided...\n");

		return PTR_ERR(dwmac->clk_rx);

	}



	/* Get mode register */

	dwmac->regmap = syscon_regmap_lookup_by_phandle(np, "st,syscon");

	if (IS_ERR(dwmac->regmap))

		return PTR_ERR(dwmac->regmap);



	err = of_property_read_u32_index(np, "st,syscon", 1, &dwmac->mode_reg);

	if (err)

		dev_err(dev, "Can't get sysconfig mode offset (%d)\n", err);



	return err;

}



static int stm32_dwmac_probe(struct platform_device *pdev)

{

	struct plat_stmmacenet_data *plat_dat;

	struct stmmac_resources stmmac_res;

	struct stm32_dwmac *dwmac;

	int ret;



	ret = stmmac_get_platform_resources(pdev, &stmmac_res);

	if (ret)

		return ret;



	plat_dat = stmmac_probe_config_dt(pdev, &stmmac_res.mac);

	if (IS_ERR(plat_dat))

		return PTR_ERR(plat_dat);



	dwmac = devm_kzalloc(&pdev->dev, sizeof(*dwmac), GFP_KERNEL);

	if (!dwmac)

		return -ENOMEM;



	ret = stm32_dwmac_parse_data(dwmac, &pdev->dev);

	if (ret) {

		dev_err(&pdev->dev, "Unable to parse OF data\n");

		return ret;

	}



	plat_dat->bsp_priv = dwmac;



	ret = stm32_dwmac_init(plat_dat);

	if (ret)

		return ret;



	ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);

	if (ret)

		stm32_dwmac_clk_disable(dwmac);



	return ret;

}



static int stm32_dwmac_remove(struct platform_device *pdev)

{

	struct net_device *ndev = platform_get_drvdata(pdev);

	struct stmmac_priv *priv = netdev_priv(ndev);

	int ret = stmmac_dvr_remove(&pdev->dev);



	stm32_dwmac_clk_disable(priv->plat->bsp_priv);



	return ret;

}



#ifdef CONFIG_PM_SLEEP

static int stm32_dwmac_suspend(struct device *dev)

{

	struct net_device *ndev = dev_get_drvdata(dev);

	struct stmmac_priv *priv = netdev_priv(ndev);

	int ret;



	ret = stmmac_suspend(dev);

	stm32_dwmac_clk_disable(priv->plat->bsp_priv);



	return ret;

}



static int stm32_dwmac_resume(struct device *dev)

{

	struct net_device *ndev = dev_get_drvdata(dev);

	struct stmmac_priv *priv = netdev_priv(ndev);

	int ret;



	ret = stm32_dwmac_init(priv->plat);

	if (ret)

		return ret;



	ret = stmmac_resume(dev);



	return ret;

}

#endif /* CONFIG_PM_SLEEP */



SIMPLE_DEV_PM_OPS(stm32_dwmac_pm_ops, stm32_dwmac_suspend, stm32_dwmac_resume);



static const struct of_device_id stm32_dwmac_match[] = {

	{ .compatible = "st,stm32-dwmac"},

	{ }

};

MODULE_DEVICE_TABLE(of, stm32_dwmac_match);



static struct platform_driver stm32_dwmac_driver = {

	.probe  = stm32_dwmac_probe,

	.remove = stm32_dwmac_remove,

	.driver = {

		.name           = "stm32-dwmac",

		.pm		= &stm32_dwmac_pm_ops,

		.of_match_table = stm32_dwmac_match,

	},

};

module_platform_driver(stm32_dwmac_driver);



MODULE_AUTHOR("Alexandre Torgue <alexandre.torgue@gmail.com>");

MODULE_DESCRIPTION("STMicroelectronics MCU DWMAC Specific Glue layer");

MODULE_LICENSE("GPL v2");

drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c

+1 −0
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac) 
	 * once needed on other platforms.

	 */

	if (of_device_is_compatible(np, "st,spear600-gmac") ||

		of_device_is_compatible(np, "snps,dwmac-3.50a") ||

		of_device_is_compatible(np, "snps,dwmac-3.70a") ||

		of_device_is_compatible(np, "snps,dwmac")) {

		/* Note that the max-frame-size parameter as defined in the

CRA Git | Maintained and supported by SUSTech CRA and CCSE