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

Merge branch 'net-phy-realtek-add-hwmon-support' 

Heiner Kallweit says:

====================
net: phy: realtek: add hwmon support

This adds hwmon support for the temperature sensor on RTL822x.
It's available on the standalone versions of the PHY's, and on the
internal PHY's of RTL8125B(P)/RTL8125D/RTL8126.
====================

Link: https://patch.msgid.link/7319d8f9-2d6f-4522-92e8-a8a4990042fb@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents b56e4d66 33700ca4

drivers/net/phy/Kconfig

+1 −4
Original line number Diff line number Diff line
@@ -350,10 +350,7 @@ config QSEMI_PHY 
	help

	  Currently supports the qs6612



config REALTEK_PHY

	tristate "Realtek PHYs"

	help

	  Supports the Realtek 821x PHY.

source "drivers/net/phy/realtek/Kconfig"



config RENESAS_PHY

	tristate "Renesas PHYs"

drivers/net/phy/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ obj-$(CONFIG_NXP_CBTX_PHY) += nxp-cbtx.o 
obj-$(CONFIG_NXP_TJA11XX_PHY)	+= nxp-tja11xx.o

obj-y				+= qcom/

obj-$(CONFIG_QSEMI_PHY)		+= qsemi.o

obj-$(CONFIG_REALTEK_PHY)	+= realtek.o

obj-$(CONFIG_REALTEK_PHY)	+= realtek/

obj-$(CONFIG_RENESAS_PHY)	+= uPD60620.o

obj-$(CONFIG_ROCKCHIP_PHY)	+= rockchip.o

obj-$(CONFIG_SMSC_PHY)		+= smsc.o

drivers/net/phy/realtek/Kconfig

0 → 100644
+11 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

config REALTEK_PHY

	tristate "Realtek PHYs"

	help

	  Currently supports RTL821x/RTL822x and fast ethernet PHYs



config REALTEK_PHY_HWMON

	def_bool REALTEK_PHY && HWMON

	depends on !(REALTEK_PHY=y && HWMON=m)

	help

	  Optional hwmon support for the temperature sensor

drivers/net/phy/realtek/Makefile

0 → 100644
+4 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

realtek-y			+= realtek_main.o

realtek-$(CONFIG_REALTEK_PHY_HWMON) += realtek_hwmon.o

obj-$(CONFIG_REALTEK_PHY)	+= realtek.o

drivers/net/phy/realtek/realtek.h

0 → 100644
+10 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */



#ifndef REALTEK_H

#define REALTEK_H



#include <linux/phy.h>



int rtl822x_hwmon_init(struct phy_device *phydev);



#endif /* REALTEK_H */