Commit ccffeae7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'v5.7-fixes' of... 

Merge branch 'v5.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into arm/fixes

* 'v5.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
  soc: mediatek: cmdq: return send msg error code
  arm64: dts: mt8173: fix vcodec-enc clock

Link: https://lore.kernel.org/r/33a0556a-e2a3-7f0b-b09b-4516642a4bfe@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents ed9dc1df 34c4e407

arch/arm64/boot/dts/mediatek/mt8173.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -1402,8 +1402,8 @@ 
				      "venc_lt_sel";

			assigned-clocks = <&topckgen CLK_TOP_VENC_SEL>,

					  <&topckgen CLK_TOP_VENC_LT_SEL>;

			assigned-clock-parents = <&topckgen CLK_TOP_VENCPLL_D2>,

						 <&topckgen CLK_TOP_UNIVPLL1_D2>;

			assigned-clock-parents = <&topckgen CLK_TOP_VCODECPLL>,

						 <&topckgen CLK_TOP_VCODECPLL_370P5>;

		};



		jpegdec: jpegdec@18004000 {

drivers/soc/mediatek/mtk-cmdq-helper.c

+3 −1
Original line number Diff line number Diff line
@@ -351,7 +351,9 @@ int cmdq_pkt_flush_async(struct cmdq_pkt *pkt, cmdq_async_flush_cb cb, 
		spin_unlock_irqrestore(&client->lock, flags);

	}



	mbox_send_message(client->chan, pkt);

	err = mbox_send_message(client->chan, pkt);

	if (err < 0)

		return err;

	/* We can send next packet immediately, so just call txdone. */

	mbox_client_txdone(client->chan, 0);

CRA Git | Maintained and supported by SUSTech CRA and CCSE