Heiner Kallweit
453d9fdc36
net: mdio: mux-meson-g12a: use __clk_is_enabled to simplify the code
...
By using __clk_is_enabled () we can avoid defining an own variable for
tracking whether enable counter is zero.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com >
Signed-off-by: David S. Miller <davem@davemloft.net >
2023-01-30 07:17:30 +00:00
Jakub Kicinski
b568d3072a
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
...
Conflicts:
drivers/net/ethernet/intel/ice/ice_main.c
418e53401e ("ice: move devlink port creation/deletion")
643ef23bd9 ("ice: Introduce local var for readability")
https://lore.kernel.org/all/20230127124025.0dacef40@canb.auug.org.au/
https://lore.kernel.org/all/20230124005714.3996270-1-anthony.l.nguyen@intel.com/
drivers/net/ethernet/engleder/tsnep_main.c
3d53aaef43 ("tsnep: Fix TX queue stop/wake for multiple queues")
25faa6a4c5 ("tsnep: Replace TX spin_lock with __netif_tx_lock")
https://lore.kernel.org/all/20230127123604.36bb3e99@canb.auug.org.au/
net/netfilter/nf_conntrack_proto_sctp.c
13bd9b31a9 ("Revert "netfilter: conntrack: add sctp DATA_SENT state"")
a44b765148 ("netfilter: conntrack: unify established states for SCTP paths")
f71cb8f45d ("netfilter: conntrack: sctp: use nf log infrastructure for invalid packets")
https://lore.kernel.org/all/20230127125052.674281f9@canb.auug.org.au/
https://lore.kernel.org/all/d36076f3-6add-a442-6d4b-ead9f7ffff86@tessares.net/
Signed-off-by: Jakub Kicinski <kuba@kernel.org >
2023-01-27 22:56:18 -08:00
Jerome Brunet
7083df59ab
net: mdio-mux-meson-g12a: force internal PHY off on mux switch
...
Force the internal PHY off then on when switching to the internal path.
This fixes problems where the PHY ID is not properly set.
Fixes: 7090425104 ("net: phy: add amlogic g12a mdio mux support")
Suggested-by: Qi Duan <qi.duan@amlogic.com >
Co-developed-by: Heiner Kallweit <hkallweit1@gmail.com >
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com >
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com >
Link: https://lore.kernel.org/r/20230124101157.232234-1-jbrunet@baylibre.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org >
2023-01-25 22:46:51 -08:00
Heiner Kallweit
32e54254ba
net: mdio: mux-meson-g12a: use devm_clk_get_enabled to simplify the code
...
Use devm_clk_get_enabled() to simplify the code.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com >
Reviewed-by: Jerome Brunet <jbrunet@baylibre.com >
Signed-off-by: David S. Miller <davem@davemloft.net >
2023-01-23 14:46:51 +00:00
Yang Yingliang
de0665c871
net: mdio: mux-meson-g12a: Switch to use dev_err_probe() helper
...
dev_err() can be replace with dev_err_probe() which will check if error
code is -EPROBE_DEFER.
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com >
Reviewed-by: Andrew Lunn <andrew@lunn.ch >
Link: https://lore.kernel.org/r/20220915065043.665138-1-yangyingliang@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org >
2022-09-20 08:41:19 -07:00
Zheng Yongjun
e65c27938d
net: mdio: Fix spelling mistakes
...
informations ==> information
typicaly ==> typically
derrive ==> derive
eventhough ==> even though
Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com >
Signed-off-by: David S. Miller <davem@davemloft.net >
2021-06-01 17:05:05 -07:00
Andrew Lunn
a9770eac51
net: mdio: Move MDIO drivers into a new subdirectory
...
Move all the MDIO drivers and multiplexers into drivers/net/mdio. The
mdio core is however left in the phy directory, due to mutual
dependencies between the MDIO core and the PHY core.
Take this opportunity to sort the Kconfig based on the menuconfig
strings, and move the multiplexers to the end with a separating
comment.
v2:
Fix typo in commit message
Acked-by: Florian Fainelli <f.fainelli@gmail.com >
Signed-off-by: Andrew Lunn <andrew@lunn.ch >
Signed-off-by: David S. Miller <davem@davemloft.net >
2020-08-27 06:55:50 -07:00