diff --git a/config/sources/meson64.conf b/config/sources/meson64.conf index 446dc07837..a7a1aecfa0 100644 --- a/config/sources/meson64.conf +++ b/config/sources/meson64.conf @@ -43,7 +43,7 @@ case $BRANCH in dev) KERNELSOURCE=$MAINLINE_KERNEL_SOURCE - KERNELBRANCH='branch:linux-5.1.y' + KERNELBRANCH='branch:linux-5.2.y' KERNELDIR=$MAINLINE_KERNEL_DIR SERIALCON='ttyAML0' KERNEL_USE_GCC='> 7.0' diff --git a/patch/kernel/meson64-dev/0006-ARM64-defconfig-enable-audio-support-for-meson-SoCs-.patch b/patch/kernel/meson64-dev/0006-ARM64-defconfig-enable-audio-support-for-meson-SoCs-.patch index b1868a4f2e..1829e0a7e7 100644 --- a/patch/kernel/meson64-dev/0006-ARM64-defconfig-enable-audio-support-for-meson-SoCs-.patch +++ b/patch/kernel/meson64-dev/0006-ARM64-defconfig-enable-audio-support-for-meson-SoCs-.patch @@ -16,13 +16,13 @@ diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index c65bf96aff06..350e85866ed4 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig -@@ -479,6 +479,9 @@ CONFIG_SOUND=y - CONFIG_SND=y +@@ -520,6 +524,9 @@ CONFIG_SND_HDA_CODEC_HDMI=m CONFIG_SND_SOC=y CONFIG_SND_BCM2835_SOC_I2S=m + CONFIG_SND_MESON_AXG_SOUND_CARD=m +CONFIG_SND_SOC_MESON_GX=m +CONFIG_SND_SOC_MESON_GX_I2S=m +CONFIG_SND_SOC_MESON_GX_SPDIF=m CONFIG_SND_SOC_ROCKCHIP=m - CONFIG_SND_SOC_ROCKCHIP_I2S=m CONFIG_SND_SOC_ROCKCHIP_SPDIF=m + CONFIG_SND_SOC_ROCKCHIP_RT5645=m diff --git a/patch/kernel/meson64-dev/0028-drm-meson-Add-YUV420-output-support.patch b/patch/kernel/meson64-dev/0028-drm-meson-Add-YUV420-output-support.patch index cfac9445e9..2d5cc77b2d 100644 --- a/patch/kernel/meson64-dev/0028-drm-meson-Add-YUV420-output-support.patch +++ b/patch/kernel/meson64-dev/0028-drm-meson-Add-YUV420-output-support.patch @@ -106,9 +106,9 @@ index b8775102b100..83360f37d9ce 100644 - if (mode->clock > 340000) { + if (mode->clock > 340000 && + dw_hdmi->input_bus_format == MEDIA_BUS_FMT_YUV8_1X24) { - dw_hdmi_top_write(dw_hdmi, HDMITX_TOP_TMDS_CLK_PTTN_01, 0); + dw_hdmi->data->top_write(dw_hdmi, HDMITX_TOP_TMDS_CLK_PTTN_01, + 0); dw_hdmi_top_write(dw_hdmi, HDMITX_TOP_TMDS_CLK_PTTN_23, - 0x03ff03ff); @@ -560,6 +574,8 @@ dw_hdmi_mode_valid(struct drm_connector *connector, const struct drm_display_mode *mode) { @@ -348,8 +348,8 @@ index 5acccebd026d..27c9c5ead234 100644 + .venc_freq = 297000, + .vclk_freq = 297000, .pixel_freq = 297000, -- .pll_base_freq = 2970000, - .pll_od1 = 1, +- .pll_base_freq = 5940000, + .pll_od1 = 2, .pll_od2 = 1, .pll_od3 = 1, @@ -404,14 +427,29 @@ struct meson_vclk_params { diff --git a/patch/kernel/meson64-dev/0038-media-meson-add-v4l2-m2m-video-decoder-driver.patch b/patch/kernel/meson64-dev/0038-media-meson-add-v4l2-m2m-video-decoder-driver.patch index cd93dfa597..910e838bc1 100644 --- a/patch/kernel/meson64-dev/0038-media-meson-add-v4l2-m2m-video-decoder-driver.patch +++ b/patch/kernel/meson64-dev/0038-media-meson-add-v4l2-m2m-video-decoder-driver.patch @@ -436,7 +436,7 @@ new file mode 100644 index 000000000000..9498812243ca --- /dev/null +++ b/drivers/media/platform/meson/vdec/esparser.c -@@ -0,0 +1,322 @@ +@@ -0,0 +1,323 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 BayLibre, SAS @@ -447,6 +447,7 @@ index 000000000000..9498812243ca + */ + +#include ++#include +#include +#include +#include @@ -1842,7 +1843,7 @@ new file mode 100644 index 000000000000..4e8c3f1742ac --- /dev/null +++ b/drivers/media/platform/meson/vdec/vdec.h -@@ -0,0 +1,251 @@ +@@ -0,0 +1,252 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2018 BayLibre, SAS @@ -1852,6 +1853,7 @@ index 000000000000..4e8c3f1742ac +#ifndef __MESON_VDEC_CORE_H_ +#define __MESON_VDEC_CORE_H_ + ++#include +#include +#include +#include