Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01a9af36 authored by Sriramakrishnan's avatar Sriramakrishnan Committed by Kevin Hilman
Browse files

TI Davinci EMAC : add platform specific interrupt enable/disable logic. 



On certain SOCs, the EMAC controller is interfaced with a wrapper logic
for handling interrupts. This  patch implements a platform
specific hook to cater to platforms that require custom interrupt
handling logic

Signed-off-by: default avatarSriramakrishnan <srk@ti.com>
Acked-by: default avatarChaithrika U S <chaithrika@ti.com>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent 8ee2bf9a

drivers/net/davinci_emac.c

+11 −0
Original line number Diff line number Diff line
@@ -487,6 +487,9 @@ struct emac_priv { 
	struct mii_bus *mii_bus;

	struct phy_device *phydev;

	spinlock_t lock;

	/*platform specific members*/

	void (*int_enable) (void);

	void (*int_disable) (void);

};



/* clock frequency for EMAC */
@@ -1001,6 +1004,8 @@ static void emac_int_disable(struct emac_priv *priv) 
		emac_ctrl_write(EMAC_DM646X_CMRXINTEN, 0x0);

		emac_ctrl_write(EMAC_DM646X_CMTXINTEN, 0x0);

		/* NOTE: Rx Threshold and Misc interrupts are not disabled */

		if (priv->int_disable)

			priv->int_disable();



		local_irq_restore(flags);
@@ -1020,6 +1025,9 @@ static void emac_int_disable(struct emac_priv *priv) 
static void emac_int_enable(struct emac_priv *priv)

{

	if (priv->version == EMAC_VERSION_2) {

		if (priv->int_enable)

			priv->int_enable();



		emac_ctrl_write(EMAC_DM646X_CMRXINTEN, 0xff);

		emac_ctrl_write(EMAC_DM646X_CMTXINTEN, 0xff);
@@ -2659,6 +2667,9 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev) 
	priv->phy_mask = pdata->phy_mask;

	priv->rmii_en = pdata->rmii_en;

	priv->version = pdata->version;

	priv->int_enable = pdata->interrupt_enable;

	priv->int_disable = pdata->interrupt_disable;



	emac_dev = &ndev->dev;

	/* Get EMAC platform data */

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

include/linux/davinci_emac.h

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ struct emac_platform_data { 
	u32 mdio_max_freq;

	u8 rmii_en;

	u8 version;

	void (*interrupt_enable) (void);

	void (*interrupt_disable) (void);

};



enum {