Commit e0c83682 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-phy-move-phy-package-code-to-its-own-source-file' 

Heiner Kallweit says:

====================
net: phy: move PHY package code to its own source file

This series contributes to cleaning up phylib by moving PHY package
related code to its own source file.
====================

Link: https://patch.msgid.link/5c5e60b3-0378-4960-8cf0-07ce0e219c68@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 89b12ca6 a4002849

drivers/net/phy/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ 
# Makefile for Linux PHY drivers



libphy-y			:= phy.o phy-c45.o phy-core.o phy_device.o \

				   linkmode.o phy_link_topology.o

				   linkmode.o phy_link_topology.o \

				   phy_package.o

mdio-bus-y			+= mdio_bus.o mdio_device.o



ifdef CONFIG_MDIO_DEVICE

drivers/net/phy/bcm54140.c

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/module.h>

#include <linux/phy.h>



#include "phylib.h"

#include "bcm-phy-lib.h"



/* RDB per-port registers

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

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

#include <linux/regmap.h>



#include "../phylib.h"

#include "mtk.h"



#define MTK_GPHY_ID_MT7981			0x03a29461
@@ -1278,7 +1279,7 @@ static int mt798x_phy_led_hw_control_set(struct phy_device *phydev, u8 index, 


static bool mt7988_phy_led_get_polarity(struct phy_device *phydev, int led_num)

{

	struct mtk_socphy_shared *priv = phydev->shared->priv;

	struct mtk_socphy_shared *priv = phy_package_get_priv(phydev);

	u32 polarities;



	if (led_num == 0)
@@ -1317,7 +1318,7 @@ static int mt7988_phy_fix_leds_polarities(struct phy_device *phydev) 
static int mt7988_phy_probe_shared(struct phy_device *phydev)

{

	struct device_node *np = dev_of_node(&phydev->mdio.bus->dev);

	struct mtk_socphy_shared *shared = phydev->shared->priv;

	struct mtk_socphy_shared *shared = phy_package_get_priv(phydev);

	struct regmap *regmap;

	u32 reg;

	int ret;
@@ -1368,7 +1369,7 @@ static int mt7988_phy_probe(struct phy_device *phydev) 
			return err;

	}



	shared = phydev->shared->priv;

	shared = phy_package_get_priv(phydev);

	priv = &shared->priv[phydev->mdio.addr];



	phydev->priv = priv;

drivers/net/phy/micrel.c

+5 −4
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ 
#include <linux/net_tstamp.h>

#include <linux/gpio/consumer.h>



#include "phylib.h"



/* Operation Mode Strap Override */

#define MII_KSZPHY_OMSO				0x16

#define KSZPHY_OMSO_FACTORY_TEST		BIT(15)
@@ -2631,8 +2633,7 @@ static void lan8814_ptp_tx_ts_get(struct phy_device *phydev, 
static int lan8814_ts_info(struct mii_timestamper *mii_ts, struct kernel_ethtool_ts_info *info)

{

	struct kszphy_ptp_priv *ptp_priv = container_of(mii_ts, struct kszphy_ptp_priv, mii_ts);

	struct phy_device *phydev = ptp_priv->phydev;

	struct lan8814_shared_priv *shared = phydev->shared->priv;

	struct lan8814_shared_priv *shared = phy_package_get_priv(ptp_priv->phydev);



	info->so_timestamping = SOF_TIMESTAMPING_TX_HARDWARE |

				SOF_TIMESTAMPING_RX_HARDWARE |
@@ -3653,7 +3654,7 @@ static int lan8814_gpio_process_cap(struct lan8814_shared_priv *shared) 


static int lan8814_handle_gpio_interrupt(struct phy_device *phydev, u16 status)

{

	struct lan8814_shared_priv *shared = phydev->shared->priv;

	struct lan8814_shared_priv *shared = phy_package_get_priv(phydev);

	int ret;



	mutex_lock(&shared->shared_lock);
@@ -3864,7 +3865,7 @@ static void lan8814_ptp_init(struct phy_device *phydev) 


static int lan8814_ptp_probe_once(struct phy_device *phydev)

{

	struct lan8814_shared_priv *shared = phydev->shared->priv;

	struct lan8814_shared_priv *shared = phy_package_get_priv(phydev);



	/* Initialise shared lock for clock*/

	mutex_init(&shared->shared_lock);

drivers/net/phy/mscc/mscc_main.c

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#include <linux/of.h>

#include <linux/netdevice.h>

#include <dt-bindings/net/mscc-phy-vsc8531.h>



#include "../phylib.h"

#include "mscc_serdes.h"

#include "mscc.h"