linux-stable.git/drivers/phy/amlogic, branch linux-5.17.y

phy: amlogic: fix error path in phy_g12a_usb3_pcie_probe()

2022-05-09T07:16:20+00:00

[ Upstream commit 2c8045d48dee703ad8eab2be7d6547765a89c069 ]

If clk_prepare_enable() fails we call clk_disable_unprepare()
in the error path what results in a warning that the clock
is disabled and unprepared already.
And if we fail later in phy_g12a_usb3_pcie_probe() then we
bail out w/o calling clk_disable_unprepare().
This patch fixes both errors.

Fixes: 36077e16c050 ("phy: amlogic: Add Amlogic G12A USB3 + PCIE Combo PHY Driver")
Signed-off-by: Heiner Kallweit 
Link: https://lore.kernel.org/r/8e416f95-1084-ee28-860e-7884f7fa2e32@gmail.com
Signed-off-by: Vinod Koul 
Signed-off-by: Sasha Levin

phy: amlogic: meson8b-usb2: fix shared reset control use

2022-04-13T17:27:23+00:00

[ Upstream commit 6f1dedf089ab1a4f03ea7aadc3c4a99885b4b4a0 ]

Use reset_control_rearm() call if an error occurs in case
phy_meson8b_usb2_power_on() fails after reset() has been called, or in
case phy_meson8b_usb2_power_off() is called i.e the resource is no longer
used and the reset line may be triggered again by other devices.

reset_control_rearm() keeps use of triggered_count sane in the reset
framework, use of reset_control_reset() on shared reset line should
be balanced with reset_control_rearm().

Signed-off-by: Amjad Ouled-Ameur 
Reported-by: Jerome Brunet 
Reviewed-by: Martin Blumenstingl 
Acked-by: Neil Armstrong 
Link: https://lore.kernel.org/r/20220111095255.176141-4-aouledameur@baylibre.com
Signed-off-by: Vinod Koul 
Signed-off-by: Sasha Levin

phy: amlogic: meson8b-usb2: Use dev_err_probe()

2022-04-13T17:27:23+00:00

[ Upstream commit 6466ba1898d415b527e1013bd8551a6fdfece94c ]

Use the existing dev_err_probe() helper instead of open-coding the same
operation.

Signed-off-by: Amjad Ouled-Ameur 
Reported-by: Martin Blumenstingl 
Reviewed-by: Martin Blumenstingl 
Acked-by: Neil Armstrong 
Link: https://lore.kernel.org/r/20220111095255.176141-3-aouledameur@baylibre.com
Signed-off-by: Vinod Koul 
Signed-off-by: Sasha Levin

phy: amlogic: phy-meson-gxl-usb2: fix shared reset controller use

2022-04-13T17:27:23+00:00

[ Upstream commit 2f87727130ce17ffefecd0895eeebf22d5a36f6f ]

Use reset_control_rearm() call if an error occurs in case
phy_meson_gxl_usb2_init() fails after reset() has been called ; or in case
phy_meson_gxl_usb2_exit() is called i.e the resource is no longer used
and the reset line may be triggered again by other devices.

reset_control_rearm() keeps use of triggered_count sane in the reset
framework. Therefore, use of reset_control_reset() on shared reset line
should be balanced with reset_control_rearm().

Signed-off-by: Amjad Ouled-Ameur 
Reported-by: Jerome Brunet 
Reviewed-by: Martin Blumenstingl 
Reviewed-by: Philipp Zabel 
Acked-by: Neil Armstrong 
Link: https://lore.kernel.org/r/20220111095255.176141-2-aouledameur@baylibre.com
Signed-off-by: Vinod Koul 
Signed-off-by: Sasha Levin

phy: dphy: Correct clk_pre parameter

2022-02-02T05:03:04+00:00

The D-PHY specification (v1.2) explicitly mentions that the T-CLK-PRE
parameter's unit is Unit Interval(UI) and the minimum value is 8.  Also,
kernel doc of the 'clk_pre' member of struct phy_configure_opts_mipi_dphy
mentions that it should be in UI.  However, the dphy core driver wrongly
sets 'clk_pre' to 8000, which seems to hint that it's in picoseconds.

So, let's fix the dphy core driver to correctly reflect the T-CLK-PRE
parameter's minimum value according to the D-PHY specification.

I'm assuming that all impacted custom drivers shall program values in
TxByteClkHS cycles into hardware for the T-CLK-PRE parameter.  The D-PHY
specification mentions that the frequency of TxByteClkHS is exactly 1/8
the High-Speed(HS) bit rate(each HS bit consumes one UI).  So, relevant
custom driver code is changed to program those values as
DIV_ROUND_UP(cfg->clk_pre, BITS_PER_BYTE), then.

Note that I've only tested the patch with RM67191 DSI panel on i.MX8mq EVK.
Help is needed to test with other i.MX8mq, Meson and Rockchip platforms,
as I don't have the hardwares.

Fixes: 2ed869990e14 ("phy: Add MIPI D-PHY configuration options")
Tested-by: Liu Ying  # RM67191 DSI panel on i.MX8mq EVK
Reviewed-by: Andrzej Hajda 
Reviewed-by: Neil Armstrong  # for phy-meson-axg-mipi-dphy.c
Tested-by: Neil Armstrong  # for phy-meson-axg-mipi-dphy.c
Tested-by: Guido Günther  # Librem 5 (imx8mq) with it's rather picky panel
Reviewed-by: Laurent Pinchart 
Signed-off-by: Liu Ying 
Link: https://lore.kernel.org/r/20220124024007.1465018-1-victor.liu@nxp.com
Signed-off-by: Vinod Koul

phy: amlogic: Add a new driver for the HDMI TX PHY on Meson8/8b/8m2

2021-11-23T05:47:49+00:00

Amlogic Meson8/8b/8m2 have a built-in HDMI PHY in the HHI register
region. Unfortunately only few register bits are documented. For
HHI_HDMI_PHY_CNTL0 the magic numbers are taken from the 3.10 vendor
kernel.

Signed-off-by: Martin Blumenstingl 
Link: https://lore.kernel.org/r/20211020195107.1564533-3-martin.blumenstingl@googlemail.com
Signed-off-by: Vinod Koul

phy: amlogic: meson8b-usb2: don't log an error on -EPROBE_DEFER

2021-08-17T10:30:44+00:00

devm_phy_create can return -EPROBE_DEFER if the vbus-supply is not ready
yet. Silence this warning as the driver framework will re-attempt
registering the PHY. Use dev_err_probe() for phy resources to indicate
the deferral reason when waiting for the resource to come up.

Cc: Martin Blumenstingl 
Reviewed-by: Martin Blumenstingl 
Signed-off-by: Anand Moon 
Link: https://lore.kernel.org/r/20210817041548.1276-7-linux.amoon@gmail.com
Signed-off-by: Vinod Koul

phy: amlogic: meson8b-usb2: Power off the PHY by putting it into reset mode

2021-08-17T10:30:44+00:00

Power off the PHY by putting it into reset mode.

Cc: Martin Blumenstingl 
Acked-by: Martin Blumenstingl 
Signed-off-by: Anand Moon 
Link: https://lore.kernel.org/r/20210817041548.1276-6-linux.amoon@gmail.com
Signed-off-by: Vinod Koul

phy: amlogic: replace devm_reset_control_array_get()

2020-11-30T11:02:37+00:00

devm_reset_control_array_get_exclusive() looks more readable

Signed-off-by: Yejune Deng 
Reviewed-by: Martin Blumenstingl 
Reviewed-by: Philipp Zabel 
Link: https://lore.kernel.org/r/1605666995-16462-1-git-send-email-yejune.deng@gmail.com
Signed-off-by: Vinod Koul

phy: amlogic: phy-meson-gxl-usb2: keep ID pull-up even in Host mode

2020-11-30T11:01:03+00:00

In order to keep OTG ID detection even when in Host mode, the ID line of
the PHY (if the current phy is an OTG one) pull-up should be kept
enable in both modes.

This fixes OTG switch on GXL, GXM & AXG platforms, otherwise once switched
to Host, the ID detection doesn't work anymore to switch back to Device.

Signed-off-by: Neil Armstrong 
Reviewed-by: Kevin Hilman 
Reviewed-by: Martin Blumenstingl 
Link: https://lore.kernel.org/r/20201120153855.3920757-1-narmstrong@baylibre.com
Signed-off-by: Vinod Koul