UPSTREAM: net: ethernet: arc: Add support emac for RK3036

The RK3036's GRFs offset are different with RK3066/RK3188, and need to set
mac TX/RX clock before probe emac.

Change-Id: Ie1dd5412c1858f7db007a06122f055790fa6fe2f
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
(cherry picked from git.kernel.org next/linux-next.git master
 commit af72261f33ee4958bb53e299746014f44e1134c4)

diff --git a/drivers/net/ethernet/arc/Kconfig b/drivers/net/ethernet/arc/Kconfig
index 52a6b16f57d206737ae82c5a1346d96feec675ae..689045186064a117c81d420d014a6ab1857f3330 100644 (file)
--- a/drivers/net/ethernet/arc/Kconfig
+++ b/drivers/net/ethernet/arc/Kconfig
@@ -34,9 +34,9 @@ config EMAC_ROCKCHIP
        select ARC_EMAC_CORE
        depends on OF_IRQ && OF_NET && REGULATOR && HAS_DMA
        ---help---
-         Support for Rockchip RK3066/RK3188 EMAC ethernet controllers.
+         Support for Rockchip RK3036/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 device driver. This driver is used for RK3036/RK3066/RK3188
          EMAC ethernet controller.
 
 endif # NET_VENDOR_ARC

diff --git a/drivers/net/ethernet/arc/emac_rockchip.c b/drivers/net/ethernet/arc/emac_rockchip.c
index e951c8fab778b0e72e9b98e453d80b498781438c..85e821ccfcd2994ec4ad30297b4b9571980aa8cb 100644 (file)
--- a/drivers/net/ethernet/arc/emac_rockchip.c
+++ b/drivers/net/ethernet/arc/emac_rockchip.c
@@ -67,6 +67,11 @@ static void emac_rockchip_set_mac_speed(void *priv, unsigned int speed)
                pr_err("unable to apply speed %u to grf (%d)\n", speed, err);
 }
 
+static const struct emac_rockchip_soc_data emac_rk3036_emac_data = {
+       .grf_offset = 0x140,   .grf_mode_offset = 8,
+       .grf_speed_offset = 9, .need_div_macclk = 1,
+};
+
 static const struct emac_rockchip_soc_data emac_rk3066_emac_data = {
        .grf_offset = 0x154,   .grf_mode_offset = 0,
        .grf_speed_offset = 1, .need_div_macclk = 0,
@@ -78,6 +83,7 @@ static const struct emac_rockchip_soc_data emac_rk3188_emac_data = {
 };
 
 static const struct of_device_id emac_rockchip_dt_ids[] = {
+       { .compatible = "rockchip,rk3036-emac", .data = &emac_rk3036_emac_data },
        { .compatible = "rockchip,rk3066-emac", .data = &emac_rk3066_emac_data },
        { .compatible = "rockchip,rk3188-emac", .data = &emac_rk3188_emac_data },
        { /* Sentinel */ }
@@ -110,7 +116,7 @@ static int emac_rockchip_probe(struct platform_device *pdev)
 
        interface = of_get_phy_mode(dev->of_node);
 
-       /* RK3066 and RK3188 SoCs only support RMII */
+       /* RK3036/RK3066/RK3188 SoCs only support RMII */
        if (interface != PHY_INTERFACE_MODE_RMII) {
                dev_err(dev, "unsupported phy interface mode %d\n", interface);
                err = -ENOTSUPP;