mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-04 04:54:18 +00:00
f71ce1c34e
Add a bunch of fixes for HDMI output and Mali-450 GPU rendering on MT7623N, ie. the BananaPi R2. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
93 lines
4.4 KiB
Diff
93 lines
4.4 KiB
Diff
From patchwork Sun Dec 15 22:14:11 2024
|
|
Content-Type: text/plain; charset="utf-8"
|
|
MIME-Version: 1.0
|
|
Content-Transfer-Encoding: 7bit
|
|
X-Patchwork-Submitter: Daniel Golle <daniel@makrotopia.org>
|
|
X-Patchwork-Id: 13909006
|
|
Date: Sun, 15 Dec 2024 22:14:11 +0000
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
To: Michael Turquette <mturquette@baylibre.com>,
|
|
Stephen Boyd <sboyd@kernel.org>, Matthias Brugger <matthias.bgg@gmail.com>,
|
|
AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>,
|
|
Alexandre Mergnat <amergnat@baylibre.com>,
|
|
Geert Uytterhoeven <geert+renesas@glider.be>,
|
|
Daniel Golle <daniel@makrotopia.org>,
|
|
Uwe =?iso-8859-1?q?Kleine-K=F6nig?= <u.kleine-koenig@baylibre.com>,
|
|
Miles Chen <miles.chen@mediatek.com>, Chen-Yu Tsai <wenst@chromium.org>,
|
|
Frank Wunderlich <frank-w@public-files.de>, John Crispin <john@phrozen.org>,
|
|
linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org,
|
|
linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org,
|
|
stable@vger.kernel.org
|
|
Subject: [PATCH 2/5] clk: mediatek: mt2701-aud: fix conversion to
|
|
mtk_clk_simple_probe
|
|
Message-ID:
|
|
<a07584d803af57b9ce4b5df5e122c09bf5a56ac9.1734300668.git.daniel@makrotopia.org>
|
|
References:
|
|
<b126a5577f3667ef19b1b5feea5e70174084fb03.1734300668.git.daniel@makrotopia.org>
|
|
Precedence: bulk
|
|
X-Mailing-List: linux-clk@vger.kernel.org
|
|
List-Id: <linux-clk.vger.kernel.org>
|
|
List-Subscribe: <mailto:linux-clk+subscribe@vger.kernel.org>
|
|
List-Unsubscribe: <mailto:linux-clk+unsubscribe@vger.kernel.org>
|
|
MIME-Version: 1.0
|
|
Content-Disposition: inline
|
|
In-Reply-To:
|
|
<b126a5577f3667ef19b1b5feea5e70174084fb03.1734300668.git.daniel@makrotopia.org>
|
|
|
|
Some of the audio subsystem clocks defined in clk-mt2701.h aren't
|
|
actually used by the driver. This broke conversion to
|
|
mtk_clk_simple_probe which expects that the highest possible clk id is
|
|
defined by the ARRAY_SIZE.
|
|
|
|
Add additional dummy clocks to fill the gaps and remain compatible with
|
|
the existing DT bindings.
|
|
|
|
Fixes: 0f69a423c458 ("clk: mediatek: Switch to mtk_clk_simple_probe() where possible")
|
|
Cc: stable@vger.kernel.org
|
|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
---
|
|
drivers/clk/mediatek/clk-mt2701-aud.c | 10 ++++++++++
|
|
1 file changed, 10 insertions(+)
|
|
|
|
--- a/drivers/clk/mediatek/clk-mt2701-aud.c
|
|
+++ b/drivers/clk/mediatek/clk-mt2701-aud.c
|
|
@@ -55,10 +55,16 @@ static const struct mtk_gate audio_clks[
|
|
GATE_DUMMY(CLK_DUMMY, "aud_dummy"),
|
|
/* AUDIO0 */
|
|
GATE_AUDIO0(CLK_AUD_AFE, "audio_afe", "aud_intbus_sel", 2),
|
|
+ GATE_DUMMY(CLK_AUD_LRCK_DETECT, "audio_lrck_detect_dummy"),
|
|
+ GATE_DUMMY(CLK_AUD_I2S, "audio_i2c_dummy"),
|
|
+ GATE_DUMMY(CLK_AUD_APLL_TUNER, "audio_apll_tuner_dummy"),
|
|
GATE_AUDIO0(CLK_AUD_HDMI, "audio_hdmi", "audpll_sel", 20),
|
|
GATE_AUDIO0(CLK_AUD_SPDF, "audio_spdf", "audpll_sel", 21),
|
|
GATE_AUDIO0(CLK_AUD_SPDF2, "audio_spdf2", "audpll_sel", 22),
|
|
GATE_AUDIO0(CLK_AUD_APLL, "audio_apll", "audpll_sel", 23),
|
|
+ GATE_DUMMY(CLK_AUD_TML, "audio_tml_dummy"),
|
|
+ GATE_DUMMY(CLK_AUD_AHB_IDLE_EXT, "audio_ahb_idle_ext_dummy"),
|
|
+ GATE_DUMMY(CLK_AUD_AHB_IDLE_INT, "audio_ahb_idle_int_dummy"),
|
|
/* AUDIO1 */
|
|
GATE_AUDIO1(CLK_AUD_I2SIN1, "audio_i2sin1", "aud_mux1_sel", 0),
|
|
GATE_AUDIO1(CLK_AUD_I2SIN2, "audio_i2sin2", "aud_mux1_sel", 1),
|
|
@@ -76,10 +82,12 @@ static const struct mtk_gate audio_clks[
|
|
GATE_AUDIO1(CLK_AUD_ASRCI2, "audio_asrci2", "asm_h_sel", 13),
|
|
GATE_AUDIO1(CLK_AUD_ASRCO1, "audio_asrco1", "asm_h_sel", 14),
|
|
GATE_AUDIO1(CLK_AUD_ASRCO2, "audio_asrco2", "asm_h_sel", 15),
|
|
+ GATE_DUMMY(CLK_AUD_HDMIRX, "audio_hdmirx_dummy"),
|
|
GATE_AUDIO1(CLK_AUD_INTDIR, "audio_intdir", "intdir_sel", 20),
|
|
GATE_AUDIO1(CLK_AUD_A1SYS, "audio_a1sys", "aud_mux1_sel", 21),
|
|
GATE_AUDIO1(CLK_AUD_A2SYS, "audio_a2sys", "aud_mux2_sel", 22),
|
|
GATE_AUDIO1(CLK_AUD_AFE_CONN, "audio_afe_conn", "aud_mux1_sel", 23),
|
|
+ GATE_DUMMY(CLK_AUD_AFE_PCMIF, "audio_afe_pcmif_dummy"),
|
|
GATE_AUDIO1(CLK_AUD_AFE_MRGIF, "audio_afe_mrgif", "aud_mux1_sel", 25),
|
|
/* AUDIO2 */
|
|
GATE_AUDIO2(CLK_AUD_MMIF_UL1, "audio_ul1", "aud_mux1_sel", 0),
|
|
@@ -100,6 +108,8 @@ static const struct mtk_gate audio_clks[
|
|
GATE_AUDIO2(CLK_AUD_MMIF_AWB2, "audio_awb2", "aud_mux1_sel", 15),
|
|
GATE_AUDIO2(CLK_AUD_MMIF_DAI, "audio_dai", "aud_mux1_sel", 16),
|
|
/* AUDIO3 */
|
|
+ GATE_DUMMY(CLK_AUD_DMIC1, "audio_dmic1_dummy"),
|
|
+ GATE_DUMMY(CLK_AUD_DMIC2, "audio_dmic2_dummy"),
|
|
GATE_AUDIO3(CLK_AUD_ASRCI3, "audio_asrci3", "asm_h_sel", 2),
|
|
GATE_AUDIO3(CLK_AUD_ASRCI4, "audio_asrci4", "asm_h_sel", 3),
|
|
GATE_AUDIO3(CLK_AUD_ASRCI5, "audio_asrci5", "asm_h_sel", 4),
|