diff --git a/patch/kernel/rockchip-dev/2003-clk-rockchip-rk3288-prefer-vdpu-for-vcodec-clock-sou.patch b/patch/kernel/rockchip-dev/2003-clk-rockchip-rk3288-prefer-vdpu-for-vcodec-clock-sou.patch deleted file mode 100644 index a7e203830..000000000 --- a/patch/kernel/rockchip-dev/2003-clk-rockchip-rk3288-prefer-vdpu-for-vcodec-clock-sou.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b82f540967f6a732a22bbd236457b864951aeda7 Mon Sep 17 00:00:00 2001 -From: Myy -Date: Sun, 14 May 2017 10:13:26 +0000 -Subject: [PATCH] clk: rockchip: rk3288: prefer vdpu for vcodec clock source - -Patch provided by Randy Li. The original commit message reads : - -_______________ -The RK3288 CRU system clock solution would suggest use -the vdpu clock source for the VPU(aclk_vpu and hclk_vpu). - -Reading the registers of VPU(both VEPU and VDPU) would become all high -when the vepu is used as the clock source. It may be a bug in the SoC, -not sure whether it is fixed at RK3288W. - -Signed-off-by: Randy Li -_______________ - -This also resolves a freeze when loading the OOT Video Codec driver - -Signed-off-by: Myy ---- - drivers/clk/rockchip/clk-rk3288.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c -index 1227f74..f218256 100644 ---- a/drivers/clk/rockchip/clk-rk3288.c -+++ b/drivers/clk/rockchip/clk-rk3288.c -@@ -215,7 +215,7 @@ PNAME(mux_hsadcout_p) = { "hsadc_src", "ext_hsadc" }; - PNAME(mux_edp_24m_p) = { "ext_edp_24m", "xin24m" }; - PNAME(mux_tspout_p) = { "cpll", "gpll", "npll", "xin27m" }; - --PNAME(mux_aclk_vcodec_pre_p) = { "aclk_vepu", "aclk_vdpu" }; -+PNAME(mux_aclk_vcodec_pre_p) = { "aclk_vdpu", "aclk_vepu" }; - PNAME(mux_usbphy480m_p) = { "sclk_otgphy1_480m", "sclk_otgphy2_480m", - "sclk_otgphy0_480m" }; - PNAME(mux_hsicphy480m_p) = { "cpll", "gpll", "usbphy480m_src" }; --- -2.10.2 - diff --git a/patch/kernel/rockchip-dev/general-adjust-tinker-dts-hdmi-sound.patch b/patch/kernel/rockchip-dev/general-adjust-tinker-dts-hdmi-sound.patch new file mode 100644 index 000000000..4745d5d96 --- /dev/null +++ b/patch/kernel/rockchip-dev/general-adjust-tinker-dts-hdmi-sound.patch @@ -0,0 +1,13 @@ +diff --git a/arch/arm/boot/dts/rk3288-tinker.dtsi b/arch/arm/boot/dts/rk3288-tinker.dtsi +index 01be2bca9..5439e29e0 100644 +--- a/arch/arm/boot/dts/rk3288-tinker.dtsi ++++ b/arch/arm/boot/dts/rk3288-tinker.dtsi +@@ -64,7 +64,7 @@ + sound { + compatible = "simple-audio-card"; + simple-audio-card,format = "i2s"; +- simple-audio-card,name = "rockchip,tinker-codec"; ++ simple-audio-card,name = "DW-I2S-HDMI"; + simple-audio-card,mclk-fs = <512>; + + simple-audio-card,codec {