Commit be66fcc1 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

net: phy: meson-gxl: reuse functionality of the SMSC PHY driver 



The Amlogic Meson internal PHY's have the same register layout as
certain SMSC PHY's (also for non-c22-standard registers). This seems
to be more than just coincidence. Apparently they also need the same
workaround for EDPD mode (energy detect power down). Therefore let's
reuse SMSC PHY driver functionality in the meson-gxl PHY driver.

Tested with a G12A internal PHY. I don't have GXL test hw,
therefore I replace only the callbacks that are identical in
the SMSC PHY driver.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a69e332b

drivers/net/phy/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ config AMD_PHY 
config MESON_GXL_PHY

	tristate "Amlogic Meson GXL Internal PHY"

	depends on ARCH_MESON || COMPILE_TEST

	select SMSC_PHY

	help

	  Currently has a driver for the Amlogic Meson GXL Internal PHY

drivers/net/phy/meson-gxl.c

+8 −69
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/phy.h>

#include <linux/netdevice.h>

#include <linux/bitfield.h>

#include <linux/smscphy.h>



#define TSTCNTL		20

#define  TSTCNTL_READ		BIT(15)
@@ -23,18 +24,6 @@ 
#define  TSTCNTL_WRITE_ADDRESS	GENMASK(4, 0)

#define TSTREAD1	21

#define TSTWRITE	23

#define INTSRC_FLAG	29

#define  INTSRC_ANEG_PR		BIT(1)

#define  INTSRC_PARALLEL_FAULT	BIT(2)

#define  INTSRC_ANEG_LP_ACK	BIT(3)

#define  INTSRC_LINK_DOWN	BIT(4)

#define  INTSRC_REMOTE_FAULT	BIT(5)

#define  INTSRC_ANEG_COMPLETE	BIT(6)

#define  INTSRC_ENERGY_DETECT	BIT(7)

#define INTSRC_MASK	30



#define INT_SOURCES (INTSRC_LINK_DOWN | INTSRC_ANEG_COMPLETE | \

		     INTSRC_ENERGY_DETECT)



#define BANK_ANALOG_DSP		0

#define BANK_WOL		1
@@ -195,59 +184,6 @@ static int meson_gxl_read_status(struct phy_device *phydev) 
	return genphy_read_status(phydev);

}



static int meson_gxl_ack_interrupt(struct phy_device *phydev)

{

	int ret = phy_read(phydev, INTSRC_FLAG);



	return ret < 0 ? ret : 0;

}



static int meson_gxl_config_intr(struct phy_device *phydev)

{

	int ret;



	if (phydev->interrupts == PHY_INTERRUPT_ENABLED) {

		/* Ack any pending IRQ */

		ret = meson_gxl_ack_interrupt(phydev);

		if (ret)

			return ret;



		ret = phy_write(phydev, INTSRC_MASK, INT_SOURCES);

	} else {

		ret = phy_write(phydev, INTSRC_MASK, 0);



		/* Ack any pending IRQ */

		ret = meson_gxl_ack_interrupt(phydev);

	}



	return ret;

}



static irqreturn_t meson_gxl_handle_interrupt(struct phy_device *phydev)

{

	int irq_status;



	irq_status = phy_read(phydev, INTSRC_FLAG);

	if (irq_status < 0) {

		phy_error(phydev);

		return IRQ_NONE;

	}



	irq_status &= INT_SOURCES;



	if (irq_status == 0)

		return IRQ_NONE;



	/* Aneg-complete interrupt is used for link-up detection */

	if (phydev->autoneg == AUTONEG_ENABLE &&

	    irq_status == INTSRC_ENERGY_DETECT)

		return IRQ_HANDLED;



	phy_trigger_machine(phydev);



	return IRQ_HANDLED;

}



static struct phy_driver meson_gxl_phy[] = {

	{

		PHY_ID_MATCH_EXACT(0x01814400),
@@ -257,8 +193,8 @@ static struct phy_driver meson_gxl_phy[] = { 
		.soft_reset     = genphy_soft_reset,

		.config_init	= meson_gxl_config_init,

		.read_status	= meson_gxl_read_status,

		.config_intr	= meson_gxl_config_intr,

		.handle_interrupt = meson_gxl_handle_interrupt,

		.config_intr	= smsc_phy_config_intr,

		.handle_interrupt = smsc_phy_handle_interrupt,

		.suspend        = genphy_suspend,

		.resume         = genphy_resume,

		.read_mmd	= genphy_read_mmd_unsupported,
@@ -268,9 +204,12 @@ static struct phy_driver meson_gxl_phy[] = { 
		.name		= "Meson G12A Internal PHY",

		/* PHY_BASIC_FEATURES */

		.flags		= PHY_IS_INTERNAL,

		.probe		= smsc_phy_probe,

		.config_init	= smsc_phy_config_init,

		.soft_reset     = genphy_soft_reset,

		.config_intr	= meson_gxl_config_intr,

		.handle_interrupt = meson_gxl_handle_interrupt,

		.read_status	= lan87xx_read_status,

		.config_intr	= smsc_phy_config_intr,

		.handle_interrupt = smsc_phy_handle_interrupt,

		.suspend        = genphy_suspend,

		.resume         = genphy_resume,

		.read_mmd	= genphy_read_mmd_unsupported,