net: stmmac: setup higher frequency clk support for EHL & TGL

EHL DW EQOS is running on a 200MHz clock. Setting up stmmac-clk, ptp clock and ptp_max_adj to 200MHz.

Voon Weifeng committed 7 years ago

Commit 190f73a1 parent f6256583 files · +25 −0Browse files

Unified · Split

3 files

   Author: Giuseppe Cavallaro <peppe.cavallaro@st.com>
 *******************************************************************************/
+#include <linux/clk-provider.h>
 #include <linux/pci.h>
 #include <linux/dmi.h>
 	plat->axi->axi_blen[1] = 8;
 	plat->axi->axi_blen[2] = 16;
+	plat->ptp_max_adj = plat->clk_ptp_rate;
+	/* Set system clock */
+	plat->stmmac_clk = clk_register_fixed_rate(&pdev->dev,
+						   "stmmac-clk", NULL, 0,
+						   plat->clk_ptp_rate);
+	if (IS_ERR(plat->stmmac_clk)) {
+		dev_warn(&pdev->dev, "Fail to register stmmac-clk\n");
+		plat->stmmac_clk = NULL;
+	}
+	clk_prepare_enable(plat->stmmac_clk);
 	/* Set default value for multicast hash bins */
 	plat->multicast_filter_bins = HASH_TABLE_SIZE;
 	plat->rx_queues_to_use = 8;
 	plat->tx_queues_to_use = 8;
+	plat->clk_ptp_rate = 200000000;
 	ret = intel_mgbe_common_data(pdev, plat);
 	if (ret)
 		return ret;
 	plat->rx_queues_to_use = 6;
 	plat->tx_queues_to_use = 4;
+	plat->clk_ptp_rate = 200000000;
 	ret = intel_mgbe_common_data(pdev, plat);
 	if (ret)
 		return ret;
  */
 static void stmmac_pci_remove(struct pci_dev *pdev)
 {
+	struct net_device *ndev = dev_get_drvdata(&pdev->dev);
+	struct stmmac_priv *priv = netdev_priv(ndev);
 	int i;
 	stmmac_dvr_remove(&pdev->dev);
+	if (priv->plat->stmmac_clk)
+		clk_unregister_fixed_rate(priv->plat->stmmac_clk);
 	for (i = 0; i <= PCI_STD_RESOURCE_END; i++) {
 		if (pci_resource_len(pdev, i) == 0)
 			continue;

@@ -194,6 +194,9 @@ void stmmac_ptp_register(struct stmmac_priv *priv) · 193 unmodified lines
194	priv->pps[i].available = true;	194	priv->pps[i].available = true;
195	}	195	}
196		196
		197	if (priv->plat->ptp_max_adj)
		198	stmmac_ptp_clock_ops.max_adj = priv->plat->ptp_max_adj;
		199
197	stmmac_ptp_clock_ops.n_per_out = priv->dma_cap.pps_out_num;	200	stmmac_ptp_clock_ops.n_per_out = priv->dma_cap.pps_out_num;
198		201
199	spin_lock_init(&priv->ptp_lock);	202	spin_lock_init(&priv->ptp_lock);

@@ -168,6 +168,7 @@ struct plat_stmmacenet_data { · 167 unmodified lines
168	struct clk *clk_ptp_ref;	168	struct clk *clk_ptp_ref;
169	unsigned int clk_ptp_rate;	169	unsigned int clk_ptp_rate;
170	unsigned int clk_ref_rate;	170	unsigned int clk_ref_rate;
		171	s32 ptp_max_adj;
171	struct reset_control *stmmac_rst;	172	struct reset_control *stmmac_rst;
172	struct stmmac_axi *axi;	173	struct stmmac_axi *axi;
173	int has_gmac4;	174	int has_gmac4;

Keyboard shortcuts