Commit 3cb1a3c9 authored by SkyLake.Huang's avatar SkyLake.Huang Committed by David S. Miller
Browse files

net: phy: mediatek: Integrate read/write page helper functions 



This patch integrates read/write page helper functions as MTK phy lib.
They are basically the same in mtk-ge.c & mtk-ge-soc.c.

Signed-off-by: default avatarSkyLake.Huang <skylake.huang@mediatek.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 477c200a

drivers/net/phy/mediatek/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ config MTK_NET_PHYLIB 


config MEDIATEK_GE_PHY

	tristate "MediaTek Gigabit Ethernet PHYs"

	select MTK_NET_PHYLIB

	help

	  Supports the MediaTek non-built-in Gigabit Ethernet PHYs.

drivers/net/phy/mediatek/mtk-ge-soc.c

+4 −14
Original line number Diff line number Diff line
@@ -271,16 +271,6 @@ struct mtk_socphy_shared { 
	struct mtk_socphy_priv	priv[4];

};



static int mtk_socphy_read_page(struct phy_device *phydev)

{

	return __phy_read(phydev, MTK_EXT_PAGE_ACCESS);

}



static int mtk_socphy_write_page(struct phy_device *phydev, int page)

{

	return __phy_write(phydev, MTK_EXT_PAGE_ACCESS, page);

}



/* One calibration cycle consists of:

 * 1.Set DA_CALIN_FLAG high to start calibration. Keep it high

 *   until AD_CAL_COMP is ready to output calibration result.
@@ -1337,8 +1327,8 @@ static struct phy_driver mtk_socphy_driver[] = { 
		.probe		= mt7981_phy_probe,

		.suspend	= genphy_suspend,

		.resume		= genphy_resume,

		.read_page	= mtk_socphy_read_page,

		.write_page	= mtk_socphy_write_page,

		.read_page	= mtk_phy_read_page,

		.write_page	= mtk_phy_write_page,

		.led_blink_set	= mt798x_phy_led_blink_set,

		.led_brightness_set = mt798x_phy_led_brightness_set,

		.led_hw_is_supported = mt798x_phy_led_hw_is_supported,
@@ -1354,8 +1344,8 @@ static struct phy_driver mtk_socphy_driver[] = { 
		.probe		= mt7988_phy_probe,

		.suspend	= genphy_suspend,

		.resume		= genphy_resume,

		.read_page	= mtk_socphy_read_page,

		.write_page	= mtk_socphy_write_page,

		.read_page	= mtk_phy_read_page,

		.write_page	= mtk_phy_write_page,

		.led_blink_set	= mt798x_phy_led_blink_set,

		.led_brightness_set = mt798x_phy_led_brightness_set,

		.led_hw_is_supported = mt798x_phy_led_hw_is_supported,

drivers/net/phy/mediatek/mtk-ge.c

+6 −14
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 
#include <linux/module.h>

#include <linux/phy.h>



#include "mtk.h"



#define MTK_EXT_PAGE_ACCESS		0x1f

#define MTK_PHY_PAGE_STANDARD		0x0000

#define MTK_PHY_PAGE_EXTENDED		0x0001
@@ -11,16 +13,6 @@ 
#define MTK_PHY_PAGE_EXTENDED_2A30	0x2a30

#define MTK_PHY_PAGE_EXTENDED_52B5	0x52b5



static int mtk_gephy_read_page(struct phy_device *phydev)

{

	return __phy_read(phydev, MTK_EXT_PAGE_ACCESS);

}



static int mtk_gephy_write_page(struct phy_device *phydev, int page)

{

	return __phy_write(phydev, MTK_EXT_PAGE_ACCESS, page);

}



static void mtk_gephy_config_init(struct phy_device *phydev)

{

	/* Enable HW auto downshift */
@@ -77,8 +69,8 @@ static struct phy_driver mtk_gephy_driver[] = { 
		.handle_interrupt = genphy_handle_interrupt_no_ack,

		.suspend	= genphy_suspend,

		.resume		= genphy_resume,

		.read_page	= mtk_gephy_read_page,

		.write_page	= mtk_gephy_write_page,

		.read_page	= mtk_phy_read_page,

		.write_page	= mtk_phy_write_page,

	},

	{

		PHY_ID_MATCH_EXACT(0x03a29441),
@@ -91,8 +83,8 @@ static struct phy_driver mtk_gephy_driver[] = { 
		.handle_interrupt = genphy_handle_interrupt_no_ack,

		.suspend	= genphy_suspend,

		.resume		= genphy_resume,

		.read_page	= mtk_gephy_read_page,

		.write_page	= mtk_gephy_write_page,

		.read_page	= mtk_phy_read_page,

		.write_page	= mtk_phy_write_page,

	},

};

drivers/net/phy/mediatek/mtk-phy-lib.c

+12 −0
Original line number Diff line number Diff line
@@ -6,6 +6,18 @@ 


#include "mtk.h"



int mtk_phy_read_page(struct phy_device *phydev)

{

	return __phy_read(phydev, MTK_EXT_PAGE_ACCESS);

}

EXPORT_SYMBOL_GPL(mtk_phy_read_page);



int mtk_phy_write_page(struct phy_device *phydev, int page)

{

	return __phy_write(phydev, MTK_EXT_PAGE_ACCESS, page);

}

EXPORT_SYMBOL_GPL(mtk_phy_write_page);



int mtk_phy_led_hw_is_supported(struct phy_device *phydev, u8 index,

				unsigned long rules,

				unsigned long supported_triggers)

drivers/net/phy/mediatek/mtk.h

+3 −0
Original line number Diff line number Diff line
@@ -66,6 +66,9 @@ struct mtk_socphy_priv { 
	unsigned long		led_state;

};



int mtk_phy_read_page(struct phy_device *phydev);

int mtk_phy_write_page(struct phy_device *phydev, int page);



int mtk_phy_led_hw_is_supported(struct phy_device *phydev, u8 index,

				unsigned long rules,

				unsigned long supported_triggers);