Merge "msm: emac: Add pinctrl support to emac driver" (cf3d6f99) · Commits · e / devices / android_kernel_xiaomi_markw

Documentation/devicetree/bindings/net/msm-emac.txt

+22 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,8 @@ Optional properties:
		table entry, the first field indicates the RTC
		reference clock rate. The second field indicates
		the number of adjustment in 2 ^ -26 ns.
		Example:

		Example1:
		emac0: qcom,emac@feb20000 {
		cell-index = <0>;
		compatible = "qcom,emac";
		@@ -75,3 +76,23 @@ Example:
		phy-mode = "sgmii";
		phy-addr = <0>;
		};

		Example2:
		emac0: qcom,emac@7c40000 {
		cell-index = <0>;
		compatible = "qcom,emac";
		reg-names = "emac", "emac_csr", "emac_1588", "emac_sgmii";
		reg = <0x7c40000 0x10000>,
		<0x7c56000 0x1000>,
		<0x7c5C000 0x4000>,
		<0x7c58000 0x400>;
		interrupts = <0 76 0>, <0 80 0>;
		interrupt-names = "emac_core0_irq", "emac_sgmii_irq";
		pinctrl-names = "emac_active", "emac_sleep";
		pinctrl-0 = <&emac0_active &emac0_irq_active &emac0_rst_active>;
		pinctrl-1 = <&emac0_sleep &emac0_irq_sleep &emac0_rst_sleep>;
		qcom,emac-tstamp-en;
		qcom,emac-ptp-frac-ns-adj = <125000000 1>;
		phy-mode = "sgmii";
		phy-addr = <0>;
		};

drivers/net/ethernet/qualcomm/emac/emac.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -745,6 +745,11 @@ struct emac_adapter {
		u32 wol;
		u16 msg_enable;
		unsigned long flags;
		struct pinctrl *pinctrl;
		struct pinctrl_state *pins_active;
		struct pinctrl_state *pins_sleep;
		int (gpio_on)(struct emac_adapter adpt);
		int (gpio_off)(struct emac_adapter adpt);
		};

		static inline struct emac_adapter emac_hw_get_adap(struct emac_hw hw)

drivers/net/ethernet/qualcomm/emac/emac_main.c

+99 −18

Original line number	Diff line number	Diff line
		@@ -62,6 +62,9 @@ const char emac_drv_version[] = DRV_VERSION;

		#define EMAC_SKB_CB(skb) ((struct emac_skb_cb *)(skb)->cb)

		#define EMAC_PINCTRL_STATE_ACTIVE "emac_active"
		#define EMAC_PINCTRL_STATE_SLEEP "emac_sleep"

		struct emac_skb_cb {
		u32 tpd_idx;
		unsigned long jiffies;
		@@ -1572,6 +1575,58 @@ static int emac_change_mtu(struct net_device *netdev, int new_mtu)
		return 0;
		}

		static inline int msm_emac_request_gpio_on(struct emac_adapter *adpt)
		{
		int i = 0;
		int result = 0;

		for (i = 0; (!adpt->no_mdio_gpio) && i < EMAC_GPIO_CNT; i++) {
		result = gpio_request(adpt->gpio[i], emac_gpio_name[i]);
		if (result) {
		emac_err(adpt, "error:%d on gpio_request(%d:%s)\n",
		result, adpt->gpio[i],
		emac_gpio_name[i]);
		while (--i >= 0)
		gpio_free(adpt->gpio[i]);
		goto error;
		}
		}
		return 0;
		error:
		return result;
		}

		static inline int msm_emac_request_gpio_off(struct emac_adapter *adpt)
		{
		int i = 0;

		for (i = 0; (!adpt->no_mdio_gpio) && i < EMAC_GPIO_CNT; i++)
		gpio_free(adpt->gpio[i]);
		return 0;
		}

		static inline int msm_emac_request_pinctrl_on(struct emac_adapter *adpt)
		{
		int result = 0;

		result = pinctrl_select_state(adpt->pinctrl, adpt->pins_active);
		if (result)
		emac_err(adpt, "error:%d Can not set %s pins\n",
		result, EMAC_PINCTRL_STATE_ACTIVE);
		return result;
		}

		static inline int msm_emac_request_pinctrl_off(struct emac_adapter *adpt)
		{
		int result = 0;

		result = pinctrl_select_state(adpt->pinctrl, adpt->pins_sleep);
		if (result)
		emac_err(adpt, "error:%d Can not set %s pins\n",
		result, EMAC_PINCTRL_STATE_SLEEP);
		return result;
		}

		/* Bringup the interface/HW */
		int emac_up(struct emac_adapter *adpt)
		{
		@@ -1590,16 +1645,9 @@ int emac_up(struct emac_adapter *adpt)
		if (retval)
		return retval;

		for (i = 0; (!adpt->no_mdio_gpio) && i < EMAC_GPIO_CNT; i++) {
		retval = gpio_request(adpt->gpio[i], emac_gpio_name[i]);
		if (retval) {
		emac_err(adpt, "error:%d on gpio_request(%d:%s)\n",
		retval, adpt->gpio[i], emac_gpio_name[i]);
		while (--i >= 0)
		gpio_free(adpt->gpio[i]);
		retval = adpt->gpio_on(adpt);
		if (retval < 0)
		goto err_request_gpio;
		}
		}

		for (i = 0; i < EMAC_IRQ_CNT; i++) {
		struct emac_irq_per_dev *irq = &adpt->irq[i];
		@@ -1669,8 +1717,7 @@ void emac_down(struct emac_adapter *adpt, u32 ctrl)
		if (adpt->irq[i].irq)
		free_irq(adpt->irq[i].irq, &adpt->irq[i]);

		for (i = 0; (!adpt->no_mdio_gpio) && i < EMAC_GPIO_CNT; i++)
		gpio_free(adpt->gpio[i]);
		adpt->gpio_off(adpt);

		CLR_FLAG(adpt, ADPT_TASK_LSC_REQ);
		CLR_FLAG(adpt, ADPT_TASK_REINIT_REQ);
		@@ -2470,6 +2517,33 @@ static void emac_disable_clks(struct emac_adapter *adpt)
		}
		}

		static int msm_emac_pinctrl_init(struct emac_adapter adpt, struct device dev)
		{
		adpt->pinctrl = devm_pinctrl_get(dev);
		if (IS_ERR_OR_NULL(adpt->pinctrl)) {
		emac_dbg(adpt, probe, "error:%ld Failed to get pin ctrl\n",
		PTR_ERR(adpt->pinctrl));
		return PTR_ERR(adpt->pinctrl);
		}
		adpt->pins_active = pinctrl_lookup_state(adpt->pinctrl,
		EMAC_PINCTRL_STATE_ACTIVE);
		if (IS_ERR_OR_NULL(adpt->pins_active)) {
		emac_dbg(adpt, probe, "error:%ld Failed to lookup pinctrl active state\n",
		PTR_ERR(adpt->pins_active));
		return PTR_ERR(adpt->pins_active);
		}

		adpt->pins_sleep = pinctrl_lookup_state(adpt->pinctrl,
		EMAC_PINCTRL_STATE_SLEEP);
		if (IS_ERR_OR_NULL(adpt->pins_sleep)) {
		emac_dbg(adpt, probe, "error:%ld Failed to lookup pinctrl sleep state\n",
		PTR_ERR(adpt->pins_sleep));
		return PTR_ERR(adpt->pins_sleep);
		}

		return 0;
		}

		/* Get the resources */
		static int emac_get_resources(struct platform_device *pdev,
		struct emac_adapter *adpt)
		@@ -2494,7 +2568,11 @@ static int emac_get_resources(struct platform_device *pdev,
		/* get time stamp enable flag */
		adpt->tstamp_en = of_property_read_bool(node, "qcom,emac-tstamp-en");

		/* get gpios */
		retval = msm_emac_pinctrl_init(adpt, &pdev->dev);
		if (!retval) {
		adpt->gpio_on = msm_emac_request_pinctrl_on;
		adpt->gpio_off = msm_emac_request_pinctrl_off;
		} else {
		for (i = 0; (!adpt->no_mdio_gpio) && i < EMAC_GPIO_CNT; i++) {
		retval = of_get_named_gpio(node, emac_gpio_name[i], 0);
		if (retval < 0)
		@@ -2502,6 +2580,9 @@ static int emac_get_resources(struct platform_device *pdev,

		adpt->gpio[i] = retval;
		}
		adpt->gpio_on = msm_emac_request_gpio_on;
		adpt->gpio_off = msm_emac_request_gpio_off;
		}

		/* get mac address */
		maddr = of_get_mac_address(node);