Re: [U-Boot] [PATCH v2 07/12] net: gmac_rk3288: Add RK3288 GMAC driver

1 Mar 2016

Hi Sjoerd,
On 28 February 2016 at 14:25, Sjoerd Simons
sjoerd.simons@collabora.co.uk wrote:
...
Add a new driver for the GMAC ethernet interface present in Rockchip
RK3288 SOCs. This driver subclasses the generic design-ware driver to
add the glue needed specifically for Rockchip.
Signed-off-by: Sjoerd Simons sjoerd.simons@collabora.co.uk

Changes in v2:

Fix various coding style nits
Adjust to new hook name

drivers/net/Kconfig       |   7 +++
 drivers/net/Makefile      |   1 +
 drivers/net/gmac_rk3288.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 133 insertions(+)
 create mode 100644 drivers/net/gmac_rk3288.c

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index bc2f51d..fa49856 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -133,4 +133,11 @@ config PIC32_ETH
          This driver implements 10/100 Mbps Ethernet and MAC layer for
          Microchip PIC32 microcontrollers.
+config GMAC_RK3288

  bool "Rockchip RK3288 Synopsys Designware Ethernet MAC"


  depends on DM_ETH && ETH_DESIGNWARE


  help


    This driver provides Rockchip RK3288 network support based on the


    Synopsys Designware driver.




endif # NETDEVICES
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 33a81ee..d0a8009 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -32,6 +32,7 @@ obj-$(CONFIG_FTGMAC100) += ftgmac100.o
 obj-$(CONFIG_FTMAC110) += ftmac110.o
 obj-$(CONFIG_FTMAC100) += ftmac100.o
 obj-$(CONFIG_GRETH) += greth.o
+obj-$(CONFIG_GMAC_RK3288) += gmac_rk3288.o
 obj-$(CONFIG_DRIVER_TI_KEYSTONE_NET) += keystone_net.o
 obj-$(CONFIG_KS8851_MLL) += ks8851_mll.o
 obj-$(CONFIG_LAN91C96) += lan91c96.o
diff --git a/drivers/net/gmac_rk3288.c b/drivers/net/gmac_rk3288.c
new file mode 100644
index 0000000..5400b2c
--- /dev/null
+++ b/drivers/net/gmac_rk3288.c
@@ -0,0 +1,125 @@
+/*


(C) Copyright 2015 Sjoerd Simons sjoerd.simons@collabora.co.uk







SPDX-License-Identifier:    GPL-2.0+


*/


+/* * Rockchip GMAC ethernet IP driver for U-Boot */
/* Rockchip...
...
+#include <common.h>
+#include <dm.h>
+#include <dm/pinctrl.h>
+#include <asm/gpio.h>
+#include <clk.h>
+#include <phy.h>
+#include <syscon.h>
+#include <asm/io.h>
+#include <asm/arch/periph.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/grf_rk3288.h>
+#include "designware.h"
+#include <dt-bindings/clock/rk3288-cru.h>
Can you sort these?
http://www.denx.de/wiki/U-Boot/CodingStyle
...



+DECLARE_GLOBAL_DATA_PTR;



+struct gmac_rk3288_platdata {

  struct dw_eth_pdata dw_eth_pdata;


  int tx_delay;


  int rx_delay;



+};



+static int gmac_rk3288_ofdata_to_platdata(struct udevice *dev)
+{

  struct gmac_rk3288_platdata *pdata = dev_get_platdata(dev);



  pdata->tx_delay = fdtdec_get_int(gd->fdt_blob, dev->of_offset,


                                   "tx_delay", 0x30);


  pdata->rx_delay = fdtdec_get_int(gd->fdt_blob, dev->of_offset,


                                   "rx_delay", 0x10);



  return designware_eth_ofdata_to_platdata(dev);



+}



+static int gmac_rk3288_fix_mac_speed(struct dw_eth_dev *priv)
+{

  struct rk3288_grf *grf;


  int clk;



  switch (priv->phydev->speed) {


  case 10:


          clk = GMAC_CLK_SEL_2_5M;


          break;


  case 100:


          clk = GMAC_CLK_SEL_25M;


          break;


  case 1000:


          clk = GMAC_CLK_SEL_125M;


          break;


  default:


          printf("Unknown phy speed: %d\n", priv->phydev->speed);


          return -EINVAL;


  }



  grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF);



  rk_clrsetreg(&grf->soc_con1,


               GMAC_CLK_SEL_MASK << GMAC_CLK_SEL_SHIFT,


               clk << GMAC_CLK_SEL_SHIFT);



  return 0;



+}



+static int gmac_rk3288_probe(struct udevice *dev)
+{

  int ret;


  struct gmac_rk3288_platdata *pdata = dev_get_platdata(dev);


  struct dw_eth_dev *priv = dev_get_priv(dev);


  struct rk3288_grf *grf;


  struct udevice *clk;





Remove extra blank line
...

  ret = uclass_get_device(UCLASS_CLK, CLK_GENERAL, &clk);


  if (ret)


          return ret;



Can you use clk_get_by_index() ?
...


  ret = clk_set_periph_rate(clk, SCLK_MAC, 0);


  if (ret)


          return ret;



  /* Set to RGMII mode */


  grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF);


  rk_clrsetreg(&grf->soc_con1,


               RMII_MODE_MASK << RMII_MODE_SHIFT |


               GMAC_PHY_INTF_SEL_MASK << GMAC_PHY_INTF_SEL_SHIFT,


               GMAC_PHY_INTF_SEL_RGMII << GMAC_PHY_INTF_SEL_SHIFT);



  rk_clrsetreg(&grf->soc_con3,


               RXCLK_DLY_ENA_GMAC_MASK <<  RXCLK_DLY_ENA_GMAC_SHIFT |


               TXCLK_DLY_ENA_GMAC_MASK <<  TXCLK_DLY_ENA_GMAC_SHIFT |


               CLK_RX_DL_CFG_GMAC_MASK <<  CLK_RX_DL_CFG_GMAC_SHIFT |


               CLK_TX_DL_CFG_GMAC_MASK <<  CLK_TX_DL_CFG_GMAC_SHIFT,


               RXCLK_DLY_ENA_GMAC_ENABLE << RXCLK_DLY_ENA_GMAC_SHIFT |


               TXCLK_DLY_ENA_GMAC_ENABLE << TXCLK_DLY_ENA_GMAC_SHIFT |


               pdata->rx_delay << CLK_RX_DL_CFG_GMAC_SHIFT |


               pdata->tx_delay << CLK_TX_DL_CFG_GMAC_SHIFT);



  priv->fix_mac_speed = gmac_rk3288_fix_mac_speed;



  return designware_eth_probe(dev);



This presumably called gmac_rk3288_fix_mac_speed(). Is it possible to
split the init so that you can call gmac_rk3288_fix_mac_speed()
directly here?
...
+}



+static const struct udevice_id rk3288_gmac_ids[] = {

  { .compatible = "rockchip,rk3288-gmac" },


  { }



+};



+U_BOOT_DRIVER(eth_gmac_rk3288) = {

  .name   = "gmac_rk3288",


  .id     = UCLASS_ETH,


  .of_match = rk3288_gmac_ids,


  .ofdata_to_platdata = gmac_rk3288_ofdata_to_platdata,


  .probe  = gmac_rk3288_probe,


  .ops    = &designware_eth_ops,


  .priv_auto_alloc_size = sizeof(struct dw_eth_dev),


  .platdata_auto_alloc_size = sizeof(struct gmac_rk3288_platdata),


  .flags = DM_FLAG_ALLOC_PRIV_DMA,



+};
2.7.0
Regards,
Simon

    

Re: [U-Boot] [PATCH v2 07/12] net: gmac_rk3288: Add RK3288 GMAC driver

Simon Glass

+};