Skip to contentSkip to conversation

ethernet: arc: Add support for Rockchip SoC layer device tree bindings

PATCH Superseded Romain Perier 3 participants 4 messages Aug 27, 2014

Subsystems (3)

v2 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 ethernet: arc: Add support for Rockchip SoC layer device tree bindings

This patch defines a platform glue layer for Rockchip SoCs which support arc-emac driver. It ensures that regulator for the rmii is on before trying to connect to the ethernet controller. It applies right speed and mode changes to the grf when ethernet settings change.

---
 drivers/net/ethernet/arc/Kconfig         |  15 +++
 drivers/net/ethernet/arc/Makefile        |   1 +
 drivers/net/ethernet/arc/emac.h          |   2 +
 drivers/net/ethernet/arc/emac_main.c     |   2 +
 drivers/net/ethernet/arc/emac_rockchip.c | 224 +++++++++++++++++++++++++++++++
 5 files changed, 244 insertions(+)
 create mode 100644 drivers/net/ethernet/arc/emac_rockchip.c
drivers/net/ethernet/arc/Kconfig +15 -0
index 89e04fd..6d96a82 100644
@@ -32,4 +32,19 @@ config ARC_EMAC
 	  non-standard on-chip ethernet device ARC EMAC 10/100 is used.
 	  Say Y here if you have such a board.  If unsure, say N.
 
+config EMAC_ROCKCHIP
+       tristate "Rockchip EMAC support"
+       select ARC_EMAC_CORE
+       depends on OF_IRQ
+       depends on OF_NET
+       depends on ARCH_ROCKCHIP
+       depends on REGULATOR_ACT8865
+       depends on SMSC_PHY
+       depends on MFD_SYSCON
+       ---help---
+         Support for Rockchip RK3066/RK3188 EMAC ethernet controllers.
+         This selects Rockchip SoC glue layer support for the
+         emac device driver. This driver is used for RK3066/RK3188
+         EMAC ethernet controller.
+
 endif # NET_VENDOR_ARC
drivers/net/ethernet/arc/Makefile +1 -0
index 241bb80..79108af 100644
@@ -5,3 +5,4 @@
 arc_emac-objs := emac_main.o emac_mdio.o
 obj-$(CONFIG_ARC_EMAC_CORE) += arc_emac.o
 obj-$(CONFIG_ARC_EMAC) += emac_arc.o
+obj-$(CONFIG_EMAC_ROCKCHIP) += emac_rockchip.o
drivers/net/ethernet/arc/emac.h +2 -0
index 164b1c7..2bfe8c76 100644
@@ -127,6 +127,8 @@ struct buffer_state {
 struct arc_emac_priv {
 	const char *drv_name;
 	const char *drv_version;
+	void (*set_mac_speed)(void *priv, unsigned int speed);
+
 	/* Devices */
 	struct device *dev;
 	struct phy_device *phy_dev;
drivers/net/ethernet/arc/emac_main.c +2 -0
index b35c69e..a08f343 100644
@@ -48,6 +48,8 @@ static void arc_emac_adjust_link(struct net_device *ndev)
 	if (priv->speed != phy_dev->speed) {
 		priv->speed = phy_dev->speed;
 		state_changed = 1;
+		if (priv->set_mac_speed)
+			priv->set_mac_speed(priv, priv->speed);
 	}
 
 	if (priv->duplex != phy_dev->duplex) {
drivers/net/ethernet/arc/emac_rockchip.c new file +224 -0

224 lines not on this page · raw message

Signature · 1 line
1.9.1
#1 lore raw

This patch is the continuity of "[PATCH v4,3/3] ethernet: arc: Add support for specific SoC layer device tree bindings", it should be applied after this one.

2014-08-27 8:55 GMT+02:00 Romain Perier <[email protected]>:

Quoted 307 lines

This patch defines a platform glue layer for Rockchip SoCs which support arc-emac driver. It ensures that regulator for the rmii is on before trying to connect to the ethernet controller. It applies right speed and mode changes to the grf when ethernet settings change.

---
 drivers/net/ethernet/arc/Kconfig         |  15 +++
 drivers/net/ethernet/arc/Makefile        |   1 +
 drivers/net/ethernet/arc/emac.h          |   2 +
 drivers/net/ethernet/arc/emac_main.c     |   2 +
 drivers/net/ethernet/arc/emac_rockchip.c | 224 +++++++++++++++++++++++++++++++
 5 files changed, 244 insertions(+)
 create mode 100644 drivers/net/ethernet/arc/emac_rockchip.c
drivers/net/ethernet/arc/Kconfig +15 -0
index 89e04fd..6d96a82 100644
@@ -32,4 +32,19 @@ config ARC_EMAC
          non-standard on-chip ethernet device ARC EMAC 10/100 is used.
          Say Y here if you have such a board.  If unsure, say N.
 
+config EMAC_ROCKCHIP
+       tristate "Rockchip EMAC support"
+       select ARC_EMAC_CORE
+       depends on OF_IRQ
+       depends on OF_NET
+       depends on ARCH_ROCKCHIP
+       depends on REGULATOR_ACT8865
+       depends on SMSC_PHY
+       depends on MFD_SYSCON
+       ---help---
+         Support for Rockchip RK3066/RK3188 EMAC ethernet controllers.
+         This selects Rockchip SoC glue layer support for the
+         emac device driver. This driver is used for RK3066/RK3188
+         EMAC ethernet controller.
+
 endif # NET_VENDOR_ARC
drivers/net/ethernet/arc/Makefile +1 -0
index 241bb80..79108af 100644
@@ -5,3 +5,4 @@
 arc_emac-objs := emac_main.o emac_mdio.o
 obj-$(CONFIG_ARC_EMAC_CORE) += arc_emac.o
 obj-$(CONFIG_ARC_EMAC) += emac_arc.o
+obj-$(CONFIG_EMAC_ROCKCHIP) += emac_rockchip.o
drivers/net/ethernet/arc/emac.h +2 -0
index 164b1c7..2bfe8c76 100644
@@ -127,6 +127,8 @@ struct buffer_state {
 struct arc_emac_priv {
        const char *drv_name;
        const char *drv_version;
+       void (*set_mac_speed)(void *priv, unsigned int speed);
+
        /* Devices */
        struct device *dev;
        struct phy_device *phy_dev;
drivers/net/ethernet/arc/emac_main.c +2 -0
index b35c69e..a08f343 100644
@@ -48,6 +48,8 @@ static void arc_emac_adjust_link(struct net_device *ndev)
        if (priv->speed != phy_dev->speed) {
                priv->speed = phy_dev->speed;
                state_changed = 1;
+               if (priv->set_mac_speed)
+                       priv->set_mac_speed(priv, priv->speed);
        }
 
        if (priv->duplex != phy_dev->duplex) {
drivers/net/ethernet/arc/emac_rockchip.c new file +224 -1
new file mode 100644
index 0000000..ff1a657
@@ -0,0 +1,224 @@
+/**
+ * emac-rockchip.c - Rockchip EMAC specific glue layer
+ *
+ * Copyright (C) 2014 Romain Perier
+ *
+ * Romain Perier  <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/etherdevice.h>
+#include <linux/mfd/syscon.h>
+#include <linux/module.h>
+#include <linux/of_net.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/regulator/consumer.h>
+
+#include "emac.h"
+
+#define DRV_NAME        "rockchip_emac"
+#define DRV_VERSION     "1.0"
+
+#define GRF_MODE_MII   BIT(0)
+#define GRF_MODE_RMII  0x0
+#define GRF_SPEED_10M  0x0
+#define GRF_SPEED_100M BIT(1)
+
+struct emac_rockchip_soc_data {
+       int grf_offset;
+};
+
+struct rockchip_priv_data {
+       struct arc_emac_priv emac;
+       struct regmap *grf;
+       struct emac_rockchip_soc_data *soc_data;
+       struct regulator *regulator;
+       struct clk *refclk;
+};
+
+static const struct of_device_id emac_rockchip_dt_ids[];
+
+static void emac_rockchip_set_mac_speed(void *priv, unsigned int speed)
+{
+       struct rockchip_priv_data *emac = priv;
+       u32 data;
+       int err = 0;
+
+       /* write-enable bits */
+       data = BIT(17);
+
+       switch(speed) {
+       case 10:
+               data |= GRF_SPEED_10M;
+               break;
+       case 100:
+               data |= GRF_SPEED_100M;
+               break;
+       default:
+               pr_err("speed %u not supported\n", speed);
+               return;
+       }
+
+       err = regmap_write(emac->grf, emac->soc_data->grf_offset, data);
+       if (err)
+               pr_err("unable to apply speed %u to grf (%d)\n", speed, err);
+}
+
+static int emac_rockchip_probe(struct platform_device *pdev)
+{
+       struct device *dev = &pdev->dev;
+       struct net_device *ndev;
+       struct rockchip_priv_data *priv;
+       const struct of_device_id *match;
+       u32 data, rate;
+       int err, interface;
+
+       if (!pdev->dev.of_node)
+               return -ENODEV;
+
+       ndev = alloc_etherdev(sizeof(struct rockchip_priv_data));
+       if (!ndev)
+               return -ENOMEM;
+       platform_set_drvdata(pdev, ndev);
+       SET_NETDEV_DEV(ndev, dev);
+
+       priv = netdev_priv(ndev);
+       priv->emac.drv_name = DRV_NAME;
+       priv->emac.drv_version = DRV_VERSION;
+       priv->emac.set_mac_speed = emac_rockchip_set_mac_speed;
+
+       interface = of_get_phy_mode(dev->of_node);
+
+       /* RK3066 and RK3188 SoCs only support RMII */
+       if (interface != PHY_INTERFACE_MODE_RMII) {
+               dev_err(dev, "unsupported phy interface mode %d\n", interface);
+               err = -ENOTSUPP;
+               goto out_netdev;
+       }
+
+       priv->grf = syscon_regmap_lookup_by_phandle(dev->of_node, "rockchip,grf");
+       if (IS_ERR(priv->grf)) {
+               dev_err(dev, "failed to retrieve global register file from the device tree (%ld)\n", PTR_ERR(priv->grf));
+               err = PTR_ERR(priv->grf);
+               goto out_netdev;
+       }
+
+       match = of_match_node(emac_rockchip_dt_ids, dev->of_node);
+       priv->soc_data = (struct emac_rockchip_soc_data *)match->data;
+
+       priv->emac.clk = devm_clk_get(dev, "hclk");
+       if (IS_ERR(priv->emac.clk)) {
+               dev_err(dev, "failed to retrieve host clock from device tree (%ld)\n", PTR_ERR(priv->emac.clk));
+               err = PTR_ERR(priv->emac.clk);
+               goto out_netdev;
+       }
+
+       priv->refclk = devm_clk_get(dev, "macref");
+       if (IS_ERR(priv->refclk)) {
+               dev_err(dev, "failed to retrieve reference clock from device tree (%ld)\n", PTR_ERR(priv->refclk));
+               err = PTR_ERR(priv->refclk);
+               goto out_netdev;
+       }
+
+       err = clk_prepare_enable(priv->refclk);
+       if (err) {
+               dev_err(dev, "failed to enable reference clock (%d)\n", err);
+               goto out_netdev;
+       }
+
+        /* Optional regulator for PHY */
+       priv->regulator = devm_regulator_get_optional(dev, "phy");
+       if (IS_ERR(priv->regulator)) {
+               if (PTR_ERR(priv->regulator) == -EPROBE_DEFER)
+                       return -EPROBE_DEFER;
+               dev_err(dev, "no regulator found\n");
+               priv->regulator = NULL;
+       }
+
+       if (priv->regulator) {
+               err = regulator_enable(priv->regulator);
+               if (err) {
+                       dev_err(dev, "failed to enable phy-supply (%d)\n", err);
+                       goto out_netdev;
+               }
+       }
+
+       err = arc_emac_probe(ndev, interface);
+       if (err)
+               goto out_netdev;
+
+       /* write-enable bits */
+       data = BIT(16) | BIT(17);
+
+       data |= GRF_SPEED_100M;
+       data |= GRF_MODE_RMII;
+       rate = 50000000;
+
+       err = regmap_write(priv->grf, priv->soc_data->grf_offset, data);
+       if (err) {
+               dev_err(dev, "unable to apply initial settings to grf (%d)\n", err);
+               goto out_netdev;
+       }
+
+       err = clk_set_rate(priv->refclk, rate);
+       if (err)
+               dev_err(dev, "failed to change reference clock rate (%d)\n", err);
+
+out_netdev:
+       if (err)
+               free_netdev(ndev);
+       return err;
+}
+
+static int emac_rockchip_remove(struct platform_device *pdev)
+{
+       struct net_device *ndev = platform_get_drvdata(pdev);
+       struct rockchip_priv_data *priv = netdev_priv(ndev);
+       int err;
+
+       clk_disable_unprepare(priv->refclk);
+
+       if (priv->regulator)
+               regulator_disable(priv->regulator);
+       err = arc_emac_remove(ndev);
+       free_netdev(ndev);
+       return err;
+}
+
+static const struct emac_rockchip_soc_data emac_rockchip_dt_data[] = {
+       { .grf_offset = 0x154 }, /* rk3066 */
+       { .grf_offset = 0x0a4 }, /* rk3188 */
+};
+
+static const struct of_device_id emac_rockchip_dt_ids[] = {
+       { .compatible = "rockchip,rk3066-emac", .data = (void *)&emac_rockchip_dt_data[0]},
+       { .compatible = "rockchip,rk3188-emac", .data = (void *)&emac_rockchip_dt_data[1]},
+       { /* Sentinel */ }
+};
+
+MODULE_DEVICE_TABLE(of, emac_rockchip_dt_ids);
+
+static struct platform_driver emac_rockchip_driver = {
+       .probe = emac_rockchip_probe,
+       .remove = emac_rockchip_remove,
+       .driver = {
+               .name = DRV_NAME,
+               .of_match_table  = emac_rockchip_dt_ids,
+       },
+};
+
+module_platform_driver(emac_rockchip_driver);
+
+MODULE_AUTHOR("Romain Perier <[email protected]>");
+MODULE_DESCRIPTION("Rockchip EMAC platform driver");
+MODULE_LICENSE("GPL");
--

1.9.1

#2 lore raw
In reply to Romain Perier
Quoted 22 lines · On Wednesday 27 August 2014 06:55:27 Romain Perier wrote:

This patch defines a platform glue layer for Rockchip SoCs which support arc-emac driver. It ensures that regulator for the rmii is on before trying to connect to the ethernet controller. It applies right speed and mode changes to the grf when ethernet settings change.

---
 drivers/net/ethernet/arc/Kconfig         |  15 +++
 drivers/net/ethernet/arc/Makefile        |   1 +
 drivers/net/ethernet/arc/emac.h          |   2 +
 drivers/net/ethernet/arc/emac_main.c     |   2 +
 drivers/net/ethernet/arc/emac_rockchip.c | 224 +++++++++++++++++++++++++++++++
 5 files changed, 244 insertions(+)
 create mode 100644 drivers/net/ethernet/arc/emac_rockchip.c
drivers/net/ethernet/arc/Kconfig +0 -0
index 89e04fd..6d96a82 100644
@@ -32,4 +32,19 @@ config ARC_EMAC
 	  non-standard on-chip ethernet device ARC EMAC 10/100 is used.
 	  Say Y here if you have such a board.  If unsure, say N.

drivers/net/ethernet/arc/Kconfig config ARC_EMAC · line 43

Quoted 10 lines
drivers/net/ethernet/arc/Kconfig +9 -0
 
+config EMAC_ROCKCHIP
+       tristate "Rockchip EMAC support"
+       select ARC_EMAC_CORE
+       depends on OF_IRQ
+       depends on OF_NET
+       depends on ARCH_ROCKCHIP
+       depends on REGULATOR_ACT8865
+       depends on SMSC_PHY
+       depends on MFD_SYSCON

You should generally not add 'depends on' for specific drivers out of a subsystems. Just list the build-time dependencies, like

	depends on OF_IRQ && OF_NET && PHYLIB && REGULATOR && MFD_SYSCON

You can add the ARCH_ROCKCHIPS part if you think that's valuable, but add an '|| COMPILE_TEST' so it's possible to still build it elsewhere.

drivers/net/ethernet/arc/Kconfig config ARC_EMAC · line 47

Quoted 4 lines
drivers/net/ethernet/arc/Kconfig +4 -0
+#define GRF_MODE_MII   BIT(0)
+#define GRF_MODE_RMII  0x0
+#define GRF_SPEED_10M  0x0
+#define GRF_SPEED_100M BIT(1)

Just use 0x... for consistency for all of these.

drivers/net/ethernet/arc/Kconfig config ARC_EMAC · line 48

Quoted 1 line
drivers/net/ethernet/arc/Kconfig +1 -0
+static const struct of_device_id emac_rockchip_dt_ids[];

Can you rearrange it to avoid the forward declaration?

drivers/net/ethernet/arc/Kconfig config ARC_EMAC · line 49

Quoted 1 line
drivers/net/ethernet/arc/Kconfig +1 -0
+       priv->soc_data = (struct emac_rockchip_soc_data *)match->data;

This cast turns a 'const' pointer into a non-const pointer, which is bad. Mark the soc_data pointer as const as well so you can remove the cast here.

drivers/net/ethernet/arc/Kconfig config ARC_EMAC

Quoted 5 lines
drivers/net/ethernet/arc/Kconfig +5 -0
+	/* write-enable bits */
+	data = BIT(16) | BIT(17);
+
+	data |= GRF_SPEED_100M;
+	data |= GRF_MODE_RMII;

If you have macros for some bits, you should have them for all of them.

drivers/net/ethernet/arc/Kconfig

Quoted 1 line
drivers/net/ethernet/arc/Kconfig +1 -0
+	rate = 50000000;

Where does this number come from?

drivers/net/ethernet/arc/Kconfig

Quoted 5 lines
drivers/net/ethernet/arc/Kconfig +5 -0
+static const struct of_device_id emac_rockchip_dt_ids[] = {
+	{ .compatible = "rockchip,rk3066-emac", .data = (void *)&emac_rockchip_dt_data[0]},
+	{ .compatible = "rockchip,rk3188-emac", .data = (void *)&emac_rockchip_dt_data[1]},
+	{ /* Sentinel */ }
+};

This cast is harmless, but I'd remove it as well.

Arnd

maintainer
#3 lore raw

Am Mittwoch, 27. August 2014, 22:11:29 schrieb Arnd Bergmann:

Quoted 39 lines · On Wednesday 27 August 2014 06:55:27 Romain Perier wrote:
Quoted 24 lines

This patch defines a platform glue layer for Rockchip SoCs which support arc-emac driver. It ensures that regulator for the rmii is on before trying to connect to the ethernet controller. It applies right speed and mode changes to the grf when ethernet settings change.

---

 drivers/net/ethernet/arc/Kconfig         |  15 +++
 drivers/net/ethernet/arc/Makefile        |   1 +
 drivers/net/ethernet/arc/emac.h          |   2 +
 drivers/net/ethernet/arc/emac_main.c     |   2 +
 drivers/net/ethernet/arc/emac_rockchip.c | 224
 +++++++++++++++++++++++++++++++ 5 files changed, 244 insertions(+)
 create mode 100644 drivers/net/ethernet/arc/emac_rockchip.c
(quoted diff) +0 -0

b/drivers/net/ethernet/arc/Kconfig index 89e04fd..6d96a82 100644

drivers/net/ethernet/arc/Kconfig +0 -0
@@ -32,4 +32,19 @@ config ARC_EMAC
 
 	  non-standard on-chip ethernet device ARC EMAC 10/100 is used.
 	  Say Y here if you have such a board.  If unsure, say N.

drivers/net/ethernet/arc/Kconfig config ARC_EMAC · line 44

Quoted 10 lines
drivers/net/ethernet/arc/Kconfig +9 -0
 
+config EMAC_ROCKCHIP
+       tristate "Rockchip EMAC support"
+       select ARC_EMAC_CORE
+       depends on OF_IRQ
+       depends on OF_NET
+       depends on ARCH_ROCKCHIP
+       depends on REGULATOR_ACT8865
+       depends on SMSC_PHY
+       depends on MFD_SYSCON

You should generally not add 'depends on' for specific drivers out of a subsystems. Just list the build-time dependencies, like

Quoted 1 line
	depends on OF_IRQ && OF_NET && PHYLIB && REGULATOR && MFD_SYSCON

in this case even MFD_SYSCON can go away, as the syscon functions provide stubs for !MFD_SYSCON .

[...]

Quoted 3 lines

drivers/net/ethernet/arc/Kconfig config ARC_EMAC · line 45

Quoted 1 line
drivers/net/ethernet/arc/Kconfig +1 -0
+	rate = 50000000;

Where does this number come from?

The RMII interface needs always a rate of 50MHz ... my questions would be why the 50000000 are not in the clk_set_rate directly and need an extra var :-)

Heiko