From 20afea35d960783b2383ee03493af4c1f5a71234 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Fri, 28 Jun 2019 10:35:20 +0200 Subject: [PATCH] Update kernel patch for 4.19 (#419) --- ...288-prefer-vdpu-for-vcodec-clock-sou.patch | 41 ------------------- ...inker-Add-the-MIPI-DSI-node.patch.disabled | 35 ++++++++++++++++ ...dd-missing-interleaved-pcm-attribute.patch | 37 ----------------- ...general-adjust-tinker-dts-hdmi-sound.patch | 13 ++++++ 4 files changed, 48 insertions(+), 78 deletions(-) delete mode 100644 buildroot-external/board/asus/tinker/patches/linux/1003-clk-rockchip-rk3288-prefer-vdpu-for-vcodec-clock-sou.patch create mode 100644 buildroot-external/board/asus/tinker/patches/linux/2019-ARM-DTS-rk3288-tinker-Add-the-MIPI-DSI-node.patch.disabled delete mode 100644 buildroot-external/board/asus/tinker/patches/linux/3002_RK3288-add-missing-interleaved-pcm-attribute.patch create mode 100644 buildroot-external/board/asus/tinker/patches/linux/general-adjust-tinker-dts-hdmi-sound.patch diff --git a/buildroot-external/board/asus/tinker/patches/linux/1003-clk-rockchip-rk3288-prefer-vdpu-for-vcodec-clock-sou.patch b/buildroot-external/board/asus/tinker/patches/linux/1003-clk-rockchip-rk3288-prefer-vdpu-for-vcodec-clock-sou.patch deleted file mode 100644 index a7e203830..000000000 --- a/buildroot-external/board/asus/tinker/patches/linux/1003-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/buildroot-external/board/asus/tinker/patches/linux/2019-ARM-DTS-rk3288-tinker-Add-the-MIPI-DSI-node.patch.disabled b/buildroot-external/board/asus/tinker/patches/linux/2019-ARM-DTS-rk3288-tinker-Add-the-MIPI-DSI-node.patch.disabled new file mode 100644 index 000000000..52519bb4a --- /dev/null +++ b/buildroot-external/board/asus/tinker/patches/linux/2019-ARM-DTS-rk3288-tinker-Add-the-MIPI-DSI-node.patch.disabled @@ -0,0 +1,35 @@ +From 8ca607f3fe77c80a3367d8363703d5dc1d6781d4 Mon Sep 17 00:00:00 2001 +From: Myy Miouyouyou +Date: Thu, 19 Oct 2017 22:36:02 +0200 +Subject: [PATCH 22/28] ARM: DTS: rk3288-tinker.dts: Add the MIPI DSI node + +Taken from, and tested by @TonyMac32 . + +Signed-off-by: Myy Miouyouyou +--- + arch/arm/boot/dts/rk3288-tinker.dts | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts +index 67a3ce6f..6f4c0843 100644 +--- a/arch/arm/boot/dts/rk3288-tinker.dts ++++ b/arch/arm/boot/dts/rk3288-tinker.dts +@@ -443,6 +443,15 @@ + sdcard-supply = <&vccio_sd>; + }; + ++&mipi_dsi { ++ status = "okay"; ++ mipi_panel: mipi-panel { ++ compatible ="asus,tc358762"; ++ reg = <0x0 0>; ++ status = "okay"; ++ }; ++}; ++ + &sdio0 { + status = "okay"; + clock-frequency = <50000000>; +-- +2.11.0 + diff --git a/buildroot-external/board/asus/tinker/patches/linux/3002_RK3288-add-missing-interleaved-pcm-attribute.patch b/buildroot-external/board/asus/tinker/patches/linux/3002_RK3288-add-missing-interleaved-pcm-attribute.patch deleted file mode 100644 index 4ca2818cf..000000000 --- a/buildroot-external/board/asus/tinker/patches/linux/3002_RK3288-add-missing-interleaved-pcm-attribute.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 24d6638302b48328a58c13439276d4531af4ca7d Mon Sep 17 00:00:00 2001 -From: Katsuhiro Suzuki -Date: Tue, 11 Sep 2018 01:39:32 +0900 -Subject: ASoC: rockchip: add missing INTERLEAVED PCM attribute - -This patch adds SNDRV_PCM_INFO_INTERLEAVED into PCM hardware info. - -Signed-off-by: Katsuhiro Suzuki -Signed-off-by: Mark Brown ---- - sound/soc/rockchip/rockchip_pcm.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -(limited to 'sound/soc/rockchip') - -Armbian Note: this patch has been backported from 4.20 to 4.19 due to break in rockchip HDMI/I2S audio. This -can be safely removed once there is a new kernel bump. -Origin: - -diff --git a/sound/soc/rockchip/rockchip_pcm.c b/sound/soc/rockchip/rockchip_pcm.c -index f77538319221..9e7b5fa4cf59 100644 ---- a/sound/soc/rockchip/rockchip_pcm.c -+++ b/sound/soc/rockchip/rockchip_pcm.c -@@ -21,7 +21,8 @@ static const struct snd_pcm_hardware snd_rockchip_hardware = { - .info = SNDRV_PCM_INFO_MMAP | - SNDRV_PCM_INFO_MMAP_VALID | - SNDRV_PCM_INFO_PAUSE | -- SNDRV_PCM_INFO_RESUME, -+ SNDRV_PCM_INFO_RESUME | -+ SNDRV_PCM_INFO_INTERLEAVED, - .period_bytes_min = 32, - .period_bytes_max = 8192, - .periods_min = 1, --- -cgit 1.2-0.3.lf.el7 - - diff --git a/buildroot-external/board/asus/tinker/patches/linux/general-adjust-tinker-dts-hdmi-sound.patch b/buildroot-external/board/asus/tinker/patches/linux/general-adjust-tinker-dts-hdmi-sound.patch new file mode 100644 index 000000000..befe282f8 --- /dev/null +++ b/buildroot-external/board/asus/tinker/patches/linux/general-adjust-tinker-dts-hdmi-sound.patch @@ -0,0 +1,13 @@ +diff --git a/arch/arm/boot/dts/rk3288-tinker.dts b/arch/arm/boot/dts/rk3288-tinker.dts +index 958c0f3bf..59b8d8eac 100644 +--- a/arch/arm/boot/dts/rk3288-tinker.dts ++++ b/arch/arm/boot/dts/rk3288-tinker.dts +@@ -70,7 +70,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 {