Commit 76e3d7fa authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'rk3308-gmac' 



Tobias Schramm says:

====================
Add support for RK3308 gmac

The Rockchip RK3308 SoC features an internal gmac. Only the signals
required for RMII are exposed so it is limited to 10/100 Mbit/s operation.
This patchset adds support for it.
I've tested the patchset on a Rock Pi S, works fine.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2d1c5f29 8d1a81f2

Documentation/devicetree/bindings/net/rockchip-dwmac.yaml

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ select: 
          - rockchip,rk3128-gmac

          - rockchip,rk3228-gmac

          - rockchip,rk3288-gmac

          - rockchip,rk3308-gmac

          - rockchip,rk3328-gmac

          - rockchip,rk3366-gmac

          - rockchip,rk3368-gmac
@@ -38,6 +39,7 @@ properties: 
          - rockchip,rk3128-gmac

          - rockchip,rk3228-gmac

          - rockchip,rk3288-gmac

          - rockchip,rk3308-gmac

          - rockchip,rk3328-gmac

          - rockchip,rk3366-gmac

          - rockchip,rk3368-gmac

arch/arm64/boot/dts/rockchip/rk3308.dtsi

+22 −0
Original line number Diff line number Diff line
@@ -637,6 +637,28 @@ nfc: nand-controller@ff4b0000 { 
		status = "disabled";

	};



	gmac: ethernet@ff4e0000 {

		compatible = "rockchip,rk3308-gmac";

		reg = <0x0 0xff4e0000 0x0 0x10000>;

		interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "macirq";

		clocks = <&cru SCLK_MAC>, <&cru SCLK_MAC_RX_TX>,

			 <&cru SCLK_MAC_RX_TX>, <&cru SCLK_MAC_REF>,

			 <&cru SCLK_MAC>, <&cru ACLK_MAC>,

			 <&cru PCLK_MAC>, <&cru SCLK_MAC_RMII>;

		clock-names = "stmmaceth", "mac_clk_rx",

			      "mac_clk_tx", "clk_mac_ref",

			      "clk_mac_refout", "aclk_mac",

			      "pclk_mac", "clk_mac_speed";

		phy-mode = "rmii";

		pinctrl-names = "default";

		pinctrl-0 = <&rmii_pins &mac_refclk_12ma>;

		resets = <&cru SRST_MAC_A>;

		reset-names = "stmmaceth";

		rockchip,grf = <&grf>;

		status = "disabled";

	};



	cru: clock-controller@ff500000 {

		compatible = "rockchip,rk3308-cru";

		reg = <0x0 0xff500000 0x0 0x1000>;

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

+49 −0
Original line number Diff line number Diff line
@@ -482,6 +482,54 @@ static const struct rk_gmac_ops rk3288_ops = { 
	.set_rmii_speed = rk3288_set_rmii_speed,

};



#define RK3308_GRF_MAC_CON0		0x04a0



/* RK3308_GRF_MAC_CON0 */

#define RK3308_GMAC_PHY_INTF_SEL_RMII	(GRF_CLR_BIT(2) | GRF_CLR_BIT(3) | \

					GRF_BIT(4))

#define RK3308_GMAC_FLOW_CTRL		GRF_BIT(3)

#define RK3308_GMAC_FLOW_CTRL_CLR	GRF_CLR_BIT(3)

#define RK3308_GMAC_SPEED_10M		GRF_CLR_BIT(0)

#define RK3308_GMAC_SPEED_100M		GRF_BIT(0)



static void rk3308_set_to_rmii(struct rk_priv_data *bsp_priv)

{

	struct device *dev = &bsp_priv->pdev->dev;



	if (IS_ERR(bsp_priv->grf)) {

		dev_err(dev, "Missing rockchip,grf property\n");

		return;

	}



	regmap_write(bsp_priv->grf, RK3308_GRF_MAC_CON0,

		     RK3308_GMAC_PHY_INTF_SEL_RMII);

}



static void rk3308_set_rmii_speed(struct rk_priv_data *bsp_priv, int speed)

{

	struct device *dev = &bsp_priv->pdev->dev;



	if (IS_ERR(bsp_priv->grf)) {

		dev_err(dev, "Missing rockchip,grf property\n");

		return;

	}



	if (speed == 10) {

		regmap_write(bsp_priv->grf, RK3308_GRF_MAC_CON0,

			     RK3308_GMAC_SPEED_10M);

	} else if (speed == 100) {

		regmap_write(bsp_priv->grf, RK3308_GRF_MAC_CON0,

			     RK3308_GMAC_SPEED_100M);

	} else {

		dev_err(dev, "unknown speed value for RMII! speed=%d", speed);

	}

}



static const struct rk_gmac_ops rk3308_ops = {

	.set_to_rmii = rk3308_set_to_rmii,

	.set_rmii_speed = rk3308_set_rmii_speed,

};



#define RK3328_GRF_MAC_CON0	0x0900

#define RK3328_GRF_MAC_CON1	0x0904

#define RK3328_GRF_MAC_CON2	0x0908
@@ -1477,6 +1525,7 @@ static const struct of_device_id rk_gmac_dwmac_match[] = { 
	{ .compatible = "rockchip,rk3128-gmac", .data = &rk3128_ops },

	{ .compatible = "rockchip,rk3228-gmac", .data = &rk3228_ops },

	{ .compatible = "rockchip,rk3288-gmac", .data = &rk3288_ops },

	{ .compatible = "rockchip,rk3308-gmac", .data = &rk3308_ops },

	{ .compatible = "rockchip,rk3328-gmac", .data = &rk3328_ops },

	{ .compatible = "rockchip,rk3366-gmac", .data = &rk3366_ops },

	{ .compatible = "rockchip,rk3368-gmac", .data = &rk3368_ops },