aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.10/950-0636-drm-vc4-Register-HDMI-codec.patch
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2023-03-12 10:03:16 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2023-03-27 18:58:34 +0200
commit24d84a13a41008c1feb906a5ffc0da74e00275f5 (patch)
tree0f990b18d0a771df05e435330fd6a8b7b5f3bacf /target/linux/bcm27xx/patches-5.10/950-0636-drm-vc4-Register-HDMI-codec.patch
parent36bf158b47b6b013fb3f68aa4e2bf2ffc90bb9b0 (diff)
downloadupstream-24d84a13a41008c1feb906a5ffc0da74e00275f5.tar.gz
upstream-24d84a13a41008c1feb906a5ffc0da74e00275f5.tar.bz2
upstream-24d84a13a41008c1feb906a5ffc0da74e00275f5.zip
kernel: bump 5.10 to 5.10.173
Manually rebased: ramips/patches-5.10/810-uvc-add-iPassion-iP2970-support.patch All other patches automatically rebased. Signed-off-by: John Audia <therealgraysky@proton.me> (cherry picked from commit d4aad642ff80750ec16a58058eb6da718e2129cd)
Diffstat (limited to 'target/linux/bcm27xx/patches-5.10/950-0636-drm-vc4-Register-HDMI-codec.patch')
-rw-r--r--target/linux/bcm27xx/patches-5.10/950-0636-drm-vc4-Register-HDMI-codec.patch26
1 files changed, 13 insertions, 13 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0636-drm-vc4-Register-HDMI-codec.patch b/target/linux/bcm27xx/patches-5.10/950-0636-drm-vc4-Register-HDMI-codec.patch
index 72b510d130..59400f4ee4 100644
--- a/target/linux/bcm27xx/patches-5.10/950-0636-drm-vc4-Register-HDMI-codec.patch
+++ b/target/linux/bcm27xx/patches-5.10/950-0636-drm-vc4-Register-HDMI-codec.patch
@@ -65,7 +65,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
vc4_hdmi_write_infoframe(encoder, &frame);
}
-@@ -1217,18 +1218,10 @@ static inline struct vc4_hdmi *dai_to_hd
+@@ -1218,18 +1219,10 @@ static inline struct vc4_hdmi *dai_to_hd
return snd_soc_card_get_drvdata(card);
}
@@ -86,7 +86,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
/*
* If the HDMI encoder hasn't probed, or the encoder is
-@@ -1238,15 +1231,18 @@ static int vc4_hdmi_audio_startup(struct
+@@ -1239,15 +1232,18 @@ static int vc4_hdmi_audio_startup(struct
VC4_HDMI_RAM_PACKET_ENABLE))
return -ENODEV;
@@ -112,7 +112,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
return 0;
}
-@@ -1266,17 +1262,20 @@ static void vc4_hdmi_audio_reset(struct
+@@ -1267,17 +1263,20 @@ static void vc4_hdmi_audio_reset(struct
HDMI_WRITE(HDMI_MAI_CTL, VC4_HD_MAI_CTL_FLUSH);
}
@@ -140,7 +140,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
}
static int sample_rate_to_mai_fmt(int samplerate)
-@@ -1318,42 +1317,35 @@ static int sample_rate_to_mai_fmt(int sa
+@@ -1319,42 +1318,35 @@ static int sample_rate_to_mai_fmt(int sa
}
/* HDMI audio codec callbacks */
@@ -198,7 +198,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
mai_audio_format = VC4_HDMI_MAI_FORMAT_HBR;
else
mai_audio_format = VC4_HDMI_MAI_FORMAT_PCM;
-@@ -1390,148 +1382,12 @@ static int vc4_hdmi_audio_prepare(struct
+@@ -1391,148 +1383,12 @@ static int vc4_hdmi_audio_prepare(struct
HDMI_WRITE(HDMI_AUDIO_PACKET_CONFIG, audio_packet_config);
vc4_hdmi_set_n_cts(vc4_hdmi);
@@ -348,7 +348,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
static const struct snd_soc_dapm_widget vc4_hdmi_audio_widgets[] = {
SND_SOC_DAPM_OUTPUT("TX"),
};
-@@ -1542,8 +1398,6 @@ static const struct snd_soc_dapm_route v
+@@ -1543,8 +1399,6 @@ static const struct snd_soc_dapm_route v
static const struct snd_soc_component_driver vc4_hdmi_audio_component_drv = {
.name = "vc4-hdmi-codec-dai-component",
@@ -357,7 +357,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
.dapm_widgets = vc4_hdmi_audio_widgets,
.num_dapm_widgets = ARRAY_SIZE(vc4_hdmi_audio_widgets),
.dapm_routes = vc4_hdmi_audio_routes,
-@@ -1554,28 +1408,6 @@ static const struct snd_soc_component_dr
+@@ -1555,28 +1409,6 @@ static const struct snd_soc_component_dr
.non_legacy_dai_naming = 1,
};
@@ -386,7 +386,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
static const struct snd_soc_component_driver vc4_hdmi_audio_cpu_dai_comp = {
.name = "vc4-hdmi-cpu-dai-component",
};
-@@ -1602,7 +1434,6 @@ static struct snd_soc_dai_driver vc4_hdm
+@@ -1603,7 +1435,6 @@ static struct snd_soc_dai_driver vc4_hdm
SNDRV_PCM_RATE_192000,
.formats = SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE,
},
@@ -394,7 +394,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
};
static const struct snd_dmaengine_pcm_config pcm_conf = {
-@@ -1610,6 +1441,31 @@ static const struct snd_dmaengine_pcm_co
+@@ -1611,6 +1442,31 @@ static const struct snd_dmaengine_pcm_co
.prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config,
};
@@ -426,7 +426,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi)
{
const struct vc4_hdmi_register *mai_data =
-@@ -1617,6 +1473,7 @@ static int vc4_hdmi_audio_init(struct vc
+@@ -1618,6 +1474,7 @@ static int vc4_hdmi_audio_init(struct vc
struct snd_soc_dai_link *dai_link = &vc4_hdmi->audio.link;
struct snd_soc_card *card = &vc4_hdmi->audio.card;
struct device *dev = &vc4_hdmi->pdev->dev;
@@ -434,7 +434,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
const __be32 *addr;
int index, len;
int ret;
-@@ -1650,11 +1507,6 @@ static int vc4_hdmi_audio_init(struct vc
+@@ -1651,11 +1508,6 @@ static int vc4_hdmi_audio_init(struct vc
vc4_hdmi->audio.dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
vc4_hdmi->audio.dma_data.maxburst = 2;
@@ -446,7 +446,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
ret = devm_snd_dmaengine_pcm_register(dev, &pcm_conf, 0);
if (ret) {
dev_err(dev, "Could not register PCM component: %d\n", ret);
-@@ -1668,12 +1520,13 @@ static int vc4_hdmi_audio_init(struct vc
+@@ -1669,12 +1521,13 @@ static int vc4_hdmi_audio_init(struct vc
return ret;
}
@@ -466,7 +466,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
}
dai_link->cpus = &vc4_hdmi->audio.cpu;
-@@ -1686,9 +1539,9 @@ static int vc4_hdmi_audio_init(struct vc
+@@ -1687,9 +1540,9 @@ static int vc4_hdmi_audio_init(struct vc
dai_link->name = "MAI";
dai_link->stream_name = "MAI PCM";