d6a9a92e32
Seemingly unneeded based on new upstream code so manually deleted: layerscape: 820-usb-0007-usb-dwc3-gadget-increase-timeout-value-for-send-ep-c.patch Manually merged: generic-hack: 251-sound_kconfig.patch All other modifications made by update_kernel.sh Build system: x86_64 Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711 Run-tested: ipq806x/R7800, lantiq/Easybox 904 xDSL No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us> [add lantiq test report, minor commit message clarification] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
105 lines
3.2 KiB
Diff
105 lines
3.2 KiB
Diff
From ddf78df1db8752247e89a68231338a194e5dc52b Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Thu, 19 Dec 2019 17:22:24 +0100
|
|
Subject: [PATCH] drm/vc4: hdmi: Add PHY RNG enable / disable function
|
|
|
|
Let's continue the implementation of hooks for the parts that change in the
|
|
BCM2711 SoC with the PHY RNG setup.
|
|
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 15 +++++++++------
|
|
drivers/gpu/drm/vc4/vc4_hdmi.h | 8 ++++++++
|
|
drivers/gpu/drm/vc4/vc4_hdmi_phy.c | 15 +++++++++++++++
|
|
3 files changed, 32 insertions(+), 6 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
@@ -765,9 +765,9 @@ static int vc4_hdmi_audio_trigger(struct
|
|
switch (cmd) {
|
|
case SNDRV_PCM_TRIGGER_START:
|
|
vc4_hdmi_set_audio_infoframe(encoder);
|
|
- HDMI_WRITE(HDMI_TX_PHY_CTL_0,
|
|
- HDMI_READ(HDMI_TX_PHY_CTL_0) &
|
|
- ~VC4_HDMI_TX_PHY_RNG_PWRDN);
|
|
+
|
|
+ if (vc4_hdmi->variant->phy_rng_enable)
|
|
+ vc4_hdmi->variant->phy_rng_enable(vc4_hdmi);
|
|
|
|
HDMI_WRITE(HDMI_MAI_CTL,
|
|
VC4_SET_FIELD(vc4_hdmi->audio.channels,
|
|
@@ -779,9 +779,10 @@ static int vc4_hdmi_audio_trigger(struct
|
|
VC4_HD_MAI_CTL_DLATE |
|
|
VC4_HD_MAI_CTL_ERRORE |
|
|
VC4_HD_MAI_CTL_ERRORF);
|
|
- HDMI_WRITE(HDMI_TX_PHY_CTL_0,
|
|
- HDMI_READ(HDMI_TX_PHY_CTL_0) |
|
|
- VC4_HDMI_TX_PHY_RNG_PWRDN);
|
|
+
|
|
+ if (vc4_hdmi->variant->phy_rng_disable)
|
|
+ vc4_hdmi->variant->phy_rng_disable(vc4_hdmi);
|
|
+
|
|
break;
|
|
default:
|
|
break;
|
|
@@ -1429,6 +1430,8 @@ static const struct vc4_hdmi_variant bcm
|
|
.reset = vc4_hdmi_reset,
|
|
.phy_init = vc4_hdmi_phy_init,
|
|
.phy_disable = vc4_hdmi_phy_disable,
|
|
+ .phy_rng_enable = vc4_hdmi_phy_rng_enable,
|
|
+ .phy_rng_disable = vc4_hdmi_phy_rng_disable,
|
|
};
|
|
|
|
static const struct of_device_id vc4_hdmi_dt_match[] = {
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.h
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
|
|
@@ -47,6 +47,12 @@ struct vc4_hdmi_variant {
|
|
|
|
/* Callback to disable the PHY */
|
|
void (*phy_disable)(struct vc4_hdmi *vc4_hdmi);
|
|
+
|
|
+ /* Callback to enable the RNG in the PHY */
|
|
+ void (*phy_rng_enable)(struct vc4_hdmi *vc4_hdmi);
|
|
+
|
|
+ /* Callback to disable the RNG in the PHY */
|
|
+ void (*phy_rng_disable)(struct vc4_hdmi *vc4_hdmi);
|
|
};
|
|
|
|
/* HDMI audio information */
|
|
@@ -107,5 +113,7 @@ encoder_to_vc4_hdmi(struct drm_encoder *
|
|
void vc4_hdmi_phy_init(struct vc4_hdmi *vc4_hdmi,
|
|
struct drm_display_mode *mode);
|
|
void vc4_hdmi_phy_disable(struct vc4_hdmi *vc4_hdmi);
|
|
+void vc4_hdmi_phy_rng_enable(struct vc4_hdmi *vc4_hdmi);
|
|
+void vc4_hdmi_phy_rng_disable(struct vc4_hdmi *vc4_hdmi);
|
|
|
|
#endif /* _VC4_HDMI_H_ */
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi_phy.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi_phy.c
|
|
@@ -7,6 +7,7 @@
|
|
*/
|
|
|
|
#include "vc4_hdmi.h"
|
|
+#include "vc4_regs.h"
|
|
#include "vc4_hdmi_regs.h"
|
|
|
|
void vc4_hdmi_phy_init(struct vc4_hdmi *vc4_hdmi, struct drm_display_mode *mode)
|
|
@@ -23,3 +24,17 @@ void vc4_hdmi_phy_disable(struct vc4_hdm
|
|
{
|
|
HDMI_WRITE(HDMI_TX_PHY_RESET_CTL, 0xf << 16);
|
|
}
|
|
+
|
|
+void vc4_hdmi_phy_rng_enable(struct vc4_hdmi *vc4_hdmi)
|
|
+{
|
|
+ HDMI_WRITE(HDMI_TX_PHY_CTL_0,
|
|
+ HDMI_READ(HDMI_TX_PHY_CTL_0) &
|
|
+ ~VC4_HDMI_TX_PHY_RNG_PWRDN);
|
|
+}
|
|
+
|
|
+void vc4_hdmi_phy_rng_disable(struct vc4_hdmi *vc4_hdmi)
|
|
+{
|
|
+ HDMI_WRITE(HDMI_TX_PHY_CTL_0,
|
|
+ HDMI_READ(HDMI_TX_PHY_CTL_0) |
|
|
+ VC4_HDMI_TX_PHY_RNG_PWRDN);
|
|
+}
|