Merge pull request #2925 from Kwiboo/rockchip-part7

Rockchip: update rkbin, u-boot, rkmpp and linux

packages/linux-firmware/rockchip-firmware/package.mk

@@ -14,6 +14,9 @@ PKG_LONGDESC="rockchip firmware"
 PKG_TOOLCHAIN="manual"
 
 makeinstall_target() {
+  mkdir -p $INSTALL/usr/lib/libreelec
+    cp $PKG_DIR/scripts/* $INSTALL/usr/lib/libreelec
+
   mkdir -p $INSTALL/usr/bin
     cp -v $(get_build_dir rkbin)/firmware/bin/rtk_hciattach $INSTALL/usr/bin
 

packages/linux-firmware/rockchip-firmware/scripts/hciattach-realtek-config

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
+
+if [ "$(cat /sys/firmware/devicetree/base/model)" = "Rockchip RK3328 TRN9" ]; then
+  cp -f /usr/lib/kernel-overlays/base/lib/firmware/rtlbt/rtl8723b_config_noflow /var/lib/firmware/rtlbt/rtl8723b_config
+
+  # temporarily disable bluetooth unless bootargs contains bluetooth
+  BOOTARGS=$(cat /sys/firmware/devicetree/base/chosen/bootargs) && [ "$BOOTARGS" = "${BOOTARGS/bluetooth/}" ] && exit 1
+fi
+
+if [ -d /var/lib/firmware/updates/rtlbt ]; then
+  cp -f /var/lib/firmware/updates/rtlbt/* /var/lib/firmware/rtlbt
+fi
+
+exit 0

packages/linux-firmware/rockchip-firmware/system.d/hciattach-realtek.service

@@ -6,6 +6,7 @@ After=dev-ttyS0.device
 
 [Service]
 Type=simple
+ExecStartPre=/usr/lib/libreelec/hciattach-realtek-config
 ExecStartPre=/usr/sbin/rfkill unblock bluetooth
 ExecStart=/usr/bin/rtk_hciattach -n -s 115200 ttyS0 rtk_h5
 ExecStopPost=/usr/sbin/rfkill block bluetooth

packages/linux-firmware/rockchip-firmware/udev.d/80-rockchip-firmware.rules

@@ -5,8 +5,22 @@
 ACTION!="add", GOTO="end"
 SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x024c", ATTRS{device}=="0xb723", \
   TAG+="systemd", ENV{SYSTEMD_WANTS}+="hciattach-realtek.service"
+SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x024c", ATTRS{device}=="0x8753", \
+  TAG+="systemd", ENV{SYSTEMD_WANTS}+="hciattach-realtek.service"
 SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x024c", ATTRS{device}=="0x0626", \
   TAG+="systemd", ENV{SYSTEMD_WANTS}+="hciattach-realtek.service"
+SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x024c", ATTRS{device}=="0x0624", \
+  TAG+="systemd", ENV{SYSTEMD_WANTS}+="hciattach-realtek.service"
+SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x024c", ATTRS{device}=="0x0623", \
+  TAG+="systemd", ENV{SYSTEMD_WANTS}+="hciattach-realtek.service"
+SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x024c", ATTRS{device}=="0x0524", \
+  TAG+="systemd", ENV{SYSTEMD_WANTS}+="hciattach-realtek.service"
+SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x024c", ATTRS{device}=="0x0523", \
+  TAG+="systemd", ENV{SYSTEMD_WANTS}+="hciattach-realtek.service"
+SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x024c", ATTRS{device}=="0x0241", \
+  TAG+="systemd", ENV{SYSTEMD_WANTS}+="hciattach-realtek.service"
+SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x024c", ATTRS{device}=="0x0240", \
+  TAG+="systemd", ENV{SYSTEMD_WANTS}+="hciattach-realtek.service"
 SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x02d0", ATTRS{device}=="0x4356", \
   TAG+="systemd", ENV{SYSTEMD_WANTS}+="hciattach@bcm43xx.service"
 LABEL="end"

packages/linux/package.mk

@@ -35,8 +35,8 @@ case "$LINUX" in
     PKG_BUILD_PERF="no"
     ;;
   rockchip-4.4)
-    PKG_VERSION="bca2464422eb8dd734f9218265dae256a82299be"
-    PKG_SHA256="baaea04ca4a1b34e0bfce36bfcf74d65b06ae371e29fa2ef96d26327e55b690d"
+    PKG_VERSION="aa8bacf821e5c8ae6dd8cae8d64011c741659945"
+    PKG_SHA256="a2760fe89a15aa7be142fd25fb08ebd357c5d855c41f1612cf47c6e89de39bb3"
     PKG_URL="https://github.com/rockchip-linux/kernel/archive/$PKG_VERSION.tar.gz"
     PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz"
     ;;

packages/multimedia/ffmpeg/patches/ffmpeg-99.1005-rkmppdec-Kodi-need-more-buffers.patch

@@ -0,0 +1,22 @@
+From 9d00331a2ef4a06b9bdc84de78623384f2e2111e Mon Sep 17 00:00:00 2001
+From: Jonas Karlman <jonas@kwiboo.se>
+Date: Fri, 31 Aug 2018 21:17:27 +0200
+Subject: [PATCH] rkmppdec: Kodi need more buffers
+
+---
+ libavcodec/rkmppdec.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libavcodec/rkmppdec.c b/libavcodec/rkmppdec.c
+index 143d05bd51..c00f08c70b 100644
+--- a/libavcodec/rkmppdec.c
++++ b/libavcodec/rkmppdec.c
+@@ -39,7 +39,7 @@
+ #include "libavutil/log.h"
+ 
+ #define RECEIVE_FRAME_TIMEOUT   100
+-#define FRAMEGROUP_MAX_FRAMES   16
++#define FRAMEGROUP_MAX_FRAMES   24
+ #define INPUT_MAX_PACKETS       4
+ 
+ typedef struct {

packages/multimedia/ffmpeg/patches/ffmpeg-99.1006-rkmppdec-continue-on-errinfo-frame.patch

@@ -0,0 +1,25 @@
+From 277118ae73eab2ddad116bf923b9553db3a871d0 Mon Sep 17 00:00:00 2001
+From: Jonas Karlman <jonas@kwiboo.se>
+Date: Sun, 9 Sep 2018 12:37:29 +0200
+Subject: [PATCH] rkmppdec: continue on errinfo frame
+
+---
+ libavcodec/rkmppdec.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libavcodec/rkmppdec.c b/libavcodec/rkmppdec.c
+index c00f08c70b..7c246db0d1 100644
+--- a/libavcodec/rkmppdec.c
++++ b/libavcodec/rkmppdec.c
+@@ -386,7 +386,7 @@ static int rkmpp_retrieve_frame(AVCodecContext *avctx, AVFrame *frame)
+             goto fail;
+         } else if (mpp_frame_get_errinfo(mppframe)) {
+             av_log(avctx, AV_LOG_ERROR, "Received a errinfo frame.\n");
+-            ret = AVERROR_UNKNOWN;
++            ret = AVERROR(EAGAIN);
+             goto fail;
+         }
+ 
+-- 
+2.18.0
+

packages/multimedia/ffmpeg/patches/ffmpeg-99.1007-rkmppdec-enable-mpeg2.patch

@@ -0,0 +1,83 @@
+From 944f3bc90fb402b11f2419e5877a1f8395ba7e6a Mon Sep 17 00:00:00 2001
+From: Jonas Karlman <jonas@kwiboo.se>
+Date: Wed, 12 Sep 2018 22:29:22 +0200
+Subject: [PATCH] rkmppdec: enable mpeg2
+
+---
+ configure              | 1 +
+ libavcodec/Makefile    | 1 +
+ libavcodec/allcodecs.c | 1 +
+ libavcodec/rkmppdec.c  | 8 ++++++++
+ 4 files changed, 11 insertions(+)
+
+diff --git a/configure b/configure
+index 827abfe694..38492d3b33 100755
+--- a/configure
++++ b/configure
+@@ -2932,6 +2932,7 @@ mpeg2_crystalhd_decoder_select="crystalhd"
+ mpeg2_cuvid_decoder_deps="cuvid"
+ mpeg2_mmal_decoder_deps="mmal"
+ mpeg2_mediacodec_decoder_deps="mediacodec"
++mpeg2_rkmpp_decoder_deps="rkmpp"
+ mpeg2_qsv_decoder_select="qsvdec mpegvideo_parser"
+ mpeg2_qsv_encoder_select="qsvenc"
+ mpeg2_vaapi_encoder_deps="VAEncPictureParameterBufferMPEG2"
+diff --git a/libavcodec/Makefile b/libavcodec/Makefile
+index 4b8ad121db..f1580bb10b 100644
+--- a/libavcodec/Makefile
++++ b/libavcodec/Makefile
+@@ -447,6 +447,7 @@ OBJS-$(CONFIG_MPEG1VIDEO_ENCODER)      += mpeg12enc.o mpeg12.o
+ OBJS-$(CONFIG_MPEG1_CUVID_DECODER)     += cuviddec.o
+ OBJS-$(CONFIG_MPEG1_V4L2M2M_DECODER)   += v4l2_m2m_dec.o
+ OBJS-$(CONFIG_MPEG2_MMAL_DECODER)      += mmaldec.o
++OBJS-$(CONFIG_MPEG2_RKMPP_DECODER)     += rkmppdec.o
+ OBJS-$(CONFIG_MPEG2_QSV_DECODER)       += qsvdec_other.o
+ OBJS-$(CONFIG_MPEG2_QSV_ENCODER)       += qsvenc_mpeg2.o
+ OBJS-$(CONFIG_MPEG2VIDEO_DECODER)      += mpeg12dec.o mpeg12.o mpeg12data.o
+diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
+index 4d4ef530e4..07e1216333 100644
+--- a/libavcodec/allcodecs.c
++++ b/libavcodec/allcodecs.c
+@@ -192,6 +192,7 @@ extern AVCodec ff_mpeg1_v4l2m2m_decoder;
+ extern AVCodec ff_mpeg2_mmal_decoder;
+ extern AVCodec ff_mpeg2_crystalhd_decoder;
+ extern AVCodec ff_mpeg2_v4l2m2m_decoder;
++extern AVCodec ff_mpeg2_rkmpp_decoder;
+ extern AVCodec ff_mpeg2_qsv_decoder;
+ extern AVCodec ff_mpeg2_mediacodec_decoder;
+ extern AVCodec ff_msa1_decoder;
+diff --git a/libavcodec/rkmppdec.c b/libavcodec/rkmppdec.c
+index 7c246db0d1..cf41f8895a 100644
+--- a/libavcodec/rkmppdec.c
++++ b/libavcodec/rkmppdec.c
+@@ -69,6 +69,7 @@ static MppCodingType rkmpp_get_codingtype(AVCodecContext *avctx)
+     switch (avctx->codec_id) {
+     case AV_CODEC_ID_H264:          return MPP_VIDEO_CodingAVC;
+     case AV_CODEC_ID_HEVC:          return MPP_VIDEO_CodingHEVC;
++    case AV_CODEC_ID_MPEG2VIDEO:    return MPP_VIDEO_CodingMPEG2;
+     case AV_CODEC_ID_VP8:           return MPP_VIDEO_CodingVP8;
+     case AV_CODEC_ID_VP9:           return MPP_VIDEO_CodingVP9;
+     default:                        return MPP_VIDEO_CodingUnused;
+@@ -403,6 +404,12 @@ static int rkmpp_retrieve_frame(AVCodecContext *avctx, AVFrame *frame)
+         frame->color_trc        = mpp_frame_get_color_trc(mppframe);
+         frame->colorspace       = mpp_frame_get_colorspace(mppframe);
+ 
++        if (avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
++            MppFrameRational dar = mpp_frame_get_sar(mppframe);
++            frame->sample_aspect_ratio = av_div_q((AVRational) { dar.num, dar.den },
++                                                  (AVRational) { frame->width, frame->height });
++        }
++
+         mode = mpp_frame_get_mode(mppframe);
+         frame->interlaced_frame = ((mode & MPP_FRAME_FLAG_FIELD_ORDER_MASK) == MPP_FRAME_FLAG_DEINTERLACED);
+         frame->top_field_first  = ((mode & MPP_FRAME_FLAG_FIELD_ORDER_MASK) == MPP_FRAME_FLAG_TOP_FIRST);
+@@ -582,5 +589,6 @@ static const AVCodecHWConfigInternal *rkmpp_hw_configs[] = {
+ 
+ RKMPP_DEC(h264,  AV_CODEC_ID_H264,          "h264_mp4toannexb")
+ RKMPP_DEC(hevc,  AV_CODEC_ID_HEVC,          "hevc_mp4toannexb")
++RKMPP_DEC(mpeg2, AV_CODEC_ID_MPEG2VIDEO,    NULL)
+ RKMPP_DEC(vp8,   AV_CODEC_ID_VP8,           NULL)
+ RKMPP_DEC(vp9,   AV_CODEC_ID_VP9,           NULL)
+-- 
+2.18.0
+

packages/multimedia/rkmpp/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="rkmpp"
-PKG_VERSION="93824dc71392b9ac94ee8ca157d9f2d4739e8f8f"
-PKG_SHA256="14c49ceebd6c45dbb4c601bb4815de9a27d71d47f551c998ba9d3ff255572ad8"
+PKG_VERSION="7a21a6a0454f604fdf752a1d45be6e2c954cc6de"
+PKG_SHA256="ea981633839673dcfdc0fa0e4666b61ed0626def4273cdf5336b6a6bf322fdb3"
 PKG_ARCH="arm aarch64"
 PKG_LICENSE="APL"
 PKG_SITE="https://github.com/rockchip-linux/mpp"
@@ -20,6 +20,5 @@ else
   PKG_ENABLE_VP9D="OFF"
 fi
 
-PKG_CMAKE_OPTS_TARGET="-DRKPLATFORM=ON \
-                       -DENABLE_VP9D=$PKG_ENABLE_VP9D \
+PKG_CMAKE_OPTS_TARGET="-DENABLE_VP9D=$PKG_ENABLE_VP9D \
                        -DHAVE_DRM=ON"

packages/multimedia/rkmpp/patches/rkmpp-0001-fix-32-bit-mmap-issue-on-64-bit-kernels.patch

@@ -1,4 +1,4 @@
-From d207d3da1107f642be937ad14d5b3cfff7780155 Mon Sep 17 00:00:00 2001
+From dded8152c718456fc35e4ba8ae42aca9b92509f0 Mon Sep 17 00:00:00 2001
 From: Jakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com>
 Date: Mon, 29 May 2017 14:08:43 +0200
 Subject: [PATCH] fix 32-bit mmap issue on 64-bit kernels
@@ -16,7 +16,7 @@ For details see https://github.com/rockchip-linux/kernel/issues/17
  1 file changed, 2 insertions(+)
 
 diff --git a/osal/allocator/allocator_drm.c b/osal/allocator/allocator_drm.c
-index a29bf3f5..58891b28 100644
+index b1dc277f..c2572716 100644
 --- a/osal/allocator/allocator_drm.c
 +++ b/osal/allocator/allocator_drm.c
 @@ -15,6 +15,8 @@

packages/multimedia/rkmpp/patches/rkmpp-0002-disable-unit-tests-by-default.patch

@@ -1,4 +1,4 @@
-From e2a70002f9a0a37f5c6297f1cc5e6604e9f9d964 Mon Sep 17 00:00:00 2001
+From 0bcf210be37b631039ceef89155538770ccefed7 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 24 Jun 2018 11:07:44 +0200
 Subject: [PATCH] disable unit tests by default

packages/multimedia/rkmpp/patches/rkmpp-0003-h264d-revert-vdpu-fast-mode-code.patch

@@ -1,4 +1,4 @@
-From ccd837fab6ab41ee3cb63b0e9ae1db824f96d4dc Mon Sep 17 00:00:00 2001
+From 51c122a2ee9a1f06c6a33bddc0be2db1065bb385 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Tue, 7 Aug 2018 18:14:57 +0200
 Subject: [PATCH] [h264d]: revert vdpu fast mode code
@@ -9,7 +9,7 @@ Subject: [PATCH] [h264d]: revert vdpu fast mode code
  2 files changed, 10 insertions(+), 26 deletions(-)
 
 diff --git a/mpp/hal/rkdec/h264d/hal_h264d_vdpu1.c b/mpp/hal/rkdec/h264d/hal_h264d_vdpu1.c
-index 1cddfc45..660e41f3 100644
+index 59d1d7dd..35356c2f 100644
 --- a/mpp/hal/rkdec/h264d/hal_h264d_vdpu1.c
 +++ b/mpp/hal/rkdec/h264d/hal_h264d_vdpu1.c
 @@ -416,7 +416,8 @@ static MPP_RET vdpu1_set_vlc_regs(H264dHalCtx_t *p_hal,
@@ -74,7 +74,7 @@ index 1cddfc45..660e41f3 100644
                  reg_ctx->reg_buf[i].valid = 1;
                  break;
 diff --git a/mpp/hal/rkdec/h264d/hal_h264d_vdpu2.c b/mpp/hal/rkdec/h264d/hal_h264d_vdpu2.c
-index fa55e635..9b22c1d9 100644
+index 7ad44840..71dd9e44 100644
 --- a/mpp/hal/rkdec/h264d/hal_h264d_vdpu2.c
 +++ b/mpp/hal/rkdec/h264d/hal_h264d_vdpu2.c
 @@ -451,7 +451,8 @@ static MPP_RET set_vlc_regs(H264dHalCtx_t *p_hal, H264dVdpuRegs_t *p_regs)

packages/multimedia/rkmpp/patches/rkmpp-0004-h264d-fix-mpp_buf_slot_get_prop-crash.patch

@@ -0,0 +1,26 @@
+From 773108dc3584ce325ff4127dbd54a0a935a89bfc Mon Sep 17 00:00:00 2001
+From: Jonas Karlman <jonas@kwiboo.se>
+Date: Fri, 7 Sep 2018 19:53:10 +0200
+Subject: [PATCH] [h264d]: fix mpp_buf_slot_get_prop crash
+
+---
+ mpp/codec/dec/h264/h264d_init.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/mpp/codec/dec/h264/h264d_init.c b/mpp/codec/dec/h264/h264d_init.c
+index f32c2a77..46f02466 100644
+--- a/mpp/codec/dec/h264/h264d_init.c
++++ b/mpp/codec/dec/h264/h264d_init.c
+@@ -1387,7 +1387,11 @@ static RK_U32 check_ref_dbp_err(H264_DecCtx_t *p_Dec, H264_RefPicInfo_t *pref, R
+     for (i = 0; i < MAX_REF_SIZE; i++) {
+         if (pref[i].valid) {
+             MppFrame mframe = NULL;
+-            RK_U32 slot_idx = p_Dec->dpb_info[pref[i].dpb_idx].slot_index;
++            RK_S32 slot_idx = p_Dec->dpb_info[pref[i].dpb_idx].slot_index;
++            if (slot_idx < 0) {
++                dpb_error_flag |= 1;
++                break;
++            }
+             mpp_buf_slot_get_prop(p_Dec->frame_slots, slot_idx, SLOT_FRAME_PTR, &mframe);
+             if (mframe) {
+                 if (i < active_refs) {

packages/multimedia/rkmpp/patches/rkmpp-0005-m2vd-use-ctx-pts.patch

@@ -0,0 +1,22 @@
+From 6be271fa4bbebae10ec5e680a2d90266eb3d9ea8 Mon Sep 17 00:00:00 2001
+From: Jonas Karlman <jonas@kwiboo.se>
+Date: Thu, 1 Mar 2018 22:31:47 +0100
+Subject: [PATCH] [m2vd]: use ctx pts
+
+---
+ mpp/codec/dec/m2v/m2vd_parser.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mpp/codec/dec/m2v/m2vd_parser.c b/mpp/codec/dec/m2v/m2vd_parser.c
+index 6a720d56..24372f85 100755
+--- a/mpp/codec/dec/m2v/m2vd_parser.c
++++ b/mpp/codec/dec/m2v/m2vd_parser.c
+@@ -1151,7 +1151,7 @@ static MPP_RET m2vd_alloc_frame(M2VDParserContext *ctx)
+             mpp_frame_set_hor_stride(ctx->frame_cur->f, ctx->display_width);
+             mpp_frame_set_ver_stride(ctx->frame_cur->f, ctx->display_height);
+             mpp_frame_set_errinfo(ctx->frame_cur->f, 0);
+-            mpp_frame_set_pts(ctx->frame_cur->f, Time * 1000);
++            mpp_frame_set_pts(ctx->frame_cur->f, ctx->pts);
+             ctx->frame_cur->flags = M2V_OUT_FLAG;
+             if (ctx->seq_ext_head.progressive_sequence) {
+                 frametype = MPP_FRAME_FLAG_FRAME;

packages/multimedia/rkmpp/patches/rkmpp-0006-m2vd-export-aspect-ratio-information.patch

@@ -0,0 +1,103 @@
+From 50c49fe8cdb9b236d27ec2b1d3195ca5121d9677 Mon Sep 17 00:00:00 2001
+From: Jonas Karlman <jonas@kwiboo.se>
+Date: Sat, 15 Sep 2018 11:24:28 +0200
+Subject: [PATCH] [m2vd]: export aspect ratio information
+
+---
+ inc/mpp_frame.h                 | 10 ++++++++++
+ mpp/base/inc/mpp_frame_impl.h   |  1 +
+ mpp/base/mpp_frame.cpp          |  1 +
+ mpp/codec/dec/m2v/m2vd_parser.c | 22 ++++++++++++++++++++++
+ 4 files changed, 34 insertions(+)
+
+diff --git a/inc/mpp_frame.h b/inc/mpp_frame.h
+index 6c1b7f1d..87513a09 100644
+--- a/inc/mpp_frame.h
++++ b/inc/mpp_frame.h
+@@ -190,6 +190,14 @@ typedef enum {
+     MPP_FMT_BUTT            = MPP_FMT_COMPLEX_BUTT,
+ } MppFrameFormat;
+ 
++/**
++ * Rational number (pair of numerator and denominator).
++ */
++typedef struct MppFrameRational {
++    RK_S32 num; ///< Numerator
++    RK_S32 den; ///< Denominator
++} MppFrameRational;
++
+ typedef enum {
+     MPP_FRAME_ERR_UNKNOW           = 0x0001,
+     MPP_FRAME_ERR_UNSUPPORT        = 0x0002,
+@@ -263,6 +271,8 @@ void    mpp_frame_set_chroma_location(MppFrame frame, MppFrameChromaLocation chr
+ MppFrameFormat mpp_frame_get_fmt(MppFrame frame);
+ void    mpp_frame_set_fmt(MppFrame frame, MppFrameFormat fmt);
+ 
++MppFrameRational mpp_frame_get_sar(const MppFrame frame);
++void    mpp_frame_set_sar(MppFrame frame, MppFrameRational sar);
+ 
+ /*
+  * HDR parameter
+diff --git a/mpp/base/inc/mpp_frame_impl.h b/mpp/base/inc/mpp_frame_impl.h
+index 44edc184..1f13d553 100644
+--- a/mpp/base/inc/mpp_frame_impl.h
++++ b/mpp/base/inc/mpp_frame_impl.h
+@@ -87,6 +87,7 @@ struct MppFrameImpl_t {
+     MppFrameChromaLocation chroma_location;
+ 
+     MppFrameFormat fmt;
++    MppFrameRational sar;
+     /*
+      * buffer information
+      * NOTE: buf_size only access internally
+diff --git a/mpp/base/mpp_frame.cpp b/mpp/base/mpp_frame.cpp
+index cc83b6b3..984efa62 100644
+--- a/mpp/base/mpp_frame.cpp
++++ b/mpp/base/mpp_frame.cpp
+@@ -184,5 +184,6 @@ MPP_FRAME_ACCESSORS(MppFrameColorTransferCharacteristic, color_trc)
+ MPP_FRAME_ACCESSORS(MppFrameColorSpace, colorspace)
+ MPP_FRAME_ACCESSORS(MppFrameChromaLocation, chroma_location)
+ MPP_FRAME_ACCESSORS(MppFrameFormat, fmt)
++MPP_FRAME_ACCESSORS(MppFrameRational, sar)
+ MPP_FRAME_ACCESSORS(size_t, buf_size)
+ MPP_FRAME_ACCESSORS(RK_U32, errinfo)
+diff --git a/mpp/codec/dec/m2v/m2vd_parser.c b/mpp/codec/dec/m2v/m2vd_parser.c
+index 24372f85..e44e35fb 100755
+--- a/mpp/codec/dec/m2v/m2vd_parser.c
++++ b/mpp/codec/dec/m2v/m2vd_parser.c
+@@ -82,6 +82,25 @@ static int frame_period_Table[16] = {
+     1
+ };
+ 
++static const MppFrameRational mpeg2_aspect[16] = {
++    {0,1},
++    {1,1},
++    {4,3},
++    {16,9},
++    {221,100},
++    {0,1},
++    {0,1},
++    {0,1},
++    {0,1},
++    {0,1},
++    {0,1},
++    {0,1},
++    {0,1},
++    {0,1},
++    {0,1},
++    {0,1},
++};
++
+ static inline RK_S32 m2vd_get_readbits(BitReadCtx_t *bx)
+ {
+     return bx->used_bits;
+@@ -1164,6 +1183,9 @@ static MPP_RET m2vd_alloc_frame(M2VDParserContext *ctx)
+             }
+             mpp_frame_set_mode(ctx->frame_cur->f, frametype);
+ 
++            if (ctx->seq_head.aspect_ratio_information >= 0 && ctx->seq_head.aspect_ratio_information < 16)
++                mpp_frame_set_sar(ctx->frame_cur->f, mpeg2_aspect[ctx->seq_head.aspect_ratio_information]);
++
+             mpp_buf_slot_get_unused(ctx->frame_slots, &ctx->frame_cur->slot_index);
+             mpp_buf_slot_set_prop(ctx->frame_slots, ctx->frame_cur->slot_index, SLOT_FRAME, ctx->frame_cur->f);
+             mpp_buf_slot_set_flag(ctx->frame_slots, ctx->frame_cur->slot_index, SLOT_CODEC_USE);

packages/tools/rkbin/package.mk

@@ -2,9 +2,9 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="rkbin"
-# Version is: Kwiboo/tag:libreelec-b3a2661
-PKG_VERSION="b3a2661830dd7e1800b755373b02ac892863ef9b"
-PKG_SHA256="e69637c354afb008373eea5d4fe58dc17161e3a6091cefc0a76be247a595ce8b"
+# Version is: Kwiboo/tag:libreelec-120fe36
+PKG_VERSION="120fe36ad34d7026051ecc50840a6a8dc95d759e"
+PKG_SHA256="67f052770b44b4c45b537e34abd59065300703feca6a687d378360bfc2458080"
 PKG_ARCH="arm aarch64"
 PKG_LICENSE="nonfree"
 PKG_SITE="https://github.com/rockchip-linux/rkbin"

packages/tools/u-boot/package.mk

@@ -18,8 +18,8 @@ PKG_NEED_UNPACK="$PROJECT_DIR/$PROJECT/bootloader"
 
 case "$PROJECT" in
   Rockchip)
-    PKG_VERSION="ac5a8f08e811581376e731c898c21e4f79177ec2"
-    PKG_SHA256="e3ca0d99fef24649c75c4fe7cb0c6de069f98424a7dbf9d397f65b79b8749866"
+    PKG_VERSION="8659d08d2b589693d121c1298484e861b7dafc4f"
+    PKG_SHA256="3f9f2bbd0c28be6d7d6eb909823fee5728da023aca0ce37aef3c8f67d1179ec1"
     PKG_URL="https://github.com/rockchip-linux/u-boot/archive/$PKG_VERSION.tar.gz"
     PKG_PATCH_DIRS="rockchip"
     PKG_DEPENDS_TARGET+=" rkbin"

packages/tools/u-boot/patches/rockchip/u-boot-0001-dont-build-libfdt.patch

@@ -1,4 +1,4 @@
-From de094e01bb6876d7025e8c1b665828f6764e2c70 Mon Sep 17 00:00:00 2001
+From 3f028d24ed02173fea0950c28b3192f44e40c2a9 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 2 Dec 2017 11:47:07 +0100
 Subject: [PATCH] dont build libfdt

packages/tools/u-boot/patches/rockchip/u-boot-0002-rockchip-board-save-cpuid-to-env.patch

@@ -1,35 +0,0 @@
-From dfdfa7fb1a50c21a784a67e5f99d8714ca853c07 Mon Sep 17 00:00:00 2001
-From: Jonas Karlman <jonas@kwiboo.se>
-Date: Mon, 20 Aug 2018 22:55:34 +0200
-Subject: [PATCH] rockchip: board: save cpuid to env
-
----
- arch/arm/mach-rockchip/board.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c
-index 233f0b6f9a..6c2021e32a 100644
---- a/arch/arm/mach-rockchip/board.c
-+++ b/arch/arm/mach-rockchip/board.c
-@@ -44,6 +44,7 @@ DECLARE_GLOBAL_DATA_PTR;
- static int rockchip_set_serialno(void)
- {
- 	char serialno_str[VENDOR_SN_MAX];
-+	char cpuid_str[CPUID_LEN * 2 + 1];
- 	int ret = 0, i;
- 	u8 cpuid[CPUID_LEN] = {0};
- 	u8 low[CPUID_LEN / 2], high[CPUID_LEN / 2];
-@@ -89,6 +90,13 @@ static int rockchip_set_serialno(void)
- 		snprintf(serialno_str, sizeof(serialno_str), "%llx", serialno);
- 
- 		env_set("serial#", serialno_str);
-+
-+		memset(cpuid_str, 0, sizeof(cpuid_str));
-+		for (i = 0; i < CPUID_LEN; i++) {
-+			sprintf(&cpuid_str[i * 2], "%02x", cpuid[i]);
-+		}
-+
-+		env_set("cpuid#", cpuid_str);
- #ifdef CONFIG_ROCKCHIP_VENDOR_PARTITION
- 	}
- #endif

packages/tools/u-boot/patches/rockchip/u-boot-0002-rockchip-board-use-efuse-cpuid-to-set-ethaddr.patch

@@ -0,0 +1,99 @@
+From 61b0555d3b8e962f3cac5cf17ab149f4fb318ca3 Mon Sep 17 00:00:00 2001
+From: Jonas Karlman <jonas@kwiboo.se>
+Date: Mon, 20 Aug 2018 22:55:34 +0200
+Subject: [PATCH] rockchip: board: use efuse cpuid to set ethaddr
+
+---
+ arch/arm/mach-rockchip/board.c | 51 ++++++++++++++++++++++++++++++++++
+ 1 file changed, 51 insertions(+)
+
+diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c
+index b56edebf13..155871f5bf 100644
+--- a/arch/arm/mach-rockchip/board.c
++++ b/arch/arm/mach-rockchip/board.c
+@@ -31,6 +31,8 @@
+ #include <mmc.h>
+ #include <of_live.h>
+ #include <dm/root.h>
++#include <hash.h>
++#include <u-boot/sha256.h>
+ 
+ DECLARE_GLOBAL_DATA_PTR;
+ /* define serialno max length, the max length is 512 Bytes
+@@ -44,6 +46,7 @@ DECLARE_GLOBAL_DATA_PTR;
+ static int rockchip_set_serialno(void)
+ {
+ 	char serialno_str[VENDOR_SN_MAX];
++	char cpuid_str[CPUID_LEN * 2 + 1];
+ 	int ret = 0, i;
+ 	u8 cpuid[CPUID_LEN] = {0};
+ 	u8 low[CPUID_LEN / 2], high[CPUID_LEN / 2];
+@@ -73,6 +76,13 @@ static int rockchip_set_serialno(void)
+ 			printf("%s: reading cpuid from the efuses failed\n", __func__);
+ 			return ret;
+ 		}
++
++		memset(cpuid_str, 0, sizeof(cpuid_str));
++		for (i = 0; i < CPUID_LEN; i++) {
++			sprintf(&cpuid_str[i * 2], "%02x", cpuid[i]);
++		}
++
++		env_set("cpuid#", cpuid_str);
+ #else
+ 		/* generate random cpuid */
+ 		for (i = 0; i < CPUID_LEN; i++) {
+@@ -95,6 +105,45 @@ static int rockchip_set_serialno(void)
+ 	return ret;
+ }
+ 
++static void rockchip_set_ethaddr(void)
++{
++#if CONFIG_IS_ENABLED(CMD_NET)
++	int ret;
++	const char *cpuid = env_get("cpuid#");
++	u8 hash[SHA256_SUM_LEN];
++	int size = sizeof(hash);
++	u8 mac_addr[6];
++
++	/* Only generate a MAC address, if none is set in the environment */
++	if (env_get("ethaddr"))
++		return;
++
++	if (!cpuid) {
++		debug("%s: could not retrieve 'cpuid#'\n", __func__);
++		return;
++	}
++
++	ret = hash_block("sha256", (void *)cpuid, strlen(cpuid), hash, &size);
++	if (ret) {
++		debug("%s: failed to calculate SHA256\n", __func__);
++		return;
++	}
++
++	/* Copy 6 bytes of the hash to base the MAC address on */
++	memcpy(mac_addr, hash, 6);
++
++	/* Make this a valid MAC address and set it */
++	mac_addr[0] &= 0xfe;  /* clear multicast bit */
++	mac_addr[0] |= 0x02;  /* set local assignment bit (IEEE802) */
++	eth_env_set_enetaddr("ethaddr", mac_addr);
++
++	/* Make a valid MAC address for eth1 */
++	mac_addr[5] += 0x20;
++	mac_addr[5] &= 0xff;
++	eth_env_set_enetaddr("eth1addr", mac_addr);
++#endif
++}
++
+ #if defined(CONFIG_USB_FUNCTION_FASTBOOT)
+ int fb_set_reboot_flag(void)
+ {
+@@ -162,6 +211,8 @@ int board_late_init(void)
+ #endif
+ 	rockchip_set_serialno();
+ 
++	rockchip_set_ethaddr();
++
+ 	soc_clk_dump();
+ 
+ 	return rk_board_late_init();

packages/tools/u-boot/patches/rockchip/u-boot-0003-rockchip-rk3328-get-serial-and-ethaddr-from-efuse.patch

@@ -1,7 +1,7 @@
-From e44f2ddac6099a0947c4182a0f4296d8df2be4a8 Mon Sep 17 00:00:00 2001
+From c871e961036d58bf1d66b7e79be85777158b7137 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 18 Aug 2018 17:26:35 +0200
-Subject: [PATCH] rockchip: rk3328: add efuse support
+Subject: [PATCH] rockchip: rk3328: get serial and ethaddr from efuse
 
 ---
  arch/arm/dts/rk3328.dtsi     | 14 ++++++++++++++
@@ -9,7 +9,7 @@ Subject: [PATCH] rockchip: rk3328: add efuse support
  2 files changed, 16 insertions(+)
 
 diff --git a/arch/arm/dts/rk3328.dtsi b/arch/arm/dts/rk3328.dtsi
-index 94d39b1b35..35db0ccf4d 100644
+index 670b98d6fa..88cc185b96 100644
 --- a/arch/arm/dts/rk3328.dtsi
 +++ b/arch/arm/dts/rk3328.dtsi
 @@ -341,6 +341,20 @@

packages/tools/u-boot/patches/rockchip/u-boot-0004-rk3328-evb-fix-sdmmc-vmmc-supply.patch

@@ -1,7 +1,7 @@
-From 46d72af5faa7f12a057294356eb353d38c56b5fe Mon Sep 17 00:00:00 2001
+From caec69d5fc737f971439a1dae391c9b3d5ff4c31 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Wed, 10 Jan 2018 19:56:16 +0100
-Subject: [PATCH] rk3328-evb: add sdmmc vmmc-supply
+Subject: [PATCH] rk3328-evb: fix sdmmc vmmc-supply
 
 ---
  arch/arm/dts/rk3328-evb.dts |  7 +++++--
@@ -34,10 +34,10 @@ index aafafec649..497b040f56 100644
  };
  
 diff --git a/arch/arm/dts/rk3328.dtsi b/arch/arm/dts/rk3328.dtsi
-index 35db0ccf4d..231e66788d 100644
+index 88cc185b96..e920d692ff 100644
 --- a/arch/arm/dts/rk3328.dtsi
 +++ b/arch/arm/dts/rk3328.dtsi
-@@ -481,8 +481,9 @@
+@@ -475,8 +475,9 @@
  		compatible = "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc";
  		reg = <0x0 0xff500000 0x0 0x4000>;
  		max-frequency = <150000000>;
@@ -49,7 +49,7 @@ index 35db0ccf4d..231e66788d 100644
  		fifo-depth = <0x100>;
  		interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
  		status = "disabled";
-@@ -504,8 +505,9 @@
+@@ -498,8 +499,9 @@
  		compatible = "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc";
  		reg = <0x0 0xff520000 0x0 0x4000>;
  		max-frequency = <150000000>;

packages/tools/u-boot/patches/rockchip/u-boot-0004-rk3328-evb-get-ethaddr-from-efuse.patch

@@ -1,66 +0,0 @@
-From c4068865306726939489b961fd8e04f9a2a7b1ce Mon Sep 17 00:00:00 2001
-From: Kamil Trzcinski <ayufan@ayufan.eu>
-Date: Sat, 19 Aug 2017 20:38:50 +0200
-Subject: [PATCH] rk3328-evb: get ethaddr from efuse
-
----
- board/rockchip/evb_rk3328/evb-rk3328.c | 49 ++++++++++++++++++++++++++
- 1 file changed, 49 insertions(+)
-
-diff --git a/board/rockchip/evb_rk3328/evb-rk3328.c b/board/rockchip/evb_rk3328/evb-rk3328.c
-index c8e7a3ad64..8829f50327 100644
---- a/board/rockchip/evb_rk3328/evb-rk3328.c
-+++ b/board/rockchip/evb_rk3328/evb-rk3328.c
-@@ -3,3 +3,52 @@
-  *
-  * SPDX-License-Identifier:     GPL-2.0+
-  */
-+
-+#include <common.h>
-+#include <u-boot/sha256.h>
-+
-+static void setup_macaddr(void)
-+{
-+#if CONFIG_IS_ENABLED(CMD_NET)
-+	int ret;
-+	const char *cpuid = env_get("cpuid#");
-+	u8 hash[SHA256_SUM_LEN];
-+	int size = sizeof(hash);
-+	u8 mac_addr[6];
-+
-+	/* Only generate a MAC address, if none is set in the environment */
-+	if (env_get("ethaddr"))
-+		return;
-+
-+	if (!cpuid) {
-+		debug("%s: could not retrieve 'cpuid#'\n", __func__);
-+		return;
-+	}
-+
-+	ret = hash_block("sha256", (void *)cpuid, strlen(cpuid), hash, &size);
-+	if (ret) {
-+		debug("%s: failed to calculate SHA256\n", __func__);
-+		return;
-+	}
-+
-+	/* Copy 6 bytes of the hash to base the MAC address on */
-+	memcpy(mac_addr, hash, 6);
-+
-+	/* Make this a valid MAC address and set it */
-+	mac_addr[0] &= 0xfe;  /* clear multicast bit */
-+	mac_addr[0] |= 0x02;  /* set local assignment bit (IEEE802) */
-+	eth_env_set_enetaddr("ethaddr", mac_addr);
-+
-+	/* Make a valid MAC address for eth1 */
-+	mac_addr[5] += 0x20;
-+	mac_addr[5] &= 0xff;
-+	eth_env_set_enetaddr("eth1addr", mac_addr);
-+#endif
-+}
-+
-+int rk_board_late_init(void)
-+{
-+	setup_macaddr();
-+
-+	return 0;
-+}

packages/tools/u-boot/patches/rockchip/u-boot-0005-rockchip-rk3288-get-serial-and-ethaddr-from-efuse.patch

@@ -1,7 +1,7 @@
-From 180c7b262f17a58de6865b7b7a5df609e1449ce8 Mon Sep 17 00:00:00 2001
+From 050dd4323a9fe8515259fe855c31da6d1ad459e2 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 5 Aug 2018 20:58:54 +0200
-Subject: [PATCH] rockchip: rk3288: add efuse support
+Subject: [PATCH] rockchip: rk3288: get serial and ethaddr from efuse
 
 ---
  arch/arm/dts/rk3288.dtsi        | 5 ++---

packages/tools/u-boot/patches/rockchip/u-boot-0006-rk3399-evb-use-common-get-serial-and-ethaddr-from-ef.patch

@@ -1,18 +1,18 @@
-From ea235722e95630c3d5da5403e660a8bc20e2b8d0 Mon Sep 17 00:00:00 2001
+From 400e9e6b21878e8570ce1cb0242d93baa6c21c99 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 20 Aug 2018 23:01:10 +0200
-Subject: [PATCH] rk3399-evb: fixup get serial and ethaddr from efuse
+Subject: [PATCH] rk3399-evb: use common get serial and ethaddr from efuse
 
 ---
- board/rockchip/evb_rk3399/evb-rk3399.c | 80 +-------------------------
- include/configs/evb_rk3399.h           |  3 -
- 2 files changed, 2 insertions(+), 81 deletions(-)
+ board/rockchip/evb_rk3399/evb-rk3399.c | 119 -------------------------
+ include/configs/evb_rk3399.h           |   3 -
+ 2 files changed, 122 deletions(-)
 
 diff --git a/board/rockchip/evb_rk3399/evb-rk3399.c b/board/rockchip/evb_rk3399/evb-rk3399.c
-index b6f730852a..c0a38d5143 100644
+index b6f730852a..3a6b802a3f 100644
 --- a/board/rockchip/evb_rk3399/evb-rk3399.c
 +++ b/board/rockchip/evb_rk3399/evb-rk3399.c
-@@ -6,13 +6,12 @@
+@@ -6,23 +6,17 @@
  
  #include <common.h>
  #include <dm.h>
@@ -23,11 +23,10 @@ index b6f730852a..c0a38d5143 100644
 -#include <asm/setup.h>
  #include <asm/arch/periph.h>
  #include <power/regulator.h>
-+#include <hash.h>
- #include <u-boot/sha256.h>
+-#include <u-boot/sha256.h>
  #include <usb.h>
  #include <dwc3-uboot.h>
-@@ -20,9 +19,6 @@
+ #include <spl.h>
  
  DECLARE_GLOBAL_DATA_PTR;
  
@@ -37,17 +36,48 @@ index b6f730852a..c0a38d5143 100644
  int rk_board_init(void)
  {
  	struct udevice *pinctrl, *regulator;
-@@ -106,87 +102,15 @@ static void setup_macaddr(void)
- 	mac_addr[0] |= 0x02;  /* set local assignment bit (IEEE802) */
- 	eth_env_set_enetaddr("ethaddr", mac_addr);
- #endif
--
--	return;
+@@ -74,119 +68,6 @@ out:
+ 	return 0;
  }
  
+-static void setup_macaddr(void)
+-{
+-#if CONFIG_IS_ENABLED(CMD_NET)
+-	int ret;
+-	const char *cpuid = env_get("cpuid#");
+-	u8 hash[SHA256_SUM_LEN];
+-	int size = sizeof(hash);
+-	u8 mac_addr[6];
+-
+-	/* Only generate a MAC address, if none is set in the environment */
+-	if (env_get("ethaddr"))
+-		return;
+-
+-	if (!cpuid) {
+-		debug("%s: could not retrieve 'cpuid#'\n", __func__);
+-		return;
+-	}
+-
+-	ret = hash_block("sha256", (void *)cpuid, strlen(cpuid), hash, &size);
+-	if (ret) {
+-		debug("%s: failed to calculate SHA256\n", __func__);
+-		return;
+-	}
+-
+-	/* Copy 6 bytes of the hash to base the MAC address on */
+-	memcpy(mac_addr, hash, 6);
+-
+-	/* Make this a valid MAC address and set it */
+-	mac_addr[0] &= 0xfe;  /* clear multicast bit */
+-	mac_addr[0] |= 0x02;  /* set local assignment bit (IEEE802) */
+-	eth_env_set_enetaddr("ethaddr", mac_addr);
+-#endif
+-
+-	return;
+-}
+-
 -static void setup_serial(void)
-+int rk_board_late_init(void)
- {
+-{
 -#if CONFIG_IS_ENABLED(ROCKCHIP_EFUSE)
 -	struct udevice *dev;
 -	int ret, i;
@@ -102,11 +132,11 @@ index b6f730852a..c0a38d5143 100644
 -int misc_init_r(void)
 -{
 -	setup_serial();
- 	setup_macaddr();
- 
- 	return 0;
- }
- 
+-	setup_macaddr();
+-
+-	return 0;
+-}
+-
 -#ifdef CONFIG_SERIAL_TAG
 -void get_board_serial(struct tag_serialnr *serialnr)
 -{

packages/tools/u-boot/patches/rockchip/u-boot-0007-include-update-log2-header-from-the-Linux-kernel.patch

@@ -1,4 +1,4 @@
-From 37a07ad0222bb19c7fdc03d7679bae47d9875eed Mon Sep 17 00:00:00 2001
+From dd573f1b6c8e9bd09cb9e8573270bce599553feb Mon Sep 17 00:00:00 2001
 From: Heinrich Schuchardt <xypron.glpk@gmx.de>
 Date: Mon, 7 May 2018 22:18:27 +0200
 Subject: [PATCH] include: update log2 header from the Linux kernel

packages/tools/u-boot/patches/rockchip/u-boot-0007-rk3288-miqi-get-ethaddr-from-efuse.patch

@@ -1,73 +0,0 @@
-From 99854fa357a70ce160f7db78c383642c119cbad7 Mon Sep 17 00:00:00 2001
-From: Jonas Karlman <jonas@kwiboo.se>
-Date: Sun, 5 Aug 2018 20:58:54 +0200
-Subject: [PATCH] rk3288-miqi: get ethaddr from efuse
-
----
- board/mqmaker/miqi_rk3288/miqi-rk3288.c | 43 +++++++++++++++++++++++++
- configs/miqi-rk3288_defconfig           |  1 -
- 2 files changed, 43 insertions(+), 1 deletion(-)
-
-diff --git a/board/mqmaker/miqi_rk3288/miqi-rk3288.c b/board/mqmaker/miqi_rk3288/miqi-rk3288.c
-index 846deddb80..f719218eb6 100644
---- a/board/mqmaker/miqi_rk3288/miqi-rk3288.c
-+++ b/board/mqmaker/miqi_rk3288/miqi-rk3288.c
-@@ -6,3 +6,46 @@
- 
- #include <common.h>
- #include <spl.h>
-+#include <hash.h>
-+#include <u-boot/sha256.h>
-+
-+static void setup_macaddr(void)
-+{
-+#if CONFIG_IS_ENABLED(CMD_NET)
-+	int ret;
-+	const char *cpuid = env_get("cpuid#");
-+	u8 hash[SHA256_SUM_LEN];
-+	int size = sizeof(hash);
-+	u8 mac_addr[6];
-+
-+	/* Only generate a MAC address, if none is set in the environment */
-+	if (env_get("ethaddr"))
-+		return;
-+
-+	if (!cpuid) {
-+		debug("%s: could not retrieve 'cpuid#'\n", __func__);
-+		return;
-+	}
-+
-+	ret = hash_block("sha256", (void *)cpuid, strlen(cpuid), hash, &size);
-+	if (ret) {
-+		debug("%s: failed to calculate SHA256\n", __func__);
-+		return;
-+	}
-+
-+	/* Copy 6 bytes of the hash to base the MAC address on */
-+	memcpy(mac_addr, hash, 6);
-+
-+	/* Make this a valid MAC address and set it */
-+	mac_addr[0] &= 0xfe;  /* clear multicast bit */
-+	mac_addr[0] |= 0x02;  /* set local assignment bit (IEEE802) */
-+	eth_env_set_enetaddr("ethaddr", mac_addr);
-+#endif
-+}
-+
-+int rk3288_board_late_init(void)
-+{
-+	setup_macaddr();
-+
-+	return 0;
-+}
-diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig
-index ffbe701cfd..746d8035ee 100644
---- a/configs/miqi-rk3288_defconfig
-+++ b/configs/miqi-rk3288_defconfig
-@@ -36,7 +36,6 @@ CONFIG_SPL_PARTITION_UUIDS=y
- CONFIG_SPL_OF_CONTROL=y
- CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
- CONFIG_ENV_IS_IN_MMC=y
--CONFIG_NET_RANDOM_ETHADDR=y
- CONFIG_REGMAP=y
- CONFIG_SPL_REGMAP=y
- CONFIG_SYSCON=y

packages/tools/u-boot/patches/rockchip/u-boot-0008-rockchip-disable-android-boot-and-config.patch

@@ -1,4 +1,4 @@
-From 1ba76e3eb47e865d84e42a6b5484516ef4457bf7 Mon Sep 17 00:00:00 2001
+From d0c3abbbecfe69a73b157451857ca061870ec49b Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 18 Aug 2018 17:27:32 +0200
 Subject: [PATCH] rockchip: disable android boot and config
@@ -6,11 +6,11 @@ Subject: [PATCH] rockchip: disable android boot and config
 ---
  arch/arm/mach-rockchip/boot_mode.c |  2 +-
  configs/evb-rk3328_defconfig       |  5 ++---
- configs/evb-rk3399_defconfig       | 14 --------------
+ configs/evb-rk3399_defconfig       | 17 +----------------
  configs/miqi-rk3288_defconfig      | 12 +-----------
  configs/tinker-rk3288_defconfig    |  3 ---
  include/configs/rockchip-common.h  |  2 --
- 6 files changed, 4 insertions(+), 34 deletions(-)
+ 6 files changed, 5 insertions(+), 36 deletions(-)
 
 diff --git a/arch/arm/mach-rockchip/boot_mode.c b/arch/arm/mach-rockchip/boot_mode.c
 index 8a20a3a31e..9441c49477 100644
@@ -56,10 +56,10 @@ index 0897a28e1d..85ee85741e 100644
  CONFIG_DM_PMIC=y
  CONFIG_PMIC_RK8XX=y
 diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig
-index 305f0a405d..bd86db31af 100644
+index 305f0a405d..96aa34b2c0 100644
 --- a/configs/evb-rk3399_defconfig
 +++ b/configs/evb-rk3399_defconfig
-@@ -5,8 +5,6 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
+@@ -5,16 +5,14 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
  CONFIG_SYS_MALLOC_F_LEN=0x4000
  CONFIG_ROCKCHIP_RK3399=y
  CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x4000
@@ -68,7 +68,8 @@ index 305f0a405d..bd86db31af 100644
  CONFIG_SPL_STACK_R_ADDR=0x80000
  CONFIG_DEFAULT_DEVICE_TREE="rk3399-evb"
  CONFIG_DEBUG_UART=y
-@@ -14,7 +12,6 @@ CONFIG_FIT=y
++# CONFIG_ANDROID_BOOT_IMAGE is not set
+ CONFIG_FIT=y
  CONFIG_SPL_LOAD_FIT=y
  CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.py"
  # CONFIG_DISPLAY_CPUINFO is not set
@@ -76,7 +77,7 @@ index 305f0a405d..bd86db31af 100644
  CONFIG_SPL_STACK_R=y
  CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x4000
  CONFIG_SPL_ATF=y
-@@ -26,9 +23,6 @@ CONFIG_FASTBOOT_FLASH_MMC_DEV=0
+@@ -26,18 +24,13 @@ CONFIG_FASTBOOT_FLASH_MMC_DEV=0
  CONFIG_CMD_BOOTZ=y
  # CONFIG_CMD_IMLS is not set
  CONFIG_CMD_GPT=y
@@ -86,7 +87,16 @@ index 305f0a405d..bd86db31af 100644
  CONFIG_CMD_MMC=y
  CONFIG_CMD_SF=y
  CONFIG_CMD_USB=y
-@@ -94,13 +88,5 @@ CONFIG_USB_ETHER_ASIX88179=y
+ CONFIG_CMD_USB_MASS_STORAGE=y
+ # CONFIG_CMD_SETEXPR is not set
+ CONFIG_CMD_TIME=y
+-CONFIG_RKPARM_PARTITION=y
+ CONFIG_SPL_OF_CONTROL=y
+-CONFIG_OF_LIVE=y
+ CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+ CONFIG_NET_RANDOM_ETHADDR=y
+ CONFIG_REGMAP=y
+@@ -94,13 +87,5 @@ CONFIG_USB_ETHER_ASIX88179=y
  CONFIG_USB_ETHER_MCS7830=y
  CONFIG_USB_ETHER_RTL8152=y
  CONFIG_USB_ETHER_SMSC95XX=y
@@ -101,7 +111,7 @@ index 305f0a405d..bd86db31af 100644
  CONFIG_USE_TINY_PRINTF=y
  CONFIG_ERRNO_STR=y
 diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig
-index 746d8035ee..4826581bf7 100644
+index ffbe701cfd..0aa4c903e4 100644
 --- a/configs/miqi-rk3288_defconfig
 +++ b/configs/miqi-rk3288_defconfig
 @@ -3,12 +3,11 @@ CONFIG_ARCH_ROCKCHIP=y
@@ -129,7 +139,7 @@ index 746d8035ee..4826581bf7 100644
  CONFIG_CMD_MMC=y
  CONFIG_CMD_SF=y
  CONFIG_CMD_SPI=y
-@@ -79,11 +74,6 @@ CONFIG_G_DNL_PRODUCT_NUM=0x320a
+@@ -80,11 +75,6 @@ CONFIG_G_DNL_PRODUCT_NUM=0x320a
  CONFIG_USB_HOST_ETHER=y
  CONFIG_USB_ETHER_ASIX=y
  CONFIG_USB_ETHER_SMSC95XX=y
@@ -168,10 +178,10 @@ index 0afc0a35e1..a6f8c0cb51 100644
  CONFIG_CMD_SF=y
  CONFIG_CMD_SPI=y
 diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
-index 38ff08a57f..1e8f6c344e 100644
+index f159cbddf3..75a0963953 100644
 --- a/include/configs/rockchip-common.h
 +++ b/include/configs/rockchip-common.h
-@@ -99,8 +99,6 @@
+@@ -105,8 +105,6 @@
  	"fi; \0"
  
  #define RKIMG_BOOTCOMMAND \

packages/tools/u-boot/patches/rockchip/u-boot-0009-configs-sync-rk3288-rk3328-and-rk3399-defconfig.patch

@@ -0,0 +1,107 @@
+From b9d513e7d18f16cb06ef93a109fb5755f695cb60 Mon Sep 17 00:00:00 2001
+From: Jonas Karlman <jonas@kwiboo.se>
+Date: Wed, 29 Aug 2018 23:03:07 +0200
+Subject: [PATCH] configs: sync rk3288, rk3328 and rk3399 defconfig
+
+---
+ configs/evb-rk3328_defconfig    | 6 +++++-
+ configs/evb-rk3399_defconfig    | 5 +++++
+ configs/miqi-rk3288_defconfig   | 1 -
+ configs/tinker-rk3288_defconfig | 2 +-
+ 4 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/configs/evb-rk3328_defconfig b/configs/evb-rk3328_defconfig
+index 85ee85741e..4388ba32e0 100644
+--- a/configs/evb-rk3328_defconfig
++++ b/configs/evb-rk3328_defconfig
+@@ -29,16 +29,20 @@ CONFIG_FASTBOOT_FLASH=y
+ CONFIG_FASTBOOT_FLASH_MMC_DEV=1
+ CONFIG_CMD_BOOTZ=y
+ # CONFIG_CMD_IMLS is not set
++CONFIG_CMD_GPIO=y
+ CONFIG_CMD_GPT=y
+ CONFIG_CMD_MMC=y
++CONFIG_CMD_SF=y
+ CONFIG_CMD_USB=y
++CONFIG_CMD_USB_MASS_STORAGE=y
+ # CONFIG_CMD_SETEXPR is not set
+ CONFIG_CMD_TIME=y
++CONFIG_CMD_PMIC=y
++CONFIG_CMD_REGULATOR=y
+ CONFIG_SPL_OF_CONTROL=y
+ CONFIG_TPL_OF_CONTROL=y
+ CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+ CONFIG_TPL_OF_PLATDATA=y
+-CONFIG_ENV_IS_IN_MMC=y
+ CONFIG_NET_RANDOM_ETHADDR=y
+ CONFIG_TPL_DM=y
+ CONFIG_REGMAP=y
+diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig
+index 96aa34b2c0..84b14a0a6a 100644
+--- a/configs/evb-rk3399_defconfig
++++ b/configs/evb-rk3399_defconfig
+@@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3399-evb"
+ CONFIG_DEBUG_UART=y
+ # CONFIG_ANDROID_BOOT_IMAGE is not set
+ CONFIG_FIT=y
++CONFIG_FIT_VERBOSE=y
+ CONFIG_SPL_LOAD_FIT=y
+ CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.py"
+ # CONFIG_DISPLAY_CPUINFO is not set
+@@ -23,6 +24,7 @@ CONFIG_FASTBOOT_FLASH=y
+ CONFIG_FASTBOOT_FLASH_MMC_DEV=0
+ CONFIG_CMD_BOOTZ=y
+ # CONFIG_CMD_IMLS is not set
++CONFIG_CMD_GPIO=y
+ CONFIG_CMD_GPT=y
+ CONFIG_CMD_MMC=y
+ CONFIG_CMD_SF=y
+@@ -30,6 +32,8 @@ CONFIG_CMD_USB=y
+ CONFIG_CMD_USB_MASS_STORAGE=y
+ # CONFIG_CMD_SETEXPR is not set
+ CONFIG_CMD_TIME=y
++CONFIG_CMD_PMIC=y
++CONFIG_CMD_REGULATOR=y
+ CONFIG_SPL_OF_CONTROL=y
+ CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+ CONFIG_NET_RANDOM_ETHADDR=y
+@@ -41,6 +45,7 @@ CONFIG_CLK=y
+ CONFIG_SPL_CLK=y
+ CONFIG_ROCKCHIP_GPIO=y
+ CONFIG_SYS_I2C_ROCKCHIP=y
++CONFIG_DM_KEY=y
+ CONFIG_MISC=y
+ CONFIG_ROCKCHIP_EFUSE=y
+ CONFIG_MMC_DW=y
+diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig
+index 0aa4c903e4..9559fcbaa2 100644
+--- a/configs/miqi-rk3288_defconfig
++++ b/configs/miqi-rk3288_defconfig
+@@ -30,7 +30,6 @@ CONFIG_CMD_REGULATOR=y
+ CONFIG_SPL_PARTITION_UUIDS=y
+ CONFIG_SPL_OF_CONTROL=y
+ CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+-CONFIG_ENV_IS_IN_MMC=y
+ CONFIG_NET_RANDOM_ETHADDR=y
+ CONFIG_REGMAP=y
+ CONFIG_SPL_REGMAP=y
+diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig
+index a6f8c0cb51..9c4a9f47cf 100644
+--- a/configs/tinker-rk3288_defconfig
++++ b/configs/tinker-rk3288_defconfig
+@@ -32,7 +32,6 @@ CONFIG_CMD_REGULATOR=y
+ CONFIG_SPL_PARTITION_UUIDS=y
+ CONFIG_SPL_OF_CONTROL=y
+ CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+-CONFIG_ENV_IS_IN_MMC=y
+ CONFIG_REGMAP=y
+ CONFIG_SPL_REGMAP=y
+ CONFIG_SYSCON=y
+@@ -42,6 +41,7 @@ CONFIG_CLK=y
+ CONFIG_SPL_CLK=y
+ CONFIG_ROCKCHIP_GPIO=y
+ CONFIG_SYS_I2C_ROCKCHIP=y
++CONFIG_DM_KEY=y
+ CONFIG_MISC=y
+ CONFIG_ROCKCHIP_EFUSE=y
+ CONFIG_I2C_EEPROM=y

packages/tools/u-boot/patches/rockchip/u-boot-0010-rk3288-tinker-enable-emmc.patch

@@ -0,0 +1,59 @@
+From a973521ff1cbee88498db1b75ce935fca55642fb Mon Sep 17 00:00:00 2001
+From: Jonas Karlman <jonas@kwiboo.se>
+Date: Thu, 13 Sep 2018 22:23:48 +0200
+Subject: [PATCH] rk3288-tinker: enable emmc
+
+---
+ arch/arm/dts/rk3288-tinker.dtsi | 13 +++++++++++++
+ include/configs/tinker_rk3288.h | 13 ++++---------
+ 2 files changed, 17 insertions(+), 9 deletions(-)
+
+diff --git a/arch/arm/dts/rk3288-tinker.dtsi b/arch/arm/dts/rk3288-tinker.dtsi
+index 81f8d5a6c3..93e5dd223b 100644
+--- a/arch/arm/dts/rk3288-tinker.dtsi
++++ b/arch/arm/dts/rk3288-tinker.dtsi
+@@ -129,6 +129,19 @@
+ 	cpu0-supply = <&vdd_cpu>;
+ };
+ 
++&emmc {
++	bus-width = <8>;
++	cap-mmc-highspeed;
++	disable-wp;
++	mmc-ddr-1_8v;
++	mmc-hs200-1_8v;
++	non-removable;
++	num-slots = <1>;
++	pinctrl-names = "default";
++	pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_pwr &emmc_bus8>;
++	status = "okay";
++};
++
+ &sdmmc {
+ 	bus-width = <4>;
+ 	cap-mmc-highspeed;
+diff --git a/include/configs/tinker_rk3288.h b/include/configs/tinker_rk3288.h
+index 58eea3c405..42878ed8fa 100644
+--- a/include/configs/tinker_rk3288.h
++++ b/include/configs/tinker_rk3288.h
+@@ -7,16 +7,11 @@
+ #ifndef __CONFIG_H
+ #define __CONFIG_H
+ 
+-#define ROCKCHIP_DEVICE_SETTINGS
+-#include <configs/rk3288_common.h>
+-
+-#undef BOOT_TARGET_DEVICES
++#define ROCKCHIP_DEVICE_SETTINGS \
++		"stdout=serial,vidconsole\0" \
++		"stderr=serial,vidconsole\0"
+ 
+-#define BOOT_TARGET_DEVICES(func) \
+-	func(MMC, mmc, 1) \
+-	func(USB, usb, 0) \
+-	func(PXE, pxe, na) \
+-	func(DHCP, dchp, na)
++#include <configs/rk3288_common.h>
+ 
+ #define CONFIG_SYS_MMC_ENV_DEV 1
+ 

packages/tools/u-boot/patches/rockchip/u-boot-0011-Revert-rockchip-dts-rk3328-evb-Enable-gmac2io-for-rk.patch

@@ -0,0 +1,68 @@
+From a230a5d8c54457df420907c3c8790ec0fd7004c3 Mon Sep 17 00:00:00 2001
+From: Jonas Karlman <jonas@kwiboo.se>
+Date: Sun, 16 Sep 2018 11:56:50 +0200
+Subject: [PATCH] Revert "rockchip: dts: rk3328-evb: Enable gmac2io for
+ rk3328-evb"
+
+This reverts commit 895e4b943b18d21b2c0c5c24f04bcc626bc3ad91.
+
+Fixes SDIO issue on RockBox
+---
+ arch/arm/dts/rk3328-evb.dts | 30 ------------------------------
+ 1 file changed, 30 deletions(-)
+
+diff --git a/arch/arm/dts/rk3328-evb.dts b/arch/arm/dts/rk3328-evb.dts
+index 497b040f56..6a5225b48c 100644
+--- a/arch/arm/dts/rk3328-evb.dts
++++ b/arch/arm/dts/rk3328-evb.dts
+@@ -17,13 +17,6 @@
+ 		stdout-path = &uart2;
+ 	};
+ 
+-	gmac_clkin: external-gmac-clock {
+-		compatible = "fixed-clock";
+-		clock-frequency = <125000000>;
+-		clock-output-names = "gmac_clkin";
+-		#clock-cells = <0>;
+-	};
+-
+ 	vcc3v3_sdmmc: sdmmc-pwren {
+ 		compatible = "regulator-fixed";
+ 		regulator-name = "vcc3v3";
+@@ -51,13 +44,6 @@
+ 		regulator-min-microvolt = <5000000>;
+ 		regulator-max-microvolt = <5000000>;
+ 	};
+-
+-	vcc_phy: vcc-phy-regulator {
+-		compatible = "regulator-fixed";
+-		regulator-name = "vcc_phy";
+-		regulator-always-on;
+-		regulator-boot-on;
+-	};
+ };
+ 
+ &saradc {
+@@ -93,22 +79,6 @@
+ 	status = "okay";
+ };
+ 
+-&gmac2io {
+-	phy-supply = <&vcc_phy>;
+-	phy-mode = "rgmii";
+-	clock_in_out = "input";
+-	snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;
+-	snps,reset-active-low;
+-	snps,reset-delays-us = <0 10000 50000>;
+-	assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>;
+-	assigned-clock-parents = <&gmac_clkin>, <&gmac_clkin>;
+-	pinctrl-names = "default";
+-	pinctrl-0 = <&rgmiim1_pins>;
+-	tx_delay = <0x26>;
+-	rx_delay = <0x11>;
+-	status = "okay";
+-};
+-
+ &u2phy {
+         status = "okay";
+ };

projects/Rockchip/bootloader/install

@@ -20,14 +20,14 @@ case "$PKG_SOC" in
     ;;
   rk3328)
     PKG_DATAFILE="$PKG_RKBIN/rk33/rk3328_ddr_786MHz_v1.13.bin"
-    PKG_LOADER="$PKG_RKBIN/rk33/rk3328_miniloader_v2.46.bin"
+    PKG_LOADER="$PKG_RKBIN/rk33/rk3328_miniloader_v2.49.bin"
     PKG_BL31="$PKG_RKBIN/rk33/rk3328_bl31_v1.39.bin"
     PKG_LOAD_ADDR="0x200000"
     ;;
   rk3399)
-    PKG_DATAFILE="$PKG_RKBIN/rk33/rk3399_ddr_800MHz_v1.13.bin"
-    PKG_LOADER="$PKG_RKBIN/rk33/rk3399_miniloader_v1.12.bin"
-    PKG_BL31="$PKG_RKBIN/rk33/rk3399_bl31_v1.17.elf"
+    PKG_DATAFILE="$PKG_RKBIN/rk33/rk3399_ddr_800MHz_v1.14.bin"
+    PKG_LOADER="$PKG_RKBIN/rk33/rk3399_miniloader_v1.15.bin"
+    PKG_BL31="$PKG_RKBIN/rk33/rk3399_bl31_v1.18.elf"
     PKG_LOAD_ADDR="0x200000"
     ;;
   *)

projects/Rockchip/devices/MiQi/linux/rockchip-4.4/linux.arm.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.4.143 Kernel Configuration
+# Linux/arm 4.4.154 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -534,6 +534,7 @@ CONFIG_ZSMALLOC=m
 CONFIG_PGTABLE_MAPPING=y
 # CONFIG_ZSMALLOC_STAT is not set
 # CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_FRAME_VECTOR=y
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_UACCESS_WITH_MEMCPY is not set
@@ -1452,6 +1453,7 @@ CONFIG_RT2X00_LIB_LEDS=y
 CONFIG_WL_ROCKCHIP=y
 CONFIG_WIFI_BUILD_MODULE=y
 # CONFIG_WIFI_LOAD_DRIVER_WHEN_KERNEL_BOOTUP is not set
+# CONFIG_WIFI_GENERATE_RANDOM_MAC_ADDR is not set
 # CONFIG_AP6XXX is not set
 # CONFIG_CYW_BCMDHD is not set
 CONFIG_RTL_WIRELESS_SOLUTION=y
@@ -1630,6 +1632,7 @@ CONFIG_TOUCHSCREEN_ELAN=y
 # CONFIG_TOUCHSCREEN_TOUCHWIN is not set
 # CONFIG_TOUCHSCREEN_PIXCIR is not set
 # CONFIG_TOUCHSCREEN_WDT87XX_I2C is not set
+# CONFIG_TOUCHSCREEN_WM97XX is not set
 CONFIG_TOUCHSCREEN_USB_COMPOSITE=y
 CONFIG_TOUCHSCREEN_USB_EGALAX=y
 CONFIG_TOUCHSCREEN_USB_PANJIT=y
@@ -1655,6 +1658,7 @@ CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
 # CONFIG_TOUCHSCREEN_TSC2007 is not set
 # CONFIG_TOUCHSCREEN_ST1232 is not set
+# CONFIG_TOUCHSCREEN_SUR40 is not set
 # CONFIG_TOUCHSCREEN_SX8654 is not set
 # CONFIG_TOUCHSCREEN_TPS6507X is not set
 # CONFIG_TOUCHSCREEN_ZFORCE is not set
@@ -1684,7 +1688,7 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_YEALINK is not set
 # CONFIG_INPUT_CM109 is not set
 # CONFIG_INPUT_REGULATOR_HAPTIC is not set
-# CONFIG_INPUT_RK8XX_PWRKEY is not set
+CONFIG_INPUT_RK8XX_PWRKEY=y
 CONFIG_INPUT_UINPUT=y
 CONFIG_INPUT_GPIO=y
 # CONFIG_INPUT_PCF8574 is not set
@@ -1783,6 +1787,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
 CONFIG_HW_RANDOM_TPM=y
+# CONFIG_HW_RANDOM_ROCKCHIP is not set
 # CONFIG_R3964 is not set
 # CONFIG_RAW_DRIVER is not set
 CONFIG_TCG_TPM=y
@@ -2249,6 +2254,7 @@ CONFIG_MFD_CROS_EC_SPI=y
 # CONFIG_MFD_VIPERBOARD is not set
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_PCF50633 is not set
+# CONFIG_UCB1400_CORE is not set
 # CONFIG_MFD_PM8921_CORE is not set
 # CONFIG_MFD_RT5033 is not set
 # CONFIG_MFD_RTSX_USB is not set
@@ -2340,40 +2346,53 @@ CONFIG_REGULATOR_TPS6586X=y
 # CONFIG_REGULATOR_XZ3216 is not set
 CONFIG_CEC_CORE=y
 CONFIG_CEC_NOTIFIER=y
-CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_SUPPORT=m
 
 #
 # Multimedia core support
 #
-# CONFIG_MEDIA_CAMERA_SUPPORT is not set
-# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
-# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 # CONFIG_MEDIA_RADIO_SUPPORT is not set
 # CONFIG_MEDIA_SDR_SUPPORT is not set
 CONFIG_MEDIA_RC_SUPPORT=y
 CONFIG_MEDIA_CEC_SUPPORT=y
-CONFIG_MEDIA_CEC_RC=y
+# CONFIG_MEDIA_CONTROLLER is not set
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2=m
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_TTPCI_EEPROM is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEOBUF_DVB=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_DVB_CORE=m
+CONFIG_DVB_NET=y
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_MAX_ADAPTERS=32
+# CONFIG_DVB_DYNAMIC_MINORS is not set
 
 #
 # Media drivers
 #
-CONFIG_RC_CORE=y
-CONFIG_RC_MAP=y
+CONFIG_RC_CORE=m
+CONFIG_RC_MAP=m
 CONFIG_RC_DECODERS=y
-CONFIG_LIRC=y
-CONFIG_IR_LIRC_CODEC=y
-CONFIG_IR_NEC_DECODER=y
-CONFIG_IR_RC5_DECODER=y
-CONFIG_IR_RC6_DECODER=y
-CONFIG_IR_JVC_DECODER=y
-CONFIG_IR_SONY_DECODER=y
-CONFIG_IR_SANYO_DECODER=y
-CONFIG_IR_SHARP_DECODER=y
-CONFIG_IR_MCE_KBD_DECODER=y
-CONFIG_IR_XMP_DECODER=y
+CONFIG_LIRC=m
+CONFIG_IR_LIRC_CODEC=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_SHARP_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_XMP_DECODER=m
 CONFIG_RC_DEVICES=y
 CONFIG_RC_ATI_REMOTE=m
 CONFIG_IR_HIX5HD2=m
@@ -2385,30 +2404,337 @@ CONFIG_IR_IGORPLUGUSB=m
 CONFIG_IR_IGUANA=m
 CONFIG_IR_TTUSBIR=m
 # CONFIG_RC_LOOPBACK is not set
-CONFIG_IR_GPIO_CIR=y
+CONFIG_IR_GPIO_CIR=m
 CONFIG_MEDIA_USB_SUPPORT=y
 
+#
+# Webcam devices
+#
+# CONFIG_USB_VIDEO_CLASS is not set
+# CONFIG_USB_GSPCA is not set
+# CONFIG_USB_PWC is not set
+# CONFIG_VIDEO_CPIA2 is not set
+# CONFIG_USB_ZR364XX is not set
+# CONFIG_USB_STKWEBCAM is not set
+# CONFIG_USB_S2255 is not set
+CONFIG_VIDEO_USBTV=m
+
+#
+# Analog TV USB devices
+#
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_VIDEO_STK1160_COMMON=m
+# CONFIG_VIDEO_STK1160_AC97 is not set
+CONFIG_VIDEO_STK1160=m
+# CONFIG_VIDEO_GO7007 is not set
+
+#
+# Analog/digital TV USB devices
+#
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
+CONFIG_VIDEO_AU0828_RC=y
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+# CONFIG_VIDEO_CX231XX_ALSA is not set
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_TM6000=m
+# CONFIG_VIDEO_TM6000_ALSA is not set
+CONFIG_VIDEO_TM6000_DVB=m
+
+#
+# Digital TV USB devices
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_FRIIO=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_DVBSKY=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
+CONFIG_DVB_AS102=m
+
+#
+# Webcam, TV (analog/digital) USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+# CONFIG_VIDEO_EM28XX_V4L2 is not set
+# CONFIG_VIDEO_EM28XX_ALSA is not set
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+
 #
 # USB HDMI CEC adapters
 #
-CONFIG_USB_PULSE8_CEC=y
-CONFIG_USB_RAINSHADOW_CEC=y
+CONFIG_USB_PULSE8_CEC=m
+CONFIG_USB_RAINSHADOW_CEC=m
+# CONFIG_V4L_PLATFORM_DRIVERS is not set
+# CONFIG_V4L_MEM2MEM_DRIVERS is not set
+# CONFIG_V4L_TEST_DRIVERS is not set
+# CONFIG_DVB_PLATFORM_DRIVERS is not set
 # CONFIG_ROCKCHIP_TSP is not set
 
 #
 # Supported MMC/SDIO adapters
 #
-# CONFIG_CYPRESS_FIRMWARE is not set
+# CONFIG_SMS_SDIO_DRV is not set
+CONFIG_MEDIA_COMMON_OPTIONS=y
+
+#
+# common driver options
+#
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_CYPRESS_FIRMWARE=m
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
 
 #
 # Media ancillary drivers (tuners, sensors, i2c, frontends)
 #
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_MEDIA_ATTACH=y
+CONFIG_VIDEO_IR_I2C=m
 
 #
-# Customise DVB Frontends
+# Audio decoders, processors and mixers
 #
-# CONFIG_DVB_TUNER_DIB0070 is not set
-# CONFIG_DVB_TUNER_DIB0090 is not set
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_WM8775=m
+
+#
+# RDS decoders
+#
+
+#
+# Video decoders
+#
+CONFIG_VIDEO_SAA711X=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_CX25840=m
+
+#
+# Video encoders
+#
+
+#
+# Camera sensor devices
+#
+
+#
+# Flash devices
+#
+
+#
+# Video improvement chips
+#
+
+#
+# Camera lens devices
+#
+
+#
+# Audio/Video compression chips
+#
+
+#
+# Miscellaneous helper chips
+#
+
+#
+# Sensors used on soc_camera driver
+#
+CONFIG_MEDIA_TUNER=m
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2063=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_MEDIA_TUNER_SI2157=m
+CONFIG_MEDIA_TUNER_IT913X=m
+CONFIG_MEDIA_TUNER_R820T=m
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV6110x=m
+CONFIG_DVB_M88DS3103=m
+
+#
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+CONFIG_DVB_SI2165=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_CX24120=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_TS2020=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_TDA10071=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_DRXD=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_RTL2830=m
+CONFIG_DVB_RTL2832=m
+CONFIG_DVB_SI2168=m
+CONFIG_DVB_AS102_FE=m
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LGDT3306A=m
+CONFIG_DVB_LG2160=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
+CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_S921=m
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+
+#
+# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
+#
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_DRX39XYJ=m
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_LNBP22=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_A8293=m
+CONFIG_DVB_SP2=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_IX2505V=m
+CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_AF9033=m
 
 #
 # Tools to develop new frontends
@@ -2445,6 +2771,7 @@ CONFIG_DRM_ROCKCHIP=y
 # CONFIG_ROCKCHIP_CDN_DP is not set
 CONFIG_ROCKCHIP_DW_HDMI=y
 CONFIG_ROCKCHIP_DW_MIPI_DSI=y
+CONFIG_ROCKCHIP_MIPI_CSI_TX=y
 CONFIG_ROCKCHIP_ANALOGIX_DP=y
 CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_ROCKCHIP_LVDS=y
@@ -2592,7 +2919,7 @@ CONFIG_RK_VCODEC=y
 #
 # IEP
 #
-# CONFIG_IEP is not set
+CONFIG_IEP=y
 # CONFIG_IEP_MMU is not set
 
 #
@@ -2642,11 +2969,13 @@ CONFIG_SND_MAX_CARDS=32
 # CONFIG_SND_PROC_FS is not set
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
 CONFIG_SND_RAWMIDI_SEQ=m
 # CONFIG_SND_OPL3_LIB_SEQ is not set
 # CONFIG_SND_OPL4_LIB_SEQ is not set
 # CONFIG_SND_SBAWE_SEQ is not set
 # CONFIG_SND_EMU10K1_SEQ is not set
+CONFIG_SND_AC97_CODEC=m
 CONFIG_SND_DRIVERS=y
 # CONFIG_SND_DUMMY is not set
 # CONFIG_SND_ALOOP is not set
@@ -2654,6 +2983,7 @@ CONFIG_SND_DRIVERS=y
 # CONFIG_SND_MTPAV is not set
 # CONFIG_SND_SERIAL_U16550 is not set
 # CONFIG_SND_MPU401 is not set
+# CONFIG_SND_AC97_POWER_SAVE is not set
 
 #
 # HD-Audio
@@ -2806,6 +3136,7 @@ CONFIG_SND_SOC_TS3A227E=y
 # CONFIG_SND_SOC_TPA6130A2 is not set
 CONFIG_SND_SIMPLE_CARD=y
 # CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
 
 #
 # HID support
@@ -3129,12 +3460,14 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # CONFIG_USB_NET2272 is not set
 # CONFIG_USB_GADGET_XILINX is not set
 # CONFIG_USB_DUMMY_HCD is not set
-CONFIG_USB_LIBCOMPOSITE=y
-CONFIG_USB_F_MASS_STORAGE=y
-CONFIG_USB_F_FS=y
-CONFIG_USB_CONFIGFS=y
+CONFIG_USB_LIBCOMPOSITE=m
+CONFIG_USB_F_ACM=m
+CONFIG_USB_U_SERIAL=m
+CONFIG_USB_F_MASS_STORAGE=m
+CONFIG_USB_F_FS=m
+CONFIG_USB_CONFIGFS=m
 # CONFIG_USB_CONFIGFS_SERIAL is not set
-# CONFIG_USB_CONFIGFS_ACM is not set
+CONFIG_USB_CONFIGFS_ACM=y
 # CONFIG_USB_CONFIGFS_OBEX is not set
 # CONFIG_USB_CONFIGFS_NCM is not set
 # CONFIG_USB_CONFIGFS_ECM is not set
@@ -3151,6 +3484,7 @@ CONFIG_USB_CONFIGFS_UEVENT=y
 # CONFIG_USB_CONFIGFS_F_UAC2 is not set
 # CONFIG_USB_CONFIGFS_F_MIDI is not set
 # CONFIG_USB_CONFIGFS_F_HID is not set
+# CONFIG_USB_CONFIGFS_F_UVC is not set
 # CONFIG_USB_CONFIGFS_F_PRINTER is not set
 # CONFIG_USB_ZERO is not set
 # CONFIG_USB_AUDIO is not set
@@ -3167,6 +3501,7 @@ CONFIG_USB_CONFIGFS_UEVENT=y
 # CONFIG_USB_G_MULTI is not set
 # CONFIG_USB_G_HID is not set
 # CONFIG_USB_G_DBGP is not set
+# CONFIG_USB_G_WEBCAM is not set
 
 #
 # ROCKCHIP USB Support
@@ -3301,6 +3636,7 @@ CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_DRV_HYM8563=y
 # CONFIG_RTC_DRV_MAX6900 is not set
 CONFIG_RTC_DRV_RK808=y
+# CONFIG_RTC_DRV_RK_TIMER is not set
 # CONFIG_RTC_DRV_RS5C372 is not set
 # CONFIG_RTC_DRV_ISL1208 is not set
 # CONFIG_RTC_DRV_ISL12022 is not set
@@ -3611,6 +3947,7 @@ CONFIG_CPU_RK3288=y
 # CONFIG_CPU_RK322X is not set
 # CONFIG_CPU_RV110X is not set
 # CONFIG_CPU_PX30 is not set
+# CONFIG_CPU_RK1808 is not set
 # CONFIG_CPU_RK3308 is not set
 # CONFIG_CPU_RK3328 is not set
 # CONFIG_CPU_RK3366 is not set
@@ -3619,6 +3956,7 @@ CONFIG_CPU_RK3288=y
 CONFIG_ANDROID_VERSION=0x07010000
 CONFIG_ROCKCHIP_CPUINFO=y
 # CONFIG_ROCKCHIP_DEVICEINFO is not set
+CONFIG_ROCKCHIP_OPP=y
 # CONFIG_ROCKCHIP_PM_TEST is not set
 CONFIG_ROCKCHIP_GRF=y
 CONFIG_ROCKCHIP_PM_DOMAINS=y

projects/Rockchip/devices/RK3328/options

@@ -37,4 +37,8 @@
     MALI_FAMILY="450"
 
   # kernel serial console
-    EXTRA_CMDLINE="console=uart8250,mmio32,0xff130000 console=tty0"
+    if [ "$UBOOT_SYSTEM" = "box-trn9" ]; then
+      EXTRA_CMDLINE="console=tty0"
+    else
+      EXTRA_CMDLINE="console=uart8250,mmio32,0xff130000 console=tty0"
+    fi

projects/Rockchip/devices/RK3399/linux/rockchip-4.4/linux.aarch64.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.4.143 Kernel Configuration
+# Linux/arm64 4.4.154 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -460,6 +460,7 @@ CONFIG_PGTABLE_MAPPING=y
 # CONFIG_ZSMALLOC_STAT is not set
 CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_FRAME_VECTOR=y
 CONFIG_SECCOMP=y
 # CONFIG_KEXEC is not set
 # CONFIG_CRASH_DUMP is not set
@@ -1170,7 +1171,7 @@ CONFIG_SRAM=y
 #
 # Altera FPGA firmware download module
 #
-# CONFIG_ALTERA_STAPL is not set
+CONFIG_ALTERA_STAPL=m
 
 #
 # Intel MIC Bus Driver
@@ -1557,6 +1558,7 @@ CONFIG_RT2X00_LIB_LEDS=y
 CONFIG_WL_ROCKCHIP=y
 CONFIG_WIFI_BUILD_MODULE=y
 # CONFIG_WIFI_LOAD_DRIVER_WHEN_KERNEL_BOOTUP is not set
+# CONFIG_WIFI_GENERATE_RANDOM_MAC_ADDR is not set
 CONFIG_AP6XXX=m
 # CONFIG_CYW_BCMDHD is not set
 CONFIG_RTL_WIRELESS_SOLUTION=y
@@ -1737,6 +1739,7 @@ CONFIG_TOUCHSCREEN_ELAN=y
 # CONFIG_TOUCHSCREEN_TOUCHWIN is not set
 # CONFIG_TOUCHSCREEN_PIXCIR is not set
 # CONFIG_TOUCHSCREEN_WDT87XX_I2C is not set
+# CONFIG_TOUCHSCREEN_WM97XX is not set
 CONFIG_TOUCHSCREEN_USB_COMPOSITE=y
 CONFIG_TOUCHSCREEN_USB_EGALAX=y
 CONFIG_TOUCHSCREEN_USB_PANJIT=y
@@ -1762,6 +1765,7 @@ CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
 # CONFIG_TOUCHSCREEN_TSC2007 is not set
 # CONFIG_TOUCHSCREEN_ST1232 is not set
+# CONFIG_TOUCHSCREEN_SUR40 is not set
 # CONFIG_TOUCHSCREEN_SX8654 is not set
 # CONFIG_TOUCHSCREEN_TPS6507X is not set
 # CONFIG_TOUCHSCREEN_ZFORCE is not set
@@ -1892,6 +1896,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
 CONFIG_HW_RANDOM_TPM=y
+# CONFIG_HW_RANDOM_ROCKCHIP is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 
@@ -2407,6 +2412,7 @@ CONFIG_MFD_CROS_EC_SPI=y
 # CONFIG_MFD_VIPERBOARD is not set
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_PCF50633 is not set
+# CONFIG_UCB1400_CORE is not set
 # CONFIG_MFD_RDC321X is not set
 # CONFIG_MFD_RTSX_PCI is not set
 # CONFIG_MFD_RT5033 is not set
@@ -2497,40 +2503,56 @@ CONFIG_REGULATOR_TPS6586X=y
 CONFIG_REGULATOR_XZ3216=y
 CONFIG_CEC_CORE=y
 CONFIG_CEC_NOTIFIER=y
-CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_SUPPORT=m
 
 #
 # Multimedia core support
 #
-# CONFIG_MEDIA_CAMERA_SUPPORT is not set
-# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
-# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 # CONFIG_MEDIA_RADIO_SUPPORT is not set
 # CONFIG_MEDIA_SDR_SUPPORT is not set
 CONFIG_MEDIA_RC_SUPPORT=y
 CONFIG_MEDIA_CEC_SUPPORT=y
-CONFIG_MEDIA_CEC_RC=y
+# CONFIG_MEDIA_CONTROLLER is not set
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2=m
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_TTPCI_EEPROM is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEOBUF_DVB=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
+CONFIG_VIDEOBUF2_DVB=m
+CONFIG_DVB_CORE=m
+CONFIG_DVB_NET=y
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_MAX_ADAPTERS=32
+# CONFIG_DVB_DYNAMIC_MINORS is not set
 
 #
 # Media drivers
 #
-CONFIG_RC_CORE=y
-CONFIG_RC_MAP=y
+CONFIG_RC_CORE=m
+CONFIG_RC_MAP=m
 CONFIG_RC_DECODERS=y
-CONFIG_LIRC=y
-CONFIG_IR_LIRC_CODEC=y
-CONFIG_IR_NEC_DECODER=y
-CONFIG_IR_RC5_DECODER=y
-CONFIG_IR_RC6_DECODER=y
-CONFIG_IR_JVC_DECODER=y
-CONFIG_IR_SONY_DECODER=y
-CONFIG_IR_SANYO_DECODER=y
-CONFIG_IR_SHARP_DECODER=y
-CONFIG_IR_MCE_KBD_DECODER=y
-CONFIG_IR_XMP_DECODER=y
+CONFIG_LIRC=m
+CONFIG_IR_LIRC_CODEC=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_SHARP_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_XMP_DECODER=m
 CONFIG_RC_DEVICES=y
 CONFIG_RC_ATI_REMOTE=m
 CONFIG_IR_HIX5HD2=m
@@ -2542,31 +2564,432 @@ CONFIG_IR_IGORPLUGUSB=m
 CONFIG_IR_IGUANA=m
 CONFIG_IR_TTUSBIR=m
 # CONFIG_RC_LOOPBACK is not set
-CONFIG_IR_GPIO_CIR=y
+CONFIG_IR_GPIO_CIR=m
 CONFIG_MEDIA_USB_SUPPORT=y
 
+#
+# Webcam devices
+#
+# CONFIG_USB_VIDEO_CLASS is not set
+# CONFIG_USB_GSPCA is not set
+# CONFIG_USB_PWC is not set
+# CONFIG_VIDEO_CPIA2 is not set
+# CONFIG_USB_ZR364XX is not set
+# CONFIG_USB_STKWEBCAM is not set
+# CONFIG_USB_S2255 is not set
+CONFIG_VIDEO_USBTV=m
+
+#
+# Analog TV USB devices
+#
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_VIDEO_STK1160_COMMON=m
+# CONFIG_VIDEO_STK1160_AC97 is not set
+CONFIG_VIDEO_STK1160=m
+# CONFIG_VIDEO_GO7007 is not set
+
+#
+# Analog/digital TV USB devices
+#
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
+CONFIG_VIDEO_AU0828_RC=y
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+# CONFIG_VIDEO_CX231XX_ALSA is not set
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_TM6000=m
+# CONFIG_VIDEO_TM6000_ALSA is not set
+CONFIG_VIDEO_TM6000_DVB=m
+
+#
+# Digital TV USB devices
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_FRIIO=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_DVBSKY=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
+CONFIG_DVB_AS102=m
+
+#
+# Webcam, TV (analog/digital) USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+# CONFIG_VIDEO_EM28XX_V4L2 is not set
+# CONFIG_VIDEO_EM28XX_ALSA is not set
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+
 #
 # USB HDMI CEC adapters
 #
-CONFIG_USB_PULSE8_CEC=y
-CONFIG_USB_RAINSHADOW_CEC=y
-# CONFIG_MEDIA_PCI_SUPPORT is not set
+CONFIG_USB_PULSE8_CEC=m
+CONFIG_USB_RAINSHADOW_CEC=m
+CONFIG_MEDIA_PCI_SUPPORT=y
+
+#
+# Media capture support
+#
+# CONFIG_VIDEO_SOLO6X10 is not set
+# CONFIG_VIDEO_TW68 is not set
+
+#
+# Media capture/analog TV support
+#
+# CONFIG_VIDEO_IVTV is not set
+# CONFIG_VIDEO_HEXIUM_GEMINI is not set
+# CONFIG_VIDEO_HEXIUM_ORION is not set
+# CONFIG_VIDEO_MXB is not set
+# CONFIG_VIDEO_DT3155 is not set
+
+#
+# Media capture/analog/hybrid TV support
+#
+CONFIG_VIDEO_CX18=m
+# CONFIG_VIDEO_CX18_ALSA is not set
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+CONFIG_VIDEO_CX25821=m
+# CONFIG_VIDEO_CX25821_ALSA is not set
+CONFIG_VIDEO_CX88=m
+# CONFIG_VIDEO_CX88_ALSA is not set
+# CONFIG_VIDEO_CX88_BLACKBIRD is not set
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_ENABLE_VP3054=y
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_SAA7134=m
+# CONFIG_VIDEO_SAA7134_ALSA is not set
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_SAA7164=m
+
+#
+# Media digital TV PCI Adapters
+#
+CONFIG_DVB_AV7110_IR=y
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_BUDGET_PATCH=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
+# CONFIG_DVB_PLUTO2 is not set
+CONFIG_DVB_DM1105=m
+CONFIG_DVB_PT1=m
+CONFIG_DVB_PT3=m
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NGENE=m
+CONFIG_DVB_DDBRIDGE=m
+CONFIG_DVB_SMIPCIE=m
+CONFIG_DVB_NETUP_UNIDVB=m
+# CONFIG_V4L_PLATFORM_DRIVERS is not set
+# CONFIG_V4L_MEM2MEM_DRIVERS is not set
+# CONFIG_V4L_TEST_DRIVERS is not set
+# CONFIG_DVB_PLATFORM_DRIVERS is not set
 # CONFIG_ROCKCHIP_TSP is not set
 
 #
 # Supported MMC/SDIO adapters
 #
-# CONFIG_CYPRESS_FIRMWARE is not set
+# CONFIG_SMS_SDIO_DRV is not set
+CONFIG_MEDIA_COMMON_OPTIONS=y
+
+#
+# common driver options
+#
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_CYPRESS_FIRMWARE=m
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
 
 #
 # Media ancillary drivers (tuners, sensors, i2c, frontends)
 #
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_MEDIA_ATTACH=y
+CONFIG_VIDEO_IR_I2C=m
 
 #
-# Customise DVB Frontends
+# Audio decoders, processors and mixers
 #
-# CONFIG_DVB_TUNER_DIB0070 is not set
-# CONFIG_DVB_TUNER_DIB0090 is not set
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_WM8775=m
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+
+#
+# Video decoders
+#
+CONFIG_VIDEO_SAA711X=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_CX25840=m
+
+#
+# Video encoders
+#
+
+#
+# Camera sensor devices
+#
+
+#
+# Flash devices
+#
+
+#
+# Video improvement chips
+#
+
+#
+# Camera lens devices
+#
+
+#
+# Audio/Video compression chips
+#
+CONFIG_VIDEO_SAA6752HS=m
+
+#
+# Miscellaneous helper chips
+#
+
+#
+# Sensors used on soc_camera driver
+#
+CONFIG_MEDIA_TUNER=m
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2063=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_M88RS6000T=m
+CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_MEDIA_TUNER_SI2157=m
+CONFIG_MEDIA_TUNER_IT913X=m
+CONFIG_MEDIA_TUNER_R820T=m
+CONFIG_MEDIA_TUNER_MXL301RF=m
+CONFIG_MEDIA_TUNER_QM1D1C0042=m
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV6110x=m
+CONFIG_DVB_M88DS3103=m
+
+#
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+CONFIG_DVB_SI2165=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_CX24117=m
+CONFIG_DVB_CX24120=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_TS2020=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+CONFIG_DVB_TDA10071=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP8870=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_DRXD=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_STV0367=m
+CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_CXD2841ER=m
+CONFIG_DVB_RTL2830=m
+CONFIG_DVB_RTL2832=m
+CONFIG_DVB_SI2168=m
+CONFIG_DVB_AS102_FE=m
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LGDT3306A=m
+CONFIG_DVB_LG2160=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
+CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_S921=m
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+
+#
+# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_TC90522=m
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_DRX39XYJ=m
+CONFIG_DVB_LNBH25=m
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_LNBP22=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_A8293=m
+CONFIG_DVB_SP2=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
+CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_AF9033=m
+CONFIG_DVB_HORUS3A=m
+CONFIG_DVB_ASCOT2E=m
 
 #
 # Tools to develop new frontends
@@ -2610,6 +3033,7 @@ CONFIG_DRM_ROCKCHIP=y
 CONFIG_ROCKCHIP_CDN_DP=y
 CONFIG_ROCKCHIP_DW_HDMI=y
 CONFIG_ROCKCHIP_DW_MIPI_DSI=y
+CONFIG_ROCKCHIP_MIPI_CSI_TX=y
 CONFIG_ROCKCHIP_ANALOGIX_DP=y
 CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_ROCKCHIP_LVDS=y
@@ -2781,7 +3205,7 @@ CONFIG_RK_VCODEC=y
 #
 # IEP
 #
-# CONFIG_IEP is not set
+CONFIG_IEP=y
 # CONFIG_IEP_MMU is not set
 
 #
@@ -2833,11 +3257,13 @@ CONFIG_SND_MAX_CARDS=32
 # CONFIG_SND_PROC_FS is not set
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
 CONFIG_SND_RAWMIDI_SEQ=m
 # CONFIG_SND_OPL3_LIB_SEQ is not set
 # CONFIG_SND_OPL4_LIB_SEQ is not set
 # CONFIG_SND_SBAWE_SEQ is not set
 # CONFIG_SND_EMU10K1_SEQ is not set
+CONFIG_SND_AC97_CODEC=m
 CONFIG_SND_DRIVERS=y
 # CONFIG_SND_DUMMY is not set
 # CONFIG_SND_ALOOP is not set
@@ -2845,6 +3271,7 @@ CONFIG_SND_DRIVERS=y
 # CONFIG_SND_MTPAV is not set
 # CONFIG_SND_SERIAL_U16550 is not set
 # CONFIG_SND_MPU401 is not set
+# CONFIG_SND_AC97_POWER_SAVE is not set
 # CONFIG_SND_PCI is not set
 
 #
@@ -2997,6 +3424,7 @@ CONFIG_SND_SOC_TS3A227E=y
 # CONFIG_SND_SOC_TPA6130A2 is not set
 CONFIG_SND_SIMPLE_CARD=y
 # CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
 
 #
 # HID support
@@ -3342,12 +3770,12 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # CONFIG_USB_EG20T is not set
 # CONFIG_USB_GADGET_XILINX is not set
 # CONFIG_USB_DUMMY_HCD is not set
-CONFIG_USB_LIBCOMPOSITE=y
-CONFIG_USB_F_ACM=y
-CONFIG_USB_U_SERIAL=y
-CONFIG_USB_F_MASS_STORAGE=y
-CONFIG_USB_F_FS=y
-CONFIG_USB_CONFIGFS=y
+CONFIG_USB_LIBCOMPOSITE=m
+CONFIG_USB_F_ACM=m
+CONFIG_USB_U_SERIAL=m
+CONFIG_USB_F_MASS_STORAGE=m
+CONFIG_USB_F_FS=m
+CONFIG_USB_CONFIGFS=m
 # CONFIG_USB_CONFIGFS_SERIAL is not set
 CONFIG_USB_CONFIGFS_ACM=y
 # CONFIG_USB_CONFIGFS_OBEX is not set
@@ -3366,6 +3794,7 @@ CONFIG_USB_CONFIGFS_UEVENT=y
 # CONFIG_USB_CONFIGFS_F_UAC2 is not set
 # CONFIG_USB_CONFIGFS_F_MIDI is not set
 # CONFIG_USB_CONFIGFS_F_HID is not set
+# CONFIG_USB_CONFIGFS_F_UVC is not set
 # CONFIG_USB_CONFIGFS_F_PRINTER is not set
 # CONFIG_USB_ZERO is not set
 # CONFIG_USB_AUDIO is not set
@@ -3382,6 +3811,7 @@ CONFIG_USB_CONFIGFS_UEVENT=y
 # CONFIG_USB_G_MULTI is not set
 # CONFIG_USB_G_HID is not set
 # CONFIG_USB_G_DBGP is not set
+# CONFIG_USB_G_WEBCAM is not set
 
 #
 # ROCKCHIP USB Support
@@ -3523,6 +3953,7 @@ CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_DRV_HYM8563=y
 # CONFIG_RTC_DRV_MAX6900 is not set
 CONFIG_RTC_DRV_RK808=y
+# CONFIG_RTC_DRV_RK_TIMER is not set
 # CONFIG_RTC_DRV_RS5C372 is not set
 # CONFIG_RTC_DRV_ISL1208 is not set
 # CONFIG_RTC_DRV_ISL12022 is not set
@@ -3841,6 +4272,7 @@ CONFIG_ROCKCHIP_IOMMU=y
 # CPU selection
 #
 # CONFIG_CPU_PX30 is not set
+# CONFIG_CPU_RK1808 is not set
 # CONFIG_CPU_RK3308 is not set
 # CONFIG_CPU_RK3328 is not set
 # CONFIG_CPU_RK3366 is not set
@@ -3849,6 +4281,7 @@ CONFIG_CPU_RK3399=y
 CONFIG_ANDROID_VERSION=0x07010000
 CONFIG_ROCKCHIP_CPUINFO=y
 # CONFIG_ROCKCHIP_DEVICEINFO is not set
+CONFIG_ROCKCHIP_OPP=y
 # CONFIG_ROCKCHIP_PM_TEST is not set
 CONFIG_ROCKCHIP_GRF=y
 CONFIG_ROCKCHIP_PM_DOMAINS=y

projects/Rockchip/devices/TinkerBoard/linux/rockchip-4.4/linux.arm.conf

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.4.143 Kernel Configuration
+# Linux/arm 4.4.154 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -534,6 +534,7 @@ CONFIG_ZSMALLOC=m
 CONFIG_PGTABLE_MAPPING=y
 # CONFIG_ZSMALLOC_STAT is not set
 # CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_FRAME_VECTOR=y
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_UACCESS_WITH_MEMCPY is not set
@@ -1452,6 +1453,7 @@ CONFIG_RT2X00_LIB_LEDS=y
 CONFIG_WL_ROCKCHIP=y
 CONFIG_WIFI_BUILD_MODULE=y
 # CONFIG_WIFI_LOAD_DRIVER_WHEN_KERNEL_BOOTUP is not set
+# CONFIG_WIFI_GENERATE_RANDOM_MAC_ADDR is not set
 # CONFIG_AP6XXX is not set
 # CONFIG_CYW_BCMDHD is not set
 CONFIG_RTL_WIRELESS_SOLUTION=y
@@ -1630,6 +1632,7 @@ CONFIG_TOUCHSCREEN_ELAN=y
 # CONFIG_TOUCHSCREEN_TOUCHWIN is not set
 # CONFIG_TOUCHSCREEN_PIXCIR is not set
 # CONFIG_TOUCHSCREEN_WDT87XX_I2C is not set
+# CONFIG_TOUCHSCREEN_WM97XX is not set
 CONFIG_TOUCHSCREEN_USB_COMPOSITE=y
 CONFIG_TOUCHSCREEN_USB_EGALAX=y
 CONFIG_TOUCHSCREEN_USB_PANJIT=y
@@ -1655,6 +1658,7 @@ CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
 # CONFIG_TOUCHSCREEN_TSC2007 is not set
 # CONFIG_TOUCHSCREEN_ST1232 is not set
+# CONFIG_TOUCHSCREEN_SUR40 is not set
 # CONFIG_TOUCHSCREEN_SX8654 is not set
 # CONFIG_TOUCHSCREEN_TPS6507X is not set
 # CONFIG_TOUCHSCREEN_ZFORCE is not set
@@ -1684,7 +1688,7 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_YEALINK is not set
 # CONFIG_INPUT_CM109 is not set
 # CONFIG_INPUT_REGULATOR_HAPTIC is not set
-# CONFIG_INPUT_RK8XX_PWRKEY is not set
+CONFIG_INPUT_RK8XX_PWRKEY=y
 CONFIG_INPUT_UINPUT=y
 CONFIG_INPUT_GPIO=y
 # CONFIG_INPUT_PCF8574 is not set
@@ -1783,6 +1787,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
 CONFIG_HW_RANDOM_TPM=y
+# CONFIG_HW_RANDOM_ROCKCHIP is not set
 # CONFIG_R3964 is not set
 # CONFIG_RAW_DRIVER is not set
 CONFIG_TCG_TPM=y
@@ -2249,6 +2254,7 @@ CONFIG_MFD_CROS_EC_SPI=y
 # CONFIG_MFD_VIPERBOARD is not set
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_PCF50633 is not set
+# CONFIG_UCB1400_CORE is not set
 # CONFIG_MFD_PM8921_CORE is not set
 # CONFIG_MFD_RT5033 is not set
 # CONFIG_MFD_RTSX_USB is not set
@@ -2340,40 +2346,53 @@ CONFIG_REGULATOR_TPS6586X=y
 # CONFIG_REGULATOR_XZ3216 is not set
 CONFIG_CEC_CORE=y
 CONFIG_CEC_NOTIFIER=y
-CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_SUPPORT=m
 
 #
 # Multimedia core support
 #
-# CONFIG_MEDIA_CAMERA_SUPPORT is not set
-# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
-# CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 # CONFIG_MEDIA_RADIO_SUPPORT is not set
 # CONFIG_MEDIA_SDR_SUPPORT is not set
 CONFIG_MEDIA_RC_SUPPORT=y
 CONFIG_MEDIA_CEC_SUPPORT=y
-CONFIG_MEDIA_CEC_RC=y
+# CONFIG_MEDIA_CONTROLLER is not set
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2=m
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_TTPCI_EEPROM is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEOBUF_DVB=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_DVB_CORE=m
+CONFIG_DVB_NET=y
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_MAX_ADAPTERS=32
+# CONFIG_DVB_DYNAMIC_MINORS is not set
 
 #
 # Media drivers
 #
-CONFIG_RC_CORE=y
-CONFIG_RC_MAP=y
+CONFIG_RC_CORE=m
+CONFIG_RC_MAP=m
 CONFIG_RC_DECODERS=y
-CONFIG_LIRC=y
-CONFIG_IR_LIRC_CODEC=y
-CONFIG_IR_NEC_DECODER=y
-CONFIG_IR_RC5_DECODER=y
-CONFIG_IR_RC6_DECODER=y
-CONFIG_IR_JVC_DECODER=y
-CONFIG_IR_SONY_DECODER=y
-CONFIG_IR_SANYO_DECODER=y
-CONFIG_IR_SHARP_DECODER=y
-CONFIG_IR_MCE_KBD_DECODER=y
-CONFIG_IR_XMP_DECODER=y
+CONFIG_LIRC=m
+CONFIG_IR_LIRC_CODEC=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_SHARP_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_XMP_DECODER=m
 CONFIG_RC_DEVICES=y
 CONFIG_RC_ATI_REMOTE=m
 CONFIG_IR_HIX5HD2=m
@@ -2385,30 +2404,337 @@ CONFIG_IR_IGORPLUGUSB=m
 CONFIG_IR_IGUANA=m
 CONFIG_IR_TTUSBIR=m
 # CONFIG_RC_LOOPBACK is not set
-CONFIG_IR_GPIO_CIR=y
+CONFIG_IR_GPIO_CIR=m
 CONFIG_MEDIA_USB_SUPPORT=y
 
+#
+# Webcam devices
+#
+# CONFIG_USB_VIDEO_CLASS is not set
+# CONFIG_USB_GSPCA is not set
+# CONFIG_USB_PWC is not set
+# CONFIG_VIDEO_CPIA2 is not set
+# CONFIG_USB_ZR364XX is not set
+# CONFIG_USB_STKWEBCAM is not set
+# CONFIG_USB_S2255 is not set
+CONFIG_VIDEO_USBTV=m
+
+#
+# Analog TV USB devices
+#
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_VIDEO_STK1160_COMMON=m
+# CONFIG_VIDEO_STK1160_AC97 is not set
+CONFIG_VIDEO_STK1160=m
+# CONFIG_VIDEO_GO7007 is not set
+
+#
+# Analog/digital TV USB devices
+#
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
+CONFIG_VIDEO_AU0828_RC=y
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+# CONFIG_VIDEO_CX231XX_ALSA is not set
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_TM6000=m
+# CONFIG_VIDEO_TM6000_ALSA is not set
+CONFIG_VIDEO_TM6000_DVB=m
+
+#
+# Digital TV USB devices
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_FRIIO=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_DVBSKY=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
+CONFIG_DVB_AS102=m
+
+#
+# Webcam, TV (analog/digital) USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+# CONFIG_VIDEO_EM28XX_V4L2 is not set
+# CONFIG_VIDEO_EM28XX_ALSA is not set
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+
 #
 # USB HDMI CEC adapters
 #
-CONFIG_USB_PULSE8_CEC=y
-CONFIG_USB_RAINSHADOW_CEC=y
+CONFIG_USB_PULSE8_CEC=m
+CONFIG_USB_RAINSHADOW_CEC=m
+# CONFIG_V4L_PLATFORM_DRIVERS is not set
+# CONFIG_V4L_MEM2MEM_DRIVERS is not set
+# CONFIG_V4L_TEST_DRIVERS is not set
+# CONFIG_DVB_PLATFORM_DRIVERS is not set
 # CONFIG_ROCKCHIP_TSP is not set
 
 #
 # Supported MMC/SDIO adapters
 #
-# CONFIG_CYPRESS_FIRMWARE is not set
+# CONFIG_SMS_SDIO_DRV is not set
+CONFIG_MEDIA_COMMON_OPTIONS=y
+
+#
+# common driver options
+#
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_CYPRESS_FIRMWARE=m
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
 
 #
 # Media ancillary drivers (tuners, sensors, i2c, frontends)
 #
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_MEDIA_ATTACH=y
+CONFIG_VIDEO_IR_I2C=m
 
 #
-# Customise DVB Frontends
+# Audio decoders, processors and mixers
 #
-# CONFIG_DVB_TUNER_DIB0070 is not set
-# CONFIG_DVB_TUNER_DIB0090 is not set
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_WM8775=m
+
+#
+# RDS decoders
+#
+
+#
+# Video decoders
+#
+CONFIG_VIDEO_SAA711X=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_CX25840=m
+
+#
+# Video encoders
+#
+
+#
+# Camera sensor devices
+#
+
+#
+# Flash devices
+#
+
+#
+# Video improvement chips
+#
+
+#
+# Camera lens devices
+#
+
+#
+# Audio/Video compression chips
+#
+
+#
+# Miscellaneous helper chips
+#
+
+#
+# Sensors used on soc_camera driver
+#
+CONFIG_MEDIA_TUNER=m
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2063=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_MEDIA_TUNER_SI2157=m
+CONFIG_MEDIA_TUNER_IT913X=m
+CONFIG_MEDIA_TUNER_R820T=m
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV6110x=m
+CONFIG_DVB_M88DS3103=m
+
+#
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+CONFIG_DVB_SI2165=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_CX24120=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_TS2020=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_TDA10071=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_DRXD=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_RTL2830=m
+CONFIG_DVB_RTL2832=m
+CONFIG_DVB_SI2168=m
+CONFIG_DVB_AS102_FE=m
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LGDT3306A=m
+CONFIG_DVB_LG2160=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
+CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_S921=m
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+
+#
+# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
+#
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_DRX39XYJ=m
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_LNBP22=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_A8293=m
+CONFIG_DVB_SP2=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_IX2505V=m
+CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_AF9033=m
 
 #
 # Tools to develop new frontends
@@ -2445,6 +2771,7 @@ CONFIG_DRM_ROCKCHIP=y
 # CONFIG_ROCKCHIP_CDN_DP is not set
 CONFIG_ROCKCHIP_DW_HDMI=y
 CONFIG_ROCKCHIP_DW_MIPI_DSI=y
+CONFIG_ROCKCHIP_MIPI_CSI_TX=y
 CONFIG_ROCKCHIP_ANALOGIX_DP=y
 CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_ROCKCHIP_LVDS=y
@@ -2592,7 +2919,7 @@ CONFIG_RK_VCODEC=y
 #
 # IEP
 #
-# CONFIG_IEP is not set
+CONFIG_IEP=y
 # CONFIG_IEP_MMU is not set
 
 #
@@ -2642,11 +2969,13 @@ CONFIG_SND_MAX_CARDS=32
 # CONFIG_SND_PROC_FS is not set
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
 CONFIG_SND_RAWMIDI_SEQ=m
 # CONFIG_SND_OPL3_LIB_SEQ is not set
 # CONFIG_SND_OPL4_LIB_SEQ is not set
 # CONFIG_SND_SBAWE_SEQ is not set
 # CONFIG_SND_EMU10K1_SEQ is not set
+CONFIG_SND_AC97_CODEC=m
 CONFIG_SND_DRIVERS=y
 # CONFIG_SND_DUMMY is not set
 # CONFIG_SND_ALOOP is not set
@@ -2654,6 +2983,7 @@ CONFIG_SND_DRIVERS=y
 # CONFIG_SND_MTPAV is not set
 # CONFIG_SND_SERIAL_U16550 is not set
 # CONFIG_SND_MPU401 is not set
+# CONFIG_SND_AC97_POWER_SAVE is not set
 
 #
 # HD-Audio
@@ -2806,6 +3136,7 @@ CONFIG_SND_SOC_TS3A227E=y
 # CONFIG_SND_SOC_TPA6130A2 is not set
 CONFIG_SND_SIMPLE_CARD=y
 # CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
 
 #
 # HID support
@@ -3129,12 +3460,14 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # CONFIG_USB_NET2272 is not set
 # CONFIG_USB_GADGET_XILINX is not set
 # CONFIG_USB_DUMMY_HCD is not set
-CONFIG_USB_LIBCOMPOSITE=y
-CONFIG_USB_F_MASS_STORAGE=y
-CONFIG_USB_F_FS=y
-CONFIG_USB_CONFIGFS=y
+CONFIG_USB_LIBCOMPOSITE=m
+CONFIG_USB_F_ACM=m
+CONFIG_USB_U_SERIAL=m
+CONFIG_USB_F_MASS_STORAGE=m
+CONFIG_USB_F_FS=m
+CONFIG_USB_CONFIGFS=m
 # CONFIG_USB_CONFIGFS_SERIAL is not set
-# CONFIG_USB_CONFIGFS_ACM is not set
+CONFIG_USB_CONFIGFS_ACM=y
 # CONFIG_USB_CONFIGFS_OBEX is not set
 # CONFIG_USB_CONFIGFS_NCM is not set
 # CONFIG_USB_CONFIGFS_ECM is not set
@@ -3151,6 +3484,7 @@ CONFIG_USB_CONFIGFS_UEVENT=y
 # CONFIG_USB_CONFIGFS_F_UAC2 is not set
 # CONFIG_USB_CONFIGFS_F_MIDI is not set
 # CONFIG_USB_CONFIGFS_F_HID is not set
+# CONFIG_USB_CONFIGFS_F_UVC is not set
 # CONFIG_USB_CONFIGFS_F_PRINTER is not set
 # CONFIG_USB_ZERO is not set
 # CONFIG_USB_AUDIO is not set
@@ -3167,6 +3501,7 @@ CONFIG_USB_CONFIGFS_UEVENT=y
 # CONFIG_USB_G_MULTI is not set
 # CONFIG_USB_G_HID is not set
 # CONFIG_USB_G_DBGP is not set
+# CONFIG_USB_G_WEBCAM is not set
 
 #
 # ROCKCHIP USB Support
@@ -3301,6 +3636,7 @@ CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_DRV_HYM8563=y
 # CONFIG_RTC_DRV_MAX6900 is not set
 CONFIG_RTC_DRV_RK808=y
+# CONFIG_RTC_DRV_RK_TIMER is not set
 # CONFIG_RTC_DRV_RS5C372 is not set
 # CONFIG_RTC_DRV_ISL1208 is not set
 # CONFIG_RTC_DRV_ISL12022 is not set
@@ -3611,6 +3947,7 @@ CONFIG_CPU_RK3288=y
 # CONFIG_CPU_RK322X is not set
 # CONFIG_CPU_RV110X is not set
 # CONFIG_CPU_PX30 is not set
+# CONFIG_CPU_RK1808 is not set
 # CONFIG_CPU_RK3308 is not set
 # CONFIG_CPU_RK3328 is not set
 # CONFIG_CPU_RK3366 is not set
@@ -3619,6 +3956,7 @@ CONFIG_CPU_RK3288=y
 CONFIG_ANDROID_VERSION=0x07010000
 CONFIG_ROCKCHIP_CPUINFO=y
 # CONFIG_ROCKCHIP_DEVICEINFO is not set
+CONFIG_ROCKCHIP_OPP=y
 # CONFIG_ROCKCHIP_PM_TEST is not set
 CONFIG_ROCKCHIP_GRF=y
 CONFIG_ROCKCHIP_PM_DOMAINS=y

projects/Rockchip/patches/linux/rockchip-4.4/linux-0001-rockchip.patch

@@ -1,4 +1,4 @@
-From 00ddf696ea9a7e980ea8e6ff895defe392db0c11 Mon Sep 17 00:00:00 2001
+From 92b97663794c1ad57aaf7e66ee418bfce635a494 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 17 Apr 2017 13:09:16 +0200
 Subject: [PATCH] sound/usb/quirks-table: add Realtek ALC4040
@@ -26,7 +26,7 @@ index 69bf5cf1e91e..00672a818145 100644
 +
  #undef USB_DEVICE_VENDOR_SPEC
 
-From 55a67a2125f372eed3281cec9914ecd66283955b Mon Sep 17 00:00:00 2001
+From 61382c4e328df487f69b2095865c2e9e2c9e4121 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 28 May 2017 09:08:50 +0200
 Subject: [PATCH] gpu/arm/mali400: default to performance gpu governor
@@ -49,7 +49,7 @@ index c9b8652f100d..6c97c530a2ae 100644
  		mali_devfreq_term_freq_table(mdev);
  		return PTR_ERR(mdev->devfreq);
 
-From 188e9f097216cd73fa78abf9545837464dd70231 Mon Sep 17 00:00:00 2001
+From 0fcd82216c0161c9dd6b54ee505988c539df91fb Mon Sep 17 00:00:00 2001
 From: LongChair <LongChair@hotmail.com>
 Date: Fri, 21 Apr 2017 13:39:12 +0200
 Subject: [PATCH] drm/rockchip: remove unsupported 4K freqs
@@ -80,7 +80,7 @@ index a58edabe600c..7273561fe6b1 100644
  	 * ensure all drm display mode can work, if someone want support more
  	 * resolutions, please limit the possible_crtc, only connect to
 
-From cde112e9f9e564806b49bbe317b783e78a6b5c3a Mon Sep 17 00:00:00 2001
+From 28e3e0508d53dd697fc3dd75588bba08adee1bb0 Mon Sep 17 00:00:00 2001
 From: xuhuicong <xhc@rock-chips.com>
 Date: Fri, 23 Jun 2017 18:56:17 +0800
 Subject: [PATCH] drm/rockchip: hdmi: fix no sound some time
@@ -92,7 +92,7 @@ Signed-off-by: xuhuicong <xhc@rock-chips.com>
  1 file changed, 3 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-index d57d999c50a5..ae498d097b61 100644
+index 8cb2cb4e61a6..30b6bd979eb8 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 @@ -1991,10 +1991,6 @@ static void hdmi_av_composer(struct dw_hdmi *hdmi,
@@ -117,7 +117,7 @@ index d57d999c50a5..ae498d097b61 100644
  		/* HDMI Initialization Step F - Configure AVI InfoFrame */
  		hdmi_config_AVI(hdmi, mode);
 
-From e56478758d232f503414c1e004f6f52973aeb0c4 Mon Sep 17 00:00:00 2001
+From 16f51adab10ab06bfecbd0ed9e444329debb426d Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 18 Nov 2017 11:09:39 +0100
 Subject: [PATCH] rockchip: vop: force skip lines if image too big
@@ -127,10 +127,10 @@ Subject: [PATCH] rockchip: vop: force skip lines if image too big
  1 file changed, 10 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
-index a2c1d85bba95..784e83537692 100644
+index 76610608c723..1418402c2668 100644
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
-@@ -1649,6 +1649,7 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
+@@ -1653,6 +1653,7 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
  	int ymirror, xmirror;
  	uint32_t val;
  	bool rb_swap, global_alpha_en;
@@ -138,7 +138,7 @@ index a2c1d85bba95..784e83537692 100644
  
  #if defined(CONFIG_ROCKCHIP_DRM_DEBUG)
  	bool AFBC_flag = false;
-@@ -1685,8 +1686,14 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
+@@ -1689,8 +1690,14 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
  	}
  
  	mode = &crtc->state->adjusted_mode;
@@ -154,13 +154,15 @@ index a2c1d85bba95..784e83537692 100644
  	act_info = (actual_h - 1) << 16 | ((actual_w - 1) & 0xffff);
  
  	dsp_info = (drm_rect_height(dest) - 1) << 16;
-@@ -1708,10 +1715,10 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
+@@ -1727,12 +1734,12 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
  	VOP_WIN_SET(vop, win, xmirror, xmirror);
  	VOP_WIN_SET(vop, win, ymirror, ymirror);
  	VOP_WIN_SET(vop, win, format, vop_plane_state->format);
 -	VOP_WIN_SET(vop, win, yrgb_vir, fb->pitches[0] >> 2);
 +	VOP_WIN_SET(vop, win, yrgb_vir, fb->pitches[0] >> (2 - skip_lines));
  	VOP_WIN_SET(vop, win, yrgb_mst, vop_plane_state->yrgb_mst);
+ 	VOP_WIN_SET(vop, win, yrgb_mst1, vop_plane_state->yrgb_mst);
+ 
  	if (is_yuv_support(fb->pixel_format)) {
 -		VOP_WIN_SET(vop, win, uv_vir, fb->pitches[1] >> 2);
 +		VOP_WIN_SET(vop, win, uv_vir, fb->pitches[1] >> (2 - skip_lines));
@@ -168,7 +170,7 @@ index a2c1d85bba95..784e83537692 100644
  	}
  	VOP_WIN_SET(vop, win, fmt_10, is_yuv_10bit(fb->pixel_format));
 
-From d1cc2fb593abab7510948339db9cf4b9a59926c6 Mon Sep 17 00:00:00 2001
+From d56d2c8dcd6dc828693bed0cf965d68e90431019 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 18 Nov 2017 23:17:24 +0100
 Subject: [PATCH] gpu/arm/midgard: default to performance gpu governor
@@ -216,7 +218,7 @@ index 1cf44b3500cf..a6a1a52f0463 100644
  /*
   * Power Management poweroff tick granuality. This is in nanoseconds to
 
-From fd3c597dd56bca81fc642d918343ab2f9435628f Mon Sep 17 00:00:00 2001
+From 955a2a87c8fa737d78c022afef1ed32fd6f06760 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 10 Dec 2017 14:16:09 +0100
 Subject: [PATCH] uapi: install rockchip_drm header
@@ -238,7 +240,7 @@ index 38d437096c35..b7ae9969d41e 100644
  header-y += sis_drm.h
  header-y += tegra_drm.h
 
-From b5afb970037ac69a22f6d514c34175835f6078fc Mon Sep 17 00:00:00 2001
+From b4da8f58954748a2d459d5e480156ee2703ea169 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 10 Dec 2017 18:03:53 +0100
 Subject: [PATCH] phy: rockchip-inno-hdmi-phy: add vesa dmt pixel clocks
@@ -323,7 +325,7 @@ index 0161f80ab964..6cf391405ad6 100644
  };
  
 
-From 0377b8c27f4b56b0b6f1fc8af11cde6ab8517c3b Mon Sep 17 00:00:00 2001
+From f3f9dc1c2c697f0c9fefd501731a07ef64a026b1 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Tue, 12 Dec 2017 00:37:27 +0100
 Subject: [PATCH] clk: rockchip: fix round rate
@@ -333,10 +335,10 @@ Subject: [PATCH] clk: rockchip: fix round rate
  1 file changed, 11 insertions(+)
 
 diff --git a/drivers/clk/rockchip/clk-pll.c b/drivers/clk/rockchip/clk-pll.c
-index addcdb07553a..e3d7a9ee1078 100644
+index 0a9f31f2dd27..183114d824a7 100644
 --- a/drivers/clk/rockchip/clk-pll.c
 +++ b/drivers/clk/rockchip/clk-pll.c
-@@ -356,6 +356,17 @@ static const struct rockchip_pll_rate_table *rockchip_get_pll_settings(
+@@ -364,6 +364,17 @@ static const struct rockchip_pll_rate_table *rockchip_get_pll_settings(
  static long rockchip_pll_round_rate(struct clk_hw *hw,
  			    unsigned long drate, unsigned long *prate)
  {
@@ -355,7 +357,7 @@ index addcdb07553a..e3d7a9ee1078 100644
  }
  
 
-From c4bc7e7f44f76a7f6f2374956fd68cab657f1eb3 Mon Sep 17 00:00:00 2001
+From 5a5f5ea8edcc75ca49961a458ac0380e60f30a4d Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 21 Jan 2018 17:20:00 +0100
 Subject: [PATCH] drm: fix HDR metadata infoframe length
@@ -372,7 +374,7 @@ Fixes activation of HDR mode on my LG OLED
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-index ae498d097b61..018bef374dc3 100644
+index 30b6bd979eb8..ec002a4a7a7d 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 @@ -1857,7 +1857,7 @@ static void hdmi_config_hdr_infoframe(struct dw_hdmi *hdmi)
@@ -402,7 +404,7 @@ index bfe671071d9f..e3a0f561e8f0 100644
  	for (i = 0; i < 3; i++) {
  		frame->display_primaries_x[i] =
 
-From 3b4e87792660182b9f0093e016d41a7be53fe59e Mon Sep 17 00:00:00 2001
+From 939878193c4447665bb3b1249e322a5840fbc2d2 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 27 Jan 2018 09:39:09 +0100
 Subject: [PATCH] drm: add edid detection for Hybrid Log-Gamma EOTF
@@ -434,7 +436,7 @@ index e3a0f561e8f0..f7d41950614e 100644
  	return val;
  }
 
-From a11ad9338755a57859c7ca1b54b7719fb644a5ef Mon Sep 17 00:00:00 2001
+From 19e9d690fe47e5e4b47760d060b11707bb44194b Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 11 Feb 2018 19:21:41 +0100
 Subject: [PATCH] drm: bridge: dw-hdmi: default to underscan mode
@@ -444,7 +446,7 @@ Subject: [PATCH] drm: bridge: dw-hdmi: default to underscan mode
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-index 018bef374dc3..d0866baa75fc 100644
+index ec002a4a7a7d..393bd5b28f07 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 @@ -1691,7 +1691,7 @@ static void hdmi_config_AVI(struct dw_hdmi *hdmi, struct drm_display_mode *mode)
@@ -457,7 +459,7 @@ index 018bef374dc3..d0866baa75fc 100644
  	/*
  	 * The Designware IP uses a different byte format from standard
 
-From cb40442a2cd891541ac55381a2610f61f9d56fa9 Mon Sep 17 00:00:00 2001
+From b492ddc8ae2777350db224d39346966080a140d6 Mon Sep 17 00:00:00 2001
 From: David Carrillo-Cisneros <davidcc@google.com>
 Date: Tue, 18 Jul 2017 18:18:37 -0700
 Subject: [PATCH] UPSTREAM: perf tools: Add EXCLUDE_EXTLIBS and EXTRA_PERFLIBS
@@ -517,19 +519,19 @@ index fb1c9ddc3478..9b3b9bd50d54 100644
  export INSTALL SHELL_PATH
  
 
-From 6f95e5cdd43756df0bc1caa983f0f326a38bb9ff Mon Sep 17 00:00:00 2001
+From 163448e6d6d5d0bbc9486d43a2d06c5d86e28d34 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Tue, 27 Feb 2018 20:49:00 +0100
 Subject: [PATCH] net: wireless: rockchip_wlan: rtl8723bs: do not accept all
  sdio wlan id
 
 ---
- drivers/net/wireless/rockchip_wlan/rtl8723bs/Makefile                 | 2 +-
- drivers/net/wireless/rockchip_wlan/rtl8723bs/os_dep/linux/sdio_intf.c | 3 +++
- 2 files changed, 4 insertions(+), 1 deletion(-)
+ drivers/net/wireless/rockchip_wlan/rtl8723bs/Makefile             | 2 +-
+ .../net/wireless/rockchip_wlan/rtl8723bs/os_dep/linux/sdio_intf.c | 8 ++++++++
+ 2 files changed, 9 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bs/Makefile b/drivers/net/wireless/rockchip_wlan/rtl8723bs/Makefile
-index 0ff707fd37eb..ca79c18b8eb8 100644
+index fe9d5638a128..e8653b070efb 100644
 --- a/drivers/net/wireless/rockchip_wlan/rtl8723bs/Makefile
 +++ b/drivers/net/wireless/rockchip_wlan/rtl8723bs/Makefile
 @@ -1347,7 +1347,7 @@ EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN -DCONFIG_PLATFORM_ANDROID -DCONFIG_PLATFO
@@ -542,21 +544,26 @@ index 0ff707fd37eb..ca79c18b8eb8 100644
  EXTRA_CFLAGS += -DCONFIG_RESUME_IN_WORKQUEUE
  # default setting for Special function
 diff --git a/drivers/net/wireless/rockchip_wlan/rtl8723bs/os_dep/linux/sdio_intf.c b/drivers/net/wireless/rockchip_wlan/rtl8723bs/os_dep/linux/sdio_intf.c
-index b4654d229634..48b6cf61d436 100644
+index b4654d229634..e49e5cb8f21a 100644
 --- a/drivers/net/wireless/rockchip_wlan/rtl8723bs/os_dep/linux/sdio_intf.c
 +++ b/drivers/net/wireless/rockchip_wlan/rtl8723bs/os_dep/linux/sdio_intf.c
-@@ -45,6 +45,9 @@ static struct mmc_host *mmc_host = NULL;
+@@ -45,6 +45,14 @@ static struct mmc_host *mmc_host = NULL;
  
  static const struct sdio_device_id sdio_ids[] = {
  #ifdef CONFIG_RTL8723B
++	{ SDIO_DEVICE(0x024c, 0x0240), .driver_data = RTL8723B},
++	{ SDIO_DEVICE(0x024c, 0x0241), .driver_data = RTL8723B},
 +	{ SDIO_DEVICE(0x024c, 0x0523), .driver_data = RTL8723B},
++	{ SDIO_DEVICE(0x024c, 0x0524), .driver_data = RTL8723B},
 +	{ SDIO_DEVICE(0x024c, 0x0623), .driver_data = RTL8723B},
++	{ SDIO_DEVICE(0x024c, 0x0624), .driver_data = RTL8723B},
 +	{ SDIO_DEVICE(0x024c, 0x0626), .driver_data = RTL8723B},
++	{ SDIO_DEVICE(0x024c, 0x8753), .driver_data = RTL8723B},
  	{ SDIO_DEVICE(0x024c, 0xB723), .driver_data = RTL8723B},
  #endif
  #ifdef CONFIG_RTL8188E
 
-From 157645ba1282857bf4440707620c9ca91d8f8913 Mon Sep 17 00:00:00 2001
+From ba7c1fb0efcf29265c0c88d98f52919a21078e5b Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Fri, 2 Mar 2018 20:53:32 +0100
 Subject: [PATCH] net: wireless: rockchip_wlan: bcmdhd: detect broadcom sdio
@@ -580,7 +587,7 @@ index 8864582b1706..b5a388cc3cbe 100755
  	},
  };
 
-From 00c9d5749537dacbd745ce3456f1335cbe019d54 Mon Sep 17 00:00:00 2001
+From 088790f59f74dc73cde328bb1751c75b1cdbd7a0 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 1 Jul 2018 23:17:47 +0200
 Subject: [PATCH] drm/rockchip: clip yuv
@@ -592,18 +599,18 @@ Subject: [PATCH] drm/rockchip: clip yuv
  3 files changed, 7 insertions(+)
 
 diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
-index 784e83537692..7073ea91c349 100644
+index 1418402c2668..50d7d4c983a1 100644
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
-@@ -1712,6 +1712,7 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
+@@ -1731,6 +1731,7 @@ static void vop_plane_atomic_update(struct drm_plane *plane,
+ 	s = to_rockchip_crtc_state(crtc->state);
  
  	spin_lock(&vop->reg_lock);
- 
 +	VOP_WIN_SET(vop, win, yuv_clip, 1);
  	VOP_WIN_SET(vop, win, xmirror, xmirror);
  	VOP_WIN_SET(vop, win, ymirror, ymirror);
  	VOP_WIN_SET(vop, win, format, vop_plane_state->format);
-@@ -2512,6 +2513,7 @@ static void vop_update_csc(struct drm_crtc *crtc)
+@@ -2544,6 +2545,7 @@ static void vop_update_csc(struct drm_crtc *crtc)
  		VOP_CTRL_SET(vop, dsp_data_swap, 0);
  
  	VOP_CTRL_SET(vop, out_mode, s->output_mode);
@@ -612,10 +619,10 @@ index 784e83537692..7073ea91c349 100644
  	switch (s->bus_format) {
  	case MEDIA_BUS_FMT_RGB565_1X16:
 diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
-index 5850572b40ff..b465c08876f8 100644
+index 618de17e608a..391998c7aa50 100644
 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
 +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
-@@ -171,6 +171,7 @@ struct vop_ctrl {
+@@ -178,6 +178,7 @@ struct vop_ctrl {
  	struct vop_reg dsp_lut_en;
  
  	struct vop_reg out_mode;
@@ -623,7 +630,7 @@ index 5850572b40ff..b465c08876f8 100644
  
  	struct vop_reg xmirror;
  	struct vop_reg ymirror;
-@@ -395,6 +396,7 @@ struct vop_win_phy {
+@@ -409,6 +410,7 @@ struct vop_win_phy {
  	struct vop_reg format;
  	struct vop_reg fmt_10;
  	struct vop_reg csc_mode;
@@ -632,10 +639,10 @@ index 5850572b40ff..b465c08876f8 100644
  	struct vop_reg ymirror;
  	struct vop_reg rb_swap;
 diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
-index 5f517e193cc8..f03009e304f8 100644
+index 9c96d5614e54..aeb1c7644bc9 100644
 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
 +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
-@@ -110,6 +110,7 @@ static const struct vop_win_phy rk3288_win01_data = {
+@@ -119,6 +119,7 @@ static const struct vop_win_phy rk3288_win01_data = {
  	.fmt_10 = VOP_REG(RK3288_WIN0_CTRL0, 0x7, 4),
  	.csc_mode = VOP_REG_VER(RK3288_WIN0_CTRL0, 0x3, 10, 3, 2, -1),
  	.rb_swap = VOP_REG(RK3288_WIN0_CTRL0, 0x1, 12),
@@ -643,7 +650,7 @@ index 5f517e193cc8..f03009e304f8 100644
  	.xmirror = VOP_REG_VER(RK3368_WIN0_CTRL0, 0x1, 21, 3, 2, -1),
  	.ymirror = VOP_REG_VER(RK3368_WIN0_CTRL0, 0x1, 22, 3, 2, -1),
  	.act_info = VOP_REG(RK3288_WIN0_ACT_INFO, 0x1fff1fff, 0),
-@@ -277,6 +278,7 @@ static const struct vop_ctrl rk3288_ctrl_data = {
+@@ -286,6 +287,7 @@ static const struct vop_ctrl rk3288_ctrl_data = {
  	.bcsh_color_bar = VOP_REG(RK3288_BCSH_COLOR_BAR, 0xffffff, 8),
  	.bcsh_en = VOP_REG(RK3288_BCSH_COLOR_BAR, 0x1, 0),
  
@@ -651,7 +658,7 @@ index 5f517e193cc8..f03009e304f8 100644
  	.xmirror = VOP_REG(RK3288_DSP_CTRL0, 0x1, 22),
  	.ymirror = VOP_REG(RK3288_DSP_CTRL0, 0x1, 23),
  
-@@ -955,6 +957,7 @@ static const struct vop_ctrl rk3328_ctrl_data = {
+@@ -964,6 +966,7 @@ static const struct vop_ctrl rk3328_ctrl_data = {
  	.dsp_lut_en = VOP_REG(RK3328_DSP_CTRL1, 0x1, 0),
  	.out_mode = VOP_REG(RK3328_DSP_CTRL0, 0xf, 0),
  
@@ -660,7 +667,7 @@ index 5f517e193cc8..f03009e304f8 100644
  	.ymirror = VOP_REG(RK3328_DSP_CTRL0, 0x1, 23),
  
 
-From 93fb1cdc962e44ce72fec1191e0bf200c9aaf130 Mon Sep 17 00:00:00 2001
+From 34af37e51e11b9a48d7ca4a77d4430697e4c775d Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 8 Jul 2018 12:38:00 +0200
 Subject: [PATCH] drm/atomic: use active_only flag for connector atomic
@@ -717,7 +724,7 @@ index f77d4aa1e58b..4da489b54dc5 100644
  
  		DRM_DEBUG_ATOMIC("flushing [CONNECTOR:%d:%s]\n",
 
-From d0f8100f82203017bac6617d3f0e30b524956d36 Mon Sep 17 00:00:00 2001
+From 103d19f54aa345a9a80ed386f750482a9f905ec2 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 22 Jul 2018 14:51:58 +0200
 Subject: [PATCH] drm: rockchip: dw-hdmi: only force YCbCr422 when max tmds is
@@ -743,7 +750,7 @@ index 7273561fe6b1..e2aad6e2149b 100644
  	}
  
 
-From d093be3d79b5c781719298676282e44b7d7bb290 Mon Sep 17 00:00:00 2001
+From 5e6283e0832bf7ef0c8b02cc0576276b1d08b03f Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 22 Jul 2018 15:09:16 +0200
 Subject: [PATCH] drm: bridge: dw-hdmi: signal full range for rgb output
@@ -753,7 +760,7 @@ Subject: [PATCH] drm: bridge: dw-hdmi: signal full range for rgb output
  1 file changed, 8 insertions(+)
 
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-index d0866baa75fc..520f87b88130 100644
+index 393bd5b28f07..91c5b8fc8fa0 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 @@ -1693,6 +1693,14 @@ static void hdmi_config_AVI(struct dw_hdmi *hdmi, struct drm_display_mode *mode)
@@ -772,39 +779,7 @@ index d0866baa75fc..520f87b88130 100644
  	 * The Designware IP uses a different byte format from standard
  	 * AVI info frames, though generally the bits are in the correct
 
-From 623aaf53edd860816297c9230d39b5b96b0146f3 Mon Sep 17 00:00:00 2001
-From: Myy Miouyouyou <myy@miouyouyou.fr>
-Date: Mon, 21 May 2018 22:32:59 +0200
-Subject: [PATCH] GPU: ARM: Midgard: Adapt to the new mmap call checks.
-
-Now, I don't know if this driver is just one of these "buggy" drivers
-Linus is talking about, or if this is just standard GPU procedure.
-
-Anyway, this patch is due to this change by Linus Torvalds :
-https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=be83bbf806822b1b89e0a0f23cd87cddc409e429
-
-And the fix is inspired by :
-https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=76ef6b28ea4f81c3d511866a9b31392caa833126
-
-Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
----
- drivers/gpu/arm/midgard/mali_kbase_core_linux.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
-index 3a6e5aae0bce..2b24e415dfa6 100644
---- a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
-+++ b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
-@@ -1155,6 +1155,7 @@ static int kbase_open(struct inode *inode, struct file *filp)
- 
- 	init_waitqueue_head(&kctx->event_queue);
- 	filp->private_data = kctx;
-+	filp->f_mode |= FMODE_UNSIGNED_OFFSET;
- 	kctx->filp = filp;
- 
- 	if (kbdev->infinite_cache_active_default)
-
-From d0e509162ace165ab24c8a005a2666c6c17e4d69 Mon Sep 17 00:00:00 2001
+From d6543095fd910b2108e8f823aa4bdc5e90f39965 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 28 Jul 2018 10:41:40 +0200
 Subject: [PATCH] WIP: mm: dma-mapping: increase dma pool size
@@ -841,7 +816,7 @@ index 2b05653e8156..2ad8515cd4da 100644
  
  static int __init early_coherent_pool(char *p)
 
-From 9cfc544f5914ccf2a44da96e491195eea763d70f Mon Sep 17 00:00:00 2001
+From a6d53734dc1bf083a8b8d77eb03747cbf834e204 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 4 Aug 2018 15:19:39 +0200
 Subject: [PATCH] drm: add picture_aspect_ratio to hdmi 1.4 4k modes
@@ -885,7 +860,7 @@ index f7d41950614e..69a1eb4ee382 100644
  
  /*** DDC fetch and block validation ***/
 
-From 728a068901826027cf45d404f49b58f6cf02156a Mon Sep 17 00:00:00 2001
+From b6c4fe8035c6ceb21b2420532d95489bf4dbc25c Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 4 Aug 2018 16:26:47 +0200
 Subject: [PATCH] drm: bridge: dw-hdmi: signal none colorimetry for rgb output
@@ -895,7 +870,7 @@ Subject: [PATCH] drm: bridge: dw-hdmi: signal none colorimetry for rgb output
  1 file changed, 2 insertions(+)
 
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-index 520f87b88130..c6ef3d43f997 100644
+index 91c5b8fc8fa0..8261ba15f98e 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 @@ -1694,6 +1694,8 @@ static void hdmi_config_AVI(struct dw_hdmi *hdmi, struct drm_display_mode *mode)
@@ -908,7 +883,7 @@ index 520f87b88130..c6ef3d43f997 100644
  		frame.ycc_quantization_range = HDMI_YCC_QUANTIZATION_RANGE_FULL;
  	} else {
 
-From bc7d29237337d1506fe63bbb421d64710e176537 Mon Sep 17 00:00:00 2001
+From 52fd44fe708ada3fb673c0b8b093e49beabfd62e Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 4 Aug 2018 16:27:08 +0200
 Subject: [PATCH] drm: bridge: dw-hdmi: signal it content and content type
@@ -918,7 +893,7 @@ Subject: [PATCH] drm: bridge: dw-hdmi: signal it content and content type
  1 file changed, 2 insertions(+)
 
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-index c6ef3d43f997..a0e25278232b 100644
+index 8261ba15f98e..cdfa295fc323 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 @@ -1692,6 +1692,8 @@ static void hdmi_config_AVI(struct dw_hdmi *hdmi, struct drm_display_mode *mode)
@@ -931,7 +906,7 @@ index c6ef3d43f997..a0e25278232b 100644
  	if (hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_out_bus_format)) {
  		frame.colorimetry = HDMI_COLORIMETRY_NONE;
 
-From d0b82f5649ddb897cbf92f5e06030244ffc4e9eb Mon Sep 17 00:00:00 2001
+From 6e57feede98bc6134077215139211d51f0fb7b97 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 4 Aug 2018 16:27:40 +0200
 Subject: [PATCH] drm: bridge: dw-hdmi: log infoframes
@@ -941,7 +916,7 @@ Subject: [PATCH] drm: bridge: dw-hdmi: log infoframes
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-index a0e25278232b..f56f3224a1c9 100644
+index cdfa295fc323..25546a4471fb 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 @@ -1705,6 +1705,8 @@ static void hdmi_config_AVI(struct dw_hdmi *hdmi, struct drm_display_mode *mode)
@@ -981,7 +956,7 @@ index a0e25278232b..f56f3224a1c9 100644
  	hdmi_writeb(hdmi, frame.length, HDMI_FC_DRM_HB1);
  	hdmi_writeb(hdmi, frame.eotf, HDMI_FC_DRM_PB0);
 
-From 13040ab461d79e1dc720677eb462ace745b33b84 Mon Sep 17 00:00:00 2001
+From dcdbd37723553a9ede3754a1e15c9a1e9d566cf1 Mon Sep 17 00:00:00 2001
 From: Nickey Yang <nickey.yang@rock-chips.com>
 Date: Mon, 17 Jul 2017 16:35:34 +0800
 Subject: [PATCH] MINIARM: set npll be used for hdmi only
@@ -989,23 +964,14 @@ Subject: [PATCH] MINIARM: set npll be used for hdmi only
 Change-Id: I8bebfb2cfb68e3dad172e5547d3886526ad5e912
 Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
 ---
- arch/arm/boot/dts/rk3288.dtsi     | 4 +++-
+ arch/arm/boot/dts/rk3288.dtsi     | 2 ++
  drivers/clk/rockchip/clk-rk3288.c | 4 ++--
- 2 files changed, 5 insertions(+), 3 deletions(-)
+ 2 files changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
-index 8e51132ef7e4..66962169da17 100644
+index 1b7602f25f34..7e536c939cc0 100644
 --- a/arch/arm/boot/dts/rk3288.dtsi
 +++ b/arch/arm/boot/dts/rk3288.dtsi
-@@ -1052,7 +1052,7 @@
-                                   <&cru PCLK_PERI>;
- 		assigned-clock-rates = <594000000>,
- 				       <500000000>, <300000000>,
--				       <150000000>, <75000000>,
-+				       <0>, <75000000>,
- 				       <300000000>, <150000000>,
- 				       <75000000>;
- 	};
 @@ -1303,6 +1303,8 @@
  		resets = <&cru SRST_LCDC0_AXI>, <&cru SRST_LCDC0_AHB>, <&cru SRST_LCDC0_DCLK>;
  		reset-names = "axi", "ahb", "dclk";
@@ -1038,7 +1004,7 @@ index ca6c2ad3de96..415df387a5d6 100644
  			RK3288_CLKGATE_CON(3), 1, GFLAGS),
  	COMPOSITE(DCLK_VOP1, "dclk_vop1", mux_pll_src_cpll_gpll_npll_p, 0,
 
-From fbefbd0989cf14e3d8f7864437a2264ab94c9b3f Mon Sep 17 00:00:00 2001
+From bd89275c319915fc48f830637d9594d5ae9d657d Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 4 Aug 2018 14:51:14 +0200
 Subject: [PATCH] clk: rockchip: rk3288: use npll table to to improve HDMI
@@ -1091,7 +1057,7 @@ index 415df387a5d6..f748a292b7f4 100644
  
  static struct clk_div_table div_hclk_cpu_t[] = {
 
-From d6d68acc58b75aa26c243e21599674e259b58cbd Mon Sep 17 00:00:00 2001
+From e5b26e2385f2792fce564d4ab8901f170ac0ba41 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
 Date: Wed, 30 May 2018 13:06:14 +0200
 Subject: [PATCH] ayufan: fan53555: support syr83x found in rockpro64
@@ -1121,3 +1087,237 @@ index 74e5ae2bc0d2..6b0854a3cae3 100644
  		di->vsel_min = 712500;
  		di->vsel_step = 12500;
  		break;
+
+From 8d6f3424a0d486913f6ab2bebc3cd82e4017be10 Mon Sep 17 00:00:00 2001
+From: Jonas Karlman <jonas@kwiboo.se>
+Date: Sun, 9 Sep 2018 12:33:23 +0200
+Subject: [PATCH] WIP: video: rockchip: iep: fix compile issue
+
+---
+ drivers/video/rockchip/iep/Makefile | 2 +-
+ include/linux/rockchip-iovmm.h      | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/video/rockchip/iep/Makefile b/drivers/video/rockchip/iep/Makefile
+index 37760fbf42b7..c6f7ae87a544 100644
+--- a/drivers/video/rockchip/iep/Makefile
++++ b/drivers/video/rockchip/iep/Makefile
+@@ -1,2 +1,2 @@
+ # SPDX-License-Identifier: GPL-2.0
+-obj-$(CONFIG_IEP) += hw_iep_reg.o iep_drv.o iep_iommu_drm.o iep_iommu_ion.o iep_iommu_ops.o
++obj-$(CONFIG_IEP) += hw_iep_reg.o iep_drv.o iep_iommu_drm.o iep_iommu_ops.o
+diff --git a/include/linux/rockchip-iovmm.h b/include/linux/rockchip-iovmm.h
+index 73e2ff159e86..d87b8d2c9904 100644
+--- a/include/linux/rockchip-iovmm.h
++++ b/include/linux/rockchip-iovmm.h
+@@ -10,6 +10,7 @@
+ #include <linux/list.h>
+ #include <linux/atomic.h>
+ #include <linux/spinlock.h>
++#include <linux/errno.h>
+ 
+ #define IEP_IOMMU_COMPATIBLE_NAME "rockchip,iep_mmu"
+ #define VIP_IOMMU_COMPATIBLE_NAME "rockchip,vip_mmu"
+
+From 1e888a00891c2ded5cd802d987884ad564b8f97f Mon Sep 17 00:00:00 2001
+From: Randy Li <randy.li@rock-chips.com>
+Date: Thu, 20 Sep 2018 10:59:11 +0800
+Subject: [PATCH] Mali: midgard: fix the memory translation for aarch32
+
+When the clients are 32 bits while the kernel is 64 bits,
+we need to translate the memory address before accessing.
+
+Change-Id: I7f47ab94da258e9d170613252aae9b396623cf48
+Signed-off-by: Randy Li <randy.li@rock-chips.com>
+---
+ drivers/gpu/arm/midgard/mali_kbase_core_linux.c | 88 +++++++++++++++++++------
+ 1 file changed, 69 insertions(+), 19 deletions(-)
+
+diff --git a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
+index 24bafe2bf32c..65bc5ad2a7c2 100644
+--- a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
++++ b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
+@@ -515,14 +515,20 @@ copy_failed:
+ 	case KBASE_FUNC_JOB_SUBMIT:
+ 		{
+ 			struct kbase_uk_job_submit *job = args;
++			void __user *user_addr = NULL;
+ 
+ 			if (sizeof(*job) != args_size)
+ 				goto bad_size;
+ 
+-			if (kbase_jd_submit(kctx, job->addr.value,
+-						job->nr_atoms,
+-						job->stride,
+-						false) != 0)
++#ifdef CONFIG_COMPAT
++			if (kbase_ctx_flag(kctx, KCTX_COMPAT))
++				user_addr = compat_ptr(job->addr.compat_value);
++			else
++#endif
++				user_addr = job->addr.value;
++
++			if (kbase_jd_submit(kctx, user_addr, job->nr_atoms,
++					    job->stride, false) != 0)
+ 				ukh->ret = MALI_ERROR_FUNCTION_FAILED;
+ 			break;
+ 		}
+@@ -531,14 +537,20 @@ copy_failed:
+ 	case KBASE_FUNC_JOB_SUBMIT_UK6:
+ 		{
+ 			struct kbase_uk_job_submit *job = args;
++			void __user *user_addr = NULL;
+ 
+ 			if (sizeof(*job) != args_size)
+ 				goto bad_size;
+ 
+-			if (kbase_jd_submit(kctx, job->addr.value,
+-						job->nr_atoms,
+-						job->stride,
+-						true) != 0)
++#ifdef CONFIG_COMPAT
++			if (kbase_ctx_flag(kctx, KCTX_COMPAT))
++				user_addr = compat_ptr(job->addr.compat_value);
++			else
++#endif
++				user_addr = job->addr.value;
++
++			if (kbase_jd_submit(kctx, user_addr, job->nr_atoms,
++					    job->stride, true) != 0)
+ 				ukh->ret = MALI_ERROR_FUNCTION_FAILED;
+ 			break;
+ 		}
+@@ -646,7 +658,8 @@ copy_failed:
+ 				goto bad_size;
+ 
+ 			if (find->gpu_addr & ~PAGE_MASK) {
+-				dev_warn(kbdev->dev, "kbase_legacy_dispatch case KBASE_FUNC_FIND_CPU_OFFSET: find->gpu_addr: passed parameter is invalid");
++				dev_warn(kbdev->dev,
++					"kbase_legacy_dispatch case KBASE_FUNC_FIND_CPU_OFFSET: find->gpu_addr: passed parameter is invalid");
+ 				goto out_bad;
+ 			}
+ 
+@@ -674,8 +687,11 @@ copy_failed:
+ 				goto bad_size;
+ 
+ 			/* version buffer size check is made in compile time assert */
+-			memcpy(get_version->version_buffer, KERNEL_SIDE_DDK_VERSION_STRING, sizeof(KERNEL_SIDE_DDK_VERSION_STRING));
+-			get_version->version_string_size = sizeof(KERNEL_SIDE_DDK_VERSION_STRING);
++			memcpy(get_version->version_buffer,
++			       KERNEL_SIDE_DDK_VERSION_STRING,
++			       sizeof(KERNEL_SIDE_DDK_VERSION_STRING));
++			get_version->version_string_size =
++				sizeof(KERNEL_SIDE_DDK_VERSION_STRING);
+ 			get_version->rk_version = ROCKCHIP_VERSION;
+ 			break;
+ 		}
+@@ -828,7 +844,8 @@ copy_failed:
+ 
+ #ifdef CONFIG_COMPAT
+ 			if (kbase_ctx_flag(kctx, KCTX_COMPAT))
+-				user_buf = compat_ptr(add_data->buf.compat_value);
++				user_buf =
++					compat_ptr(add_data->buf.compat_value);
+ 			else
+ #endif
+ 				user_buf = add_data->buf.value;
+@@ -977,9 +994,9 @@ copy_failed:
+ 
+ 	return ret;
+ 
+- bad_size:
++bad_size:
+ 	dev_err(kbdev->dev, "Wrong syscall size (%d) for %08x\n", args_size, id);
+- out_bad:
++out_bad:
+ 	return -EINVAL;
+ }
+ 
+@@ -1317,7 +1334,16 @@ static int kbase_api_set_flags(struct kbase_context *kctx,
+ static int kbase_api_job_submit(struct kbase_context *kctx,
+ 		struct kbase_ioctl_job_submit *submit)
+ {
+-	return kbase_jd_submit(kctx, submit->addr.value, submit->nr_atoms,
++	void __user *user_addr = NULL;
++
++#ifdef CONFIG_COMPAT
++	if (kbase_ctx_flag(kctx, KCTX_COMPAT))
++		user_addr = compat_ptr(submit->addr.compat_value);
++	else
++#endif
++		user_addr = submit->addr.value;
++
++	return kbase_jd_submit(kctx, user_addr, submit->nr_atoms,
+ 			submit->stride, false);
+ }
+ 
+@@ -1548,6 +1574,7 @@ static int kbase_api_mem_alias(struct kbase_context *kctx,
+ 		union kbase_ioctl_mem_alias *alias)
+ {
+ 	struct base_mem_aliasing_info *ai;
++	void __user *user_addr = NULL;
+ 	u64 flags;
+ 	int err;
+ 
+@@ -1558,8 +1585,15 @@ static int kbase_api_mem_alias(struct kbase_context *kctx,
+ 	if (!ai)
+ 		return -ENOMEM;
+ 
+-	err = copy_from_user(ai, alias->in.aliasing_info.value,
+-			sizeof(*ai) * alias->in.nents);
++#ifdef CONFIG_COMPAT
++	if (kbase_ctx_flag(kctx, KCTX_COMPAT))
++		user_addr =
++			compat_ptr(alias->in.aliasing_info.compat_value);
++	else
++#endif
++		user_addr = alias->in.aliasing_info.value;
++
++	err = copy_from_user(ai, user_addr, sizeof(*ai) * alias->in.nents);
+ 	if (err) {
+ 		vfree(ai);
+ 		return err;
+@@ -1586,10 +1620,18 @@ static int kbase_api_mem_import(struct kbase_context *kctx,
+ {
+ 	int ret;
+ 	u64 flags = import->in.flags;
++	void __user *phandle;
++
++#ifdef CONFIG_COMPAT
++	if (kbase_ctx_flag(kctx, KCTX_COMPAT))
++		phandle = compat_ptr(import->in.phandle.compat_value);
++	else
++#endif
++		phandle = import->in.phandle.value;
+ 
+ 	ret = kbase_mem_import(kctx,
+ 			import->in.type,
+-			import->in.phandle.value,
++			phandle,
+ 			import->in.padding,
+ 			&import->out.gpu_va,
+ 			&import->out.va_pages,
+@@ -1654,6 +1696,7 @@ static int kbase_api_get_profiling_controls(struct kbase_context *kctx,
+ static int kbase_api_mem_profile_add(struct kbase_context *kctx,
+ 		struct kbase_ioctl_mem_profile_add *data)
+ {
++	char __user *user_buf;
+ 	char *buf;
+ 	int err;
+ 
+@@ -1666,7 +1709,14 @@ static int kbase_api_mem_profile_add(struct kbase_context *kctx,
+ 	if (ZERO_OR_NULL_PTR(buf))
+ 		return -ENOMEM;
+ 
+-	err = copy_from_user(buf, data->buffer.value, data->len);
++#ifdef CONFIG_COMPAT
++	if (kbase_ctx_flag(kctx, KCTX_COMPAT))
++		user_buf = compat_ptr(data->buffer.compat_value);
++	else
++#endif
++		user_buf = data->buffer.value;
++
++	err = copy_from_user(buf, user_buf, data->len);
+ 	if (err) {
+ 		kfree(buf);
+ 		return err;

projects/Rockchip/patches/linux/rockchip-4.4/linux-0002-ir.patch

@@ -1,4 +1,4 @@
-From 65d921fb8b2ec126c5e1ff2b846c179d0ab0e4d1 Mon Sep 17 00:00:00 2001
+From 2031709371a600b1b803ec928cc1adb2e9b5a4c1 Mon Sep 17 00:00:00 2001
 From: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 Date: Thu, 19 Nov 2015 11:41:36 -0200
 Subject: [PATCH] UPSTREAM: smsir.h: remove a now duplicated definition
@@ -26,7 +26,7 @@ index fc8b7925c532..d9abd96ef48b 100644
  
  struct ir_t {
 
-From 3e5e8aa798a67f94158f7fbdfca9b31021ffab90 Mon Sep 17 00:00:00 2001
+From 3b533a5c5f7880759fcad51e9400851a80295764 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Wed, 6 Sep 2017 18:39:09 +0200
 Subject: [PATCH] [media] rc/keymaps: add keytable for Pine64 IR Remote
@@ -135,7 +135,7 @@ index 7c4bbc4dfab4..3a34a9631dd1 100644
  #define RC_MAP_PINNACLE_GREY             "rc-pinnacle-grey"
  #define RC_MAP_PINNACLE_PCTV_HD          "rc-pinnacle-pctv-hd"
 
-From 8eab80060ab0c45ed3843ea1ab1d355c2e61c417 Mon Sep 17 00:00:00 2001
+From 21e2e6f847c6e1d0f98ce3770e6d380b20af3064 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Wed, 6 Sep 2017 18:39:09 +0200
 Subject: [PATCH] [media] rc/keymaps: add keytable for ODROID IR Remote
@@ -231,7 +231,7 @@ index 3a34a9631dd1..f1badbfbca90 100644
  #define RC_MAP_PINE64                    "rc-pine64"
  #define RC_MAP_PINNACLE_COLOR            "rc-pinnacle-color"
 
-From e4e4bf0e4ffdf3715d29ce0fdc40ac4942b0b509 Mon Sep 17 00:00:00 2001
+From 0cb159b68f91fb352861a23241a24611201e0d05 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Wed, 6 Sep 2017 18:39:09 +0200
 Subject: [PATCH] [media] rc/keymaps: add keytable for WeTek Hub Remote
@@ -327,7 +327,7 @@ index f1badbfbca90..cd8590c99e22 100644
  #define RC_MAP_VIDEOMATE_S350            "rc-videomate-s350"
  #define RC_MAP_VIDEOMATE_TV_PVR          "rc-videomate-tv-pvr"
 
-From c603eb8c844555707072415329d7bb2572d64fdf Mon Sep 17 00:00:00 2001
+From d81bc903c323311f09eb3f8a298c10d99c62f601 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Wed, 6 Sep 2017 18:39:09 +0200
 Subject: [PATCH] [media] rc/keymaps: add keytable for WeTek Play 2 Remote
@@ -454,7 +454,7 @@ index cd8590c99e22..93cac05a5170 100644
  #define RC_MAP_VIDEOMATE_S350            "rc-videomate-s350"
  #define RC_MAP_VIDEOMATE_TV_PVR          "rc-videomate-tv-pvr"
 
-From 6c88a757042bd1f3ea3ec197aa930b7beb48e11a Mon Sep 17 00:00:00 2001
+From 6518b8acbe53a153740bad1e93c9d361fed136fd Mon Sep 17 00:00:00 2001
 From: hzq <hzq@t-firefly.com>
 Date: Mon, 19 Mar 2018 16:47:24 +0800
 Subject: [PATCH] [media] rc/keymaps: add keytable for ROC-RK3328-CC Remote
@@ -550,7 +550,7 @@ index 93cac05a5170..8bbe335e650c 100644
  #define RC_MAP_STREAMZAP                 "rc-streamzap"
  #define RC_MAP_TBS_NEC                   "rc-tbs-nec"
 
-From 04a93492c4c715a6a826c93f69e0855ca5534e81 Mon Sep 17 00:00:00 2001
+From c0220800efec28f6a59eae563f4f083ceedff6cc Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Tue, 3 Jul 2018 21:55:56 +0200
 Subject: [PATCH] [media] rc/keymaps: add keytable for T-Chip TRN9 IR Remote

projects/Rockchip/patches/linux/rockchip-4.4/linux-0003-cec.patch

@@ -1,4 +1,4 @@
-From dbd999a2a4e11f420098860e84bfb3c9151b4622 Mon Sep 17 00:00:00 2001
+From 0dcc2992b7f03fbe5bf9bd9f65edaf5479bf975a Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 4 Sep 2017 22:34:19 +0200
 Subject: [PATCH] BACKPORT: HDMI CEC support from v4.15
@@ -3041,7 +3041,7 @@ index 2758687300b4..41e8dff588e1 100644
  /*
   * MT_TOOL types
 
-From 48d7f1f5bd8f2a2252158e7eda0d83975d7b170b Mon Sep 17 00:00:00 2001
+From 8e3b262321c2121f8ceed952be3619039aebea9d Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 4 Sep 2017 22:34:22 +0200
 Subject: [PATCH] BACKPORT: Pulse Eight HDMI CEC from v4.15
@@ -3944,7 +3944,7 @@ index becdd78295cc..4588c66a8df0 100644
  
  #endif /* _UAPI_SERIO_H */
 
-From c9a3bba3534d8673f07a233e5298d12979ada5b8 Mon Sep 17 00:00:00 2001
+From 7f6dbf0df7f833b1d9e8da72365eebffd046e7c7 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 4 Sep 2017 22:34:24 +0200
 Subject: [PATCH] BACKPORT: RainShadow Tech HDMI CEC from v4.15
@@ -4427,7 +4427,7 @@ index 4588c66a8df0..89b72003fb68 100644
  
  #endif /* _UAPI_SERIO_H */
 
-From d7ef718f1c62b9f4e0b7042d5b4040a14335c369 Mon Sep 17 00:00:00 2001
+From f532f514ca373430332f2733be987335af7ae75c Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 2 Sep 2017 16:23:11 +0200
 Subject: [PATCH] [media] rc/keymaps: initialize rc-cec early
@@ -4450,7 +4450,7 @@ index 354c8e724b8e..fb0c2b1f3814 100644
  
  MODULE_LICENSE("GPL");
 
-From e583e082ee42c04d3458ee71521175d39b4daed5 Mon Sep 17 00:00:00 2001
+From 54c779a399fb852e06f11a03bf03c31090c4b722 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 2 Sep 2017 16:23:11 +0200
 Subject: [PATCH] drm/bridge: dw-hdmi: read edid on hpd event
@@ -4460,7 +4460,7 @@ Subject: [PATCH] drm/bridge: dw-hdmi: read edid on hpd event
  1 file changed, 19 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-index d57d999c50a5..4ae2735f59e4 100644
+index 8cb2cb4e61a6..c045cc0717cd 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 @@ -2479,6 +2479,7 @@ static void dw_hdmi_bridge_nop(struct drm_bridge *bridge)

projects/Rockchip/patches/linux/rockchip-4.4/linux-0004-audio.patch

@@ -1,4 +1,4 @@
-From dabace918ba0543c5a12e03fb823886891cd82dc Mon Sep 17 00:00:00 2001
+From fa2bd9cdc869b32ba00f0bba79b63e1fd53f8cdb Mon Sep 17 00:00:00 2001
 From: Chris Zhong <zyw@rock-chips.com>
 Date: Mon, 18 Jul 2016 22:34:34 +0800
 Subject: [PATCH] UPSTREAM: ASoC: rockchip: correct the spdif clk
@@ -53,7 +53,7 @@ index c211750b54ee..784941ca2408 100644
  		SPDIF_CFGR_CLK_DIV_MASK | SPDIF_CFGR_HALFWORD_ENABLE |
  		SDPIF_CFGR_VDW_MASK,
 
-From 3069a5725338532939d13e3dc329f2b3d183b260 Mon Sep 17 00:00:00 2001
+From 46e3e82a547b78ca5db11a8444f787fd15f8e8ce Mon Sep 17 00:00:00 2001
 From: Sugar Zhang <sugar.zhang@rock-chips.com>
 Date: Wed, 7 Sep 2016 14:30:21 +0800
 Subject: [PATCH] UPSTREAM: ASoC: rockchip: spdif: restore register during
@@ -100,7 +100,7 @@ index 784941ca2408..831e4caf29d3 100644
  
  static int rk_spdif_hw_params(struct snd_pcm_substream *substream,
 
-From d852c659ff563456480c55cfea53c578399c04ff Mon Sep 17 00:00:00 2001
+From d8a8c9964022565ecf7b5ea7249262c3ac381a1b Mon Sep 17 00:00:00 2001
 From: Arnaud Pouliquen <arnaud.pouliquen@st.com>
 Date: Tue, 3 Jan 2017 16:52:50 +0100
 Subject: [PATCH] UPSTREAM: DRM: add help to get ELD speaker allocation
@@ -148,7 +148,7 @@ index 85861b63e77a..55201e7e2ede 100644
  	int (*get_edid_block)(void *data, u8 *buf, unsigned int block,
  			      size_t len),
 
-From 4e08e72298c858a65950b98ca62613fb95cd0a35 Mon Sep 17 00:00:00 2001
+From e622344ce58345eda1ce7372bf7e91e4e90ece5f Mon Sep 17 00:00:00 2001
 From: Arnaud Pouliquen <arnaud.pouliquen@st.com>
 Date: Tue, 3 Jan 2017 16:52:51 +0100
 Subject: [PATCH] UPSTREAM: ASoC: core: add optional pcm_new callback for DAI
@@ -229,7 +229,7 @@ index 3c6713da3ad9..e46e80c0e07d 100644
  			INIT_DELAYED_WORK(&rtd->delayed_work,
  						codec2codec_close_delayed_work);
 
-From 900f1d7bb2cddd1f445e0f3ef92fb0f7056a4c5a Mon Sep 17 00:00:00 2001
+From 3877e4beac5a5efc2898185fe75555e21cf6b090 Mon Sep 17 00:00:00 2001
 From: Arnaud Pouliquen <arnaud.pouliquen@st.com>
 Date: Tue, 3 Jan 2017 16:52:52 +0100
 Subject: [PATCH] UPSTREAM: ASoC: hdmi-codec: add channel mapping control
@@ -715,7 +715,7 @@ index 028d60c196ae..cb78d8971b41 100644
  	snd_soc_unregister_codec(&pdev->dev);
  	return 0;
 
-From 5ad6154eea74dec3635e2417f06ad12d3f0a36c4 Mon Sep 17 00:00:00 2001
+From 52c48ffd0956821dd3f1315b9ec3fd2a677b2b63 Mon Sep 17 00:00:00 2001
 From: Christophe Jaillet <christophe.jaillet@wanadoo.fr>
 Date: Thu, 15 Jun 2017 07:53:11 +0200
 Subject: [PATCH] UPSTREAM: ASoC: rockchip: Fix an error handling in
@@ -756,7 +756,7 @@ index b359639c1038..02ff642499bf 100644
  		if (val >= 2 && val <= 8)
  			soc_dai->playback.channels_max = val;
 
-From 9aeca2222a8f8a700c446fc9a38235ab2e3a4efd Mon Sep 17 00:00:00 2001
+From 7b9368e1f2d50d7ca5b07ea50240fd8f45d884fe Mon Sep 17 00:00:00 2001
 From: Markus Elfring <elfring@users.sourceforge.net>
 Date: Thu, 10 Aug 2017 18:38:09 +0200
 Subject: [PATCH] UPSTREAM: ASoC: rockchip: Delete an error message for a
@@ -791,7 +791,7 @@ index 02ff642499bf..16ff8d5e0033 100644
  	i2s->dev = &pdev->dev;
  
 
-From dad1bc0769692d7fd45701a4ab3fb55be012e01e Mon Sep 17 00:00:00 2001
+From f217d206adafde4eb886ffbd5ecd7779c37438ef Mon Sep 17 00:00:00 2001
 From: John Keeping <john@metanate.com>
 Date: Thu, 14 Sep 2017 16:58:55 +0100
 Subject: [PATCH] UPSTREAM: ASoC: rockchip: i2s: fix unbalanced clk_disable
@@ -820,7 +820,7 @@ index 16ff8d5e0033..986ad2efc8e9 100644
  
  	return 0;
 
-From 20b260f46771f7313ecd6e296ec6c08a43967eb4 Mon Sep 17 00:00:00 2001
+From 9cca8ff3584aedce10d3099b504e66737c9c9e44 Mon Sep 17 00:00:00 2001
 From: John Keeping <john@metanate.com>
 Date: Mon, 8 Jan 2018 16:01:04 +0000
 Subject: [PATCH] UPSTREAM: ASoC: rockchip: i2s: fix playback after runtime
@@ -887,7 +887,7 @@ index 986ad2efc8e9..5297373fe6c4 100644
  		return false;
  	}
 
-From fa8e48f2fd0abe00ee0f04128a2e9b4fed184c3f Mon Sep 17 00:00:00 2001
+From 7c877ceaa52d81023ebda69e3d90f54ab8403798 Mon Sep 17 00:00:00 2001
 From: Romain Perier <romain.perier@collabora.com>
 Date: Fri, 14 Apr 2017 10:31:12 +0200
 Subject: [PATCH] UPSTREAM: drm: dw-hdmi: add specific I2S and AHB functions
@@ -915,7 +915,7 @@ Link: http://patchwork.freedesktop.org/patch/msgid/20170414083113.4255-2-romain.
  1 file changed, 25 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-index d57d999c50a5..0541d96be662 100644
+index 8cb2cb4e61a6..8726498e9f73 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 @@ -263,6 +263,9 @@ struct dw_hdmi {
@@ -987,7 +987,7 @@ index d57d999c50a5..0541d96be662 100644
  		pdevinfo.name = "dw-hdmi-i2s-audio";
  		pdevinfo.data = &audio;
 
-From f856228e8933ba1e6375dbda53cc59da8d71647a Mon Sep 17 00:00:00 2001
+From 8b1551df18617eba99d59f89724191954a7213a4 Mon Sep 17 00:00:00 2001
 From: Romain Perier <romain.perier@collabora.com>
 Date: Thu, 20 Apr 2017 14:34:34 +0530
 Subject: [PATCH] UPSTREAM: drm: dw-hdmi: gate audio clock from the I2S
@@ -1015,7 +1015,7 @@ Signed-off-by: Archit Taneja <architt@codeaurora.org>
  1 file changed, 17 insertions(+), 7 deletions(-)
 
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-index 0541d96be662..f3a2034a0883 100644
+index 8726498e9f73..17c182cb07b5 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 @@ -824,6 +824,15 @@ void dw_hdmi_set_sample_rate(struct dw_hdmi *hdmi, unsigned int rate)
@@ -1078,7 +1078,7 @@ index 0541d96be662..f3a2034a0883 100644
  		pdevinfo.name = "dw-hdmi-i2s-audio";
  		pdevinfo.data = &audio;
 
-From 5736074e471dc5306e07581bf0958043cf434341 Mon Sep 17 00:00:00 2001
+From 442b913082d21de7a8364344feb520946413da5b Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 7 Aug 2017 22:24:15 +0200
 Subject: [PATCH] drm: dw-hdmi-i2s: sync with upstream
@@ -1157,7 +1157,7 @@ index f1f62d8c1d16..5ff993a35ab6 100644
  		.name = DRIVER_NAME,
  		.owner = THIS_MODULE,
 
-From d2f29756df76806c12fa12b668aeb8ac5f626bdd Mon Sep 17 00:00:00 2001
+From 1d3de24bd61e0bfba1a9e042e040fa65346ccd9d Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 2 Apr 2017 11:33:39 +0200
 Subject: [PATCH] drm: dw-hdmi-i2s: implement get_eld
@@ -1214,7 +1214,7 @@ index 5ff993a35ab6..e7312571e2cb 100644
  
  static int snd_dw_hdmi_probe(struct platform_device *pdev)
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-index f3a2034a0883..c222b6455f03 100644
+index 17c182cb07b5..df1ea752ac3d 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 @@ -3750,6 +3750,7 @@ int dw_hdmi_bind(struct device *dev, struct device *master,
@@ -1226,7 +1226,7 @@ index f3a2034a0883..c222b6455f03 100644
  		hdmi->disable_audio = dw_hdmi_i2s_audio_disable;
  
 
-From 18a9fcdb5cbde0462179d04336622cb4f97c2a7e Mon Sep 17 00:00:00 2001
+From 1e16f2f6b861a7273d922c9251665acec542eed9 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 17 Apr 2017 13:09:16 +0200
 Subject: [PATCH] drm: dw-hdmi-i2s: configure channel allocation
@@ -1249,7 +1249,7 @@ index e7312571e2cb..1d4570e3fbed 100644
  	/* Set LFEPBLDOWN-MIX INH and LSV */
  	hdmi_write(audio, 0x00, HDMI_FC_AUDICONF3);
 
-From c19ba12d08a8c491d21a1daf305b1b58231ca362 Mon Sep 17 00:00:00 2001
+From 747742580e282f4374100909906f6957c997c4a3 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Mon, 14 Aug 2017 00:14:05 +0200
 Subject: [PATCH] ASoC: hdmi-codec: reorder channel map
@@ -1394,7 +1394,7 @@ index cb78d8971b41..b74659bc3bbc 100644
  
  struct hdmi_codec_priv {
 
-From 0b22ce2a2766052fe28a3162623d19ba38adaef5 Mon Sep 17 00:00:00 2001
+From 1cdb1f115b4bc9781c90d01d914dd4bbac6d0977 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 27 Aug 2017 23:32:40 +0200
 Subject: [PATCH] ASoC: codecs: rk3328: limit to working rates
@@ -1422,7 +1422,7 @@ index af1b7429b6d4..d0b4578ffa0e 100644
  				    SNDRV_PCM_FMTBIT_S20_3LE |
  				    SNDRV_PCM_FMTBIT_S24_LE |
 
-From f96be8cf25bfda88d5c492f42e1f6ca5951356f3 Mon Sep 17 00:00:00 2001
+From 878d789ff5faa02f0da5e68126e2276124611eeb Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 8 Jul 2018 12:34:43 +0200
 Subject: [PATCH] drm: dw-hdmi: change audio config
@@ -1467,7 +1467,7 @@ index 1d4570e3fbed..d0904f6b7a82 100644
  
  static int dw_hdmi_i2s_get_eld(struct device *dev, void *data, u8 *buf, size_t len)
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-index c222b6455f03..065723179791 100644
+index df1ea752ac3d..4bf4ff0fd741 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 @@ -89,6 +89,7 @@ static const struct dw_hdmi_audio_tmds_n common_tmds_n_table[] = {
@@ -1511,7 +1511,7 @@ index c222b6455f03..065723179791 100644
  
  static void dw_hdmi_ahb_audio_enable(struct dw_hdmi *hdmi)
 
-From ed2e01d46f3bbf3eda4d37ce2a6e8874b15a478a Mon Sep 17 00:00:00 2001
+From 6bf23972f26fde1abad52cd1a65d1223d51d47c2 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 8 Jul 2018 12:56:51 +0200
 Subject: [PATCH] WIP: drm: dw-hdmi: use Auto CTS mode
@@ -1521,7 +1521,7 @@ Subject: [PATCH] WIP: drm: dw-hdmi: use Auto CTS mode
  1 file changed, 31 insertions(+), 21 deletions(-)
 
 diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
-index 065723179791..841bdfcae3e0 100644
+index 4bf4ff0fd741..2583320f3289 100644
 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
 @@ -643,14 +643,18 @@ static struct i2c_adapter *dw_hdmi_i2c_adapter(struct dw_hdmi *hdmi)

projects/Rockchip/patches/linux/rockchip-4.4/linux-0006-rtl8211f.patch

@@ -1,4 +1,4 @@
-From c5300de0fe982ae8a78e1b95ef7bf30b744e4ca1 Mon Sep 17 00:00:00 2001
+From eec386c5e9f5067dc7fdd3c86adae7de835e090a Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Fri, 25 Nov 2016 14:12:01 +0100
 Subject: [PATCH] UPSTREAM: net: phy: realtek: fix enabling of the TX-delay for
@@ -66,7 +66,7 @@ index 43ab691362d4..686f3b259dc0 100644
  	return 0;
  }
 
-From 647c38d9964680f7fbb24c5a889ef74b23b4cbd4 Mon Sep 17 00:00:00 2001
+From e0a1654d1e79bea21f6397b6caa038c2dee25f97 Mon Sep 17 00:00:00 2001
 From: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
 Date: Tue, 12 Sep 2017 18:54:35 +0900
 Subject: [PATCH] UPSTREAM: net: phy: realtek: rename RTL8211F_PAGE_SELECT to
@@ -132,7 +132,7 @@ index 686f3b259dc0..d58cc8f518ac 100644
  	return 0;
  }
 
-From 724532e7b4ad78722821763c639a73383a0f4418 Mon Sep 17 00:00:00 2001
+From 4ec70bc0ea714cc0129a4631dbda493ba706f40f Mon Sep 17 00:00:00 2001
 From: Jassi Brar <jaswinder.singh@linaro.org>
 Date: Tue, 12 Sep 2017 18:54:36 +0900
 Subject: [PATCH] UPSTREAM: net: phy: realtek: add RTL8201F phy-id and
@@ -235,7 +235,7 @@ index d58cc8f518ac..422cf1f6a60c 100644
  	{ 0x001cc914, 0x001fffff },
  	{ 0x001cc915, 0x001fffff },
 
-From 933e1e195c40a941b6e5dec0c6a3a4bb7f804cf7 Mon Sep 17 00:00:00 2001
+From cd0c207d7747ac36c446099ff018682373999764 Mon Sep 17 00:00:00 2001
 From: Heiner Kallweit <hkallweit1@gmail.com>
 Date: Sun, 12 Nov 2017 16:16:04 +0100
 Subject: [PATCH] UPSTREAM: net: phy: realtek: fix RTL8211F interrupt mode
@@ -280,7 +280,7 @@ index 422cf1f6a60c..a30d0c08c63b 100644
  	return err;
  }
 
-From 046a2dc318a05236e06b09d8c0ca3f1005cbceca Mon Sep 17 00:00:00 2001
+From df04368281177832f4dff078f0cc735ce651ded1 Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Sat, 2 Dec 2017 22:51:24 +0100
 Subject: [PATCH] UPSTREAM: net: phy: realtek: use the BIT and GENMASK macros
@@ -329,7 +329,7 @@ index a30d0c08c63b..f8dc29a75828 100644
  #define RTL8201F_ISR		0x1e
  #define RTL8201F_IER		0x13
 
-From 7894b1cae69475242cdb1ca0fb639a5d70ac6316 Mon Sep 17 00:00:00 2001
+From c6479ba05b0013658491a86171df7e0110a0e85a Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Sat, 2 Dec 2017 22:51:25 +0100
 Subject: [PATCH] UPSTREAM: net: phy: realtek: rename RTL821x_INER_INIT to
@@ -370,7 +370,7 @@ index f8dc29a75828..89308eac4088 100644
  		err = phy_write(phydev, RTL821x_INER, 0);
  
 
-From f6e8b6c88c6b3d4925607575bc4387a289d49708 Mon Sep 17 00:00:00 2001
+From c49b1806174ac4140a3fe90c626ef694992f7db6 Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Sat, 2 Dec 2017 22:51:26 +0100
 Subject: [PATCH] UPSTREAM: net: phy: realtek: group all register bit #defines
@@ -414,7 +414,7 @@ index 89308eac4088..df97d903d2bf 100644
  #define RTL8211F_TX_DELAY	BIT(8)
  
 
-From d5e2b112bb8e5707fc2fb727122ee5a8444ee462 Mon Sep 17 00:00:00 2001
+From 3cd6e2f5de15c4c071d9ca9f02efcbd23b8435ad Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Sat, 2 Dec 2017 22:51:27 +0100
 Subject: [PATCH] UPSTREAM: net: phy: realtek: use the same indentation for all
@@ -474,7 +474,7 @@ index df97d903d2bf..701f34ad7d8d 100644
  MODULE_DESCRIPTION("Realtek PHY driver");
  MODULE_AUTHOR("Johnson Leung");
 
-From 8c16425a3c99a1cca4458eb17bd6414d65074027 Mon Sep 17 00:00:00 2001
+From 47e40b66fdafc0ce940090626759fe8418034a0e Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Sat, 2 Dec 2017 22:51:28 +0100
 Subject: [PATCH] UPSTREAM: net: phy: realtek: add utility functions to
@@ -645,7 +645,7 @@ index 701f34ad7d8d..b1d52e61d91c 100644
  	return 0;
  }
 
-From 13e556c6d4ece3c890edc414f205cc26381e9826 Mon Sep 17 00:00:00 2001
+From b747e5d48f83fd4d3b824578f666ac136bc6de49 Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Sat, 2 Dec 2017 23:06:48 +0100
 Subject: [PATCH] FROMLIST: net: phy: realtek: add support for configuring the
@@ -755,7 +755,7 @@ index b1d52e61d91c..890ea9d18d27 100644
  		return ret;
  
 
-From e8fa4ce26460af84f028b7d215134caa33aa9ecb Mon Sep 17 00:00:00 2001
+From 4264d7cd3670514648b2ef632097c80e210e5690 Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Sat, 2 Dec 2017 23:06:49 +0100
 Subject: [PATCH] FROMLIST: net: phy: realtek: configure the INTB pin on
@@ -834,7 +834,7 @@ index 890ea9d18d27..f307d220b49a 100644
  	return rtl8211x_page_write(phydev, 0xa42, RTL821x_INER, val);
  }
 
-From dd026c252cd898bca0b85eb14aa6479b415d2471 Mon Sep 17 00:00:00 2001
+From 5f21ae02ffa16fafd12f635e7a5965842d7d492a Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Sat, 2 Dec 2017 23:06:50 +0100
 Subject: [PATCH] FROMLIST: net: phy: realtek: add more interrupt bits for
@@ -868,3 +868,4 @@ index f307d220b49a..15d342eefd6d 100644
  
  #define RTL821x_INSR				0x13
  
+

projects/Rockchip/patches/linux/rockchip-4.4/linux-0007-dtoverlay-configfs.patch

@@ -1,4 +1,4 @@
-From bb0e3fa6305fe3dead0aa670d7979d6ebcbaf47d Mon Sep 17 00:00:00 2001
+From 062e69c83449e4f5f363bb3caf4ba411907636d5 Mon Sep 17 00:00:00 2001
 From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
 Date: Thu, 22 Oct 2015 23:30:04 +0300
 Subject: [PATCH] UPSTREAM: configfs: implement binary attributes
@@ -651,7 +651,7 @@ index 758a029011b1..f7300d023dbe 100644
   * If allow_link() exists, the item can symlink(2) out to other
   * items.  If the item is a group, it may support mkdir(2).
 
-From 5bbcb67edd92f639228cbaf7d597af715442db16 Mon Sep 17 00:00:00 2001
+From 2dc994339b24321895cff69fda659e47648871be Mon Sep 17 00:00:00 2001
 From: Octavian Purdila <octavian.purdila@intel.com>
 Date: Wed, 23 Mar 2016 14:14:48 +0200
 Subject: [PATCH] UPSTREAM: configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions
@@ -689,7 +689,7 @@ index f7300d023dbe..658066d63180 100644
  		.ca_name	= __stringify(_name),		\
  		.ca_mode	= S_IWUSR,			\
 
-From 34d6438a4d2cedcd1b47f55a3cc63374252c6682 Mon Sep 17 00:00:00 2001
+From a2a707f138cf997e098a6d3aceac4b0944f7d76e Mon Sep 17 00:00:00 2001
 From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
 Date: Wed, 4 Dec 2013 19:32:00 +0200
 Subject: [PATCH] FROMLIST: OF: DT-Overlay configfs interface (v7)

projects/Rockchip/patches/linux/rockchip-4.4/linux-0008-mmc-pwrseq.patch

@@ -1,4 +1,4 @@
-From 75bb99dc815464846a4add357494acf04212271d Mon Sep 17 00:00:00 2001
+From 625c86fa85aa4d18f7711d0314f2ef78a71b79c0 Mon Sep 17 00:00:00 2001
 From: Julia Lawall <Julia.Lawall@lip6.fr>
 Date: Sat, 14 Nov 2015 18:05:20 +0100
 Subject: [PATCH] UPSTREAM: mmc: pwrseq: constify mmc_pwrseq_ops structures
@@ -56,7 +56,7 @@ index d10538bb5e07..2b16263458af 100644
  	.post_power_on = mmc_pwrseq_simple_post_power_on,
  	.power_off = mmc_pwrseq_simple_power_off,
 
-From 1977551c6ef29f55b398a02112e3075c9a38649d Mon Sep 17 00:00:00 2001
+From dda0216c4619c51bb5e560e2e9a8977ae92c2598 Mon Sep 17 00:00:00 2001
 From: Martin Fuzzey <mfuzzey@parkeon.com>
 Date: Wed, 20 Jan 2016 16:08:03 +0100
 Subject: [PATCH] UPSTREAM: mmc: pwrseq_simple: Make reset-gpios optional to
@@ -128,7 +128,7 @@ index 2b16263458af..aba786daebca 100644
  		goto clk_put;
  	}
 
-From e79ed0004dc68dc2f2189256bf00a1f579c78f1a Mon Sep 17 00:00:00 2001
+From 58975b7a58defa92efd5533cc731fb9a0c1cb780 Mon Sep 17 00:00:00 2001
 From: Peter Chen <peter.chen@freescale.com>
 Date: Wed, 6 Jan 2016 11:34:10 +0800
 Subject: [PATCH] UPSTREAM: mmc: core: pwrseq_simple: remove unused header file
@@ -153,7 +153,7 @@ index aba786daebca..bc173e18b71c 100644
  
  #include <linux/mmc/host.h>
 
-From 545d059f7a0a4c470acfdb0fff30397899597f09 Mon Sep 17 00:00:00 2001
+From 01946788b015b9d3f7d18f5b4a43e09e6bf66623 Mon Sep 17 00:00:00 2001
 From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
 Date: Thu, 14 Apr 2016 14:02:14 +0100
 Subject: [PATCH] UPSTREAM: mmc: pwrseq_simple: add to_pwrseq_simple() macro
@@ -220,7 +220,7 @@ index bc173e18b71c..f94271bb1f6b 100644
  	if (!IS_ERR(pwrseq->reset_gpios))
  		gpiod_put_array(pwrseq->reset_gpios);
 
-From e8c5f0b9383e6a528c8fc00d61755f8187e4c0b8 Mon Sep 17 00:00:00 2001
+From b76637491013b2298cf46729767ba76544d4023b Mon Sep 17 00:00:00 2001
 From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
 Date: Thu, 14 Apr 2016 14:02:15 +0100
 Subject: [PATCH] UPSTREAM: mmc: pwrseq_emmc: add to_pwrseq_emmc() macro
@@ -267,7 +267,7 @@ index 4a82bc77fe49..c2d732aa464c 100644
  	unregister_restart_handler(&pwrseq->reset_nb);
  	gpiod_put(pwrseq->reset_gpio);
 
-From ef2f3c5b7375b930697a64c85f30f9109e631cb0 Mon Sep 17 00:00:00 2001
+From c1631d2cea4e5956e368c4652859a9090a509af2 Mon Sep 17 00:00:00 2001
 From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
 Date: Thu, 14 Apr 2016 14:02:16 +0100
 Subject: [PATCH] UPSTREAM: mmc: pwrseq: convert to proper platform device
@@ -785,7 +785,7 @@ index f94271bb1f6b..450d907c6e6c 100644
 +module_platform_driver(mmc_pwrseq_simple_driver);
 +MODULE_LICENSE("GPL v2");
 
-From 42eb02ddb70002e4f72fa627037b6acbdd4cb7a1 Mon Sep 17 00:00:00 2001
+From 2abada2ff3999a38dc87d5803f98141a0971c06c Mon Sep 17 00:00:00 2001
 From: Hans de Goede <hdegoede@redhat.com>
 Date: Sun, 7 Aug 2016 21:02:38 +0200
 Subject: [PATCH] UPSTREAM: mmc: pwrseq-simple: Add an optional
@@ -861,7 +861,7 @@ index 450d907c6e6c..1304160de168 100644
  	pwrseq->pwrseq.ops = &mmc_pwrseq_simple_ops;
  	pwrseq->pwrseq.owner = THIS_MODULE;
 
-From bf90ebd56d6f327f77bd7add55b3593679cd5c67 Mon Sep 17 00:00:00 2001
+From 4d0a703460821fc7541ae96916eca948e326b16c Mon Sep 17 00:00:00 2001
 From: Ulf Hansson <ulf.hansson@linaro.org>
 Date: Sat, 6 May 2017 11:41:30 +0200
 Subject: [PATCH] UPSTREAM: mmc: dt: pwrseq-simple: Invent power-off-delay-us
@@ -897,7 +897,7 @@ index e25436861867..9029b45b8a22 100644
  Example:
  
 
-From bc79b1f8ca4d16d45b93c2888474bb3f11b10226 Mon Sep 17 00:00:00 2001
+From e85294cdf12c6a6e6fb3c24cae1ad0994ae6aca2 Mon Sep 17 00:00:00 2001
 From: Ulf Hansson <ulf.hansson@linaro.org>
 Date: Sat, 6 May 2017 11:43:05 +0200
 Subject: [PATCH] UPSTREAM: mmc: pwrseq_simple: Parse DTS for the

projects/Rockchip/patches/linux/rockchip-4.4/linux-0009-mmc.patch

@@ -1,4 +1,4 @@
-From 38396ba52ab85ea1eabea3c92fd7532f8732f92e Mon Sep 17 00:00:00 2001
+From 569de779d11ff8739e9ab4d8b4a5c505d1892e12 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Tue, 24 Jul 2018 15:49:29 +0200
 Subject: [PATCH] mmc: core: use hs400es voltage flags
@@ -25,7 +25,7 @@ index a814eb6882aa..1d950f0b3aa6 100644
  
  	/* If fails try again during next card power cycle */
 
-From 92a57737adc14e15e80b6913932bb5d2d3478068 Mon Sep 17 00:00:00 2001
+From feda1a0c04130bd7391570025c5349e506ce8250 Mon Sep 17 00:00:00 2001
 From: Haibo Chen <haibo.chen@nxp.com>
 Date: Tue, 8 Aug 2017 18:54:01 +0800
 Subject: [PATCH] UPSTREAM: mmc: mmc: correct the logic for setting HS400ES
@@ -59,7 +59,7 @@ index 1d950f0b3aa6..70de514dd061 100644
  
  	if (!(host->caps & MMC_CAP_8_BIT_DATA)) {
 
-From 108a045df9dc1cee2127aec0bdd327ba7f2fdb81 Mon Sep 17 00:00:00 2001
+From 44476ecad8800bb8412f65c03508c68b1a0e1dbc Mon Sep 17 00:00:00 2001
 From: Ulf Hansson <ulf.hansson@linaro.org>
 Date: Wed, 25 Jan 2017 10:12:10 +0100
 Subject: [PATCH] UPSTREAM: mmc: core: Remove redundant code in
@@ -97,7 +97,7 @@ index 3e3c79feb07b..b69c96ad9486 100644
  	 * If we cannot switch voltages, return failure so the caller
  	 * can continue without UHS mode
 
-From d28c1bfff6556db2c4ce1093091293cf20542202 Mon Sep 17 00:00:00 2001
+From aeee71440b8948d2415527762a6bb9148b7d3cfa Mon Sep 17 00:00:00 2001
 From: Ulf Hansson <ulf.hansson@linaro.org>
 Date: Wed, 25 Jan 2017 10:25:01 +0100
 Subject: [PATCH] UPSTREAM: mmc: core: Clarify usage of
@@ -187,7 +187,7 @@ index c586b11a40b5..f221418542e2 100644
  			mmc_sdio_resend_if_cond(host, card);
  			retries--;
 
-From 0f61c64862ed54163c5f88389170c95055a74f68 Mon Sep 17 00:00:00 2001
+From 8e6435c0331f574240c316ae2406b5fc5c9e46af Mon Sep 17 00:00:00 2001
 From: Ulf Hansson <ulf.hansson@linaro.org>
 Date: Wed, 25 Jan 2017 11:12:34 +0100
 Subject: [PATCH] UPSTREAM: mmc: core: Rename __mmc_set_signal_voltage() to
@@ -315,7 +315,7 @@ index 70de514dd061..dd0040a10c0b 100644
  
  		pr_err("%s: %s failed, error %d\n", mmc_hostname(card->host),
 
-From db9fd591980256d95de5675ebd84759b9cc9831c Mon Sep 17 00:00:00 2001
+From 4e08609c259fd79367a83f8907f5e89747007573 Mon Sep 17 00:00:00 2001
 From: Adrian Hunter <adrian.hunter@intel.com>
 Date: Mon, 25 Sep 2017 11:29:03 +0300
 Subject: [PATCH] UPSTREAM: mmc: core: Factor out mmc_host_set_uhs_voltage()
@@ -411,7 +411,7 @@ index 0e4bc1c7a773..11f3d2c22ecb 100644
  void mmc_set_timing(struct mmc_host *host, unsigned int timing);
  void mmc_set_driver_type(struct mmc_host *host, unsigned int drv_type);
 
-From 9c2d593200bd835b8e55eb6e0ba188e4dd9c744e Mon Sep 17 00:00:00 2001
+From f875b30606e15e1b2f30982476a7de2d05682fb6 Mon Sep 17 00:00:00 2001
 From: Adrian Hunter <adrian.hunter@intel.com>
 Date: Mon, 25 Sep 2017 11:29:04 +0300
 Subject: [PATCH] UPSTREAM: mmc: sd: Fix signal voltage when there is no power
@@ -532,7 +532,7 @@ index d9943d82db95..2808a281d094 100644
  	return 0;
  
 
-From 6ee3035196c307a77f95b1c1f3cc537e467fb838 Mon Sep 17 00:00:00 2001
+From 9cfa1314108ecd9922ae05ff7c80effb21a92b95 Mon Sep 17 00:00:00 2001
 From: Ulf Hansson <ulf.hansson@linaro.org>
 Date: Thu, 5 Apr 2018 21:24:15 +0200
 Subject: [PATCH] UPSTREAM: mmc: core: Share internal function to set initial
@@ -603,7 +603,7 @@ index 11f3d2c22ecb..2634722265ad 100644
  void mmc_set_driver_type(struct mmc_host *host, unsigned int drv_type);
  int mmc_select_drive_strength(struct mmc_card *card, unsigned int max_dtr,
 
-From adadab9687a3e07be7557e4272fdf5a007b4c604 Mon Sep 17 00:00:00 2001
+From 102ef77480a77195821125c6c5afe0b61ac2672c Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Tue, 24 Jul 2018 15:50:06 +0200
 Subject: [PATCH] mmc: core: set initial signal voltage on power off

projects/Rockchip/patches/linux/rockchip-4.4/linux-0010-dvb.patch

@@ -1,4 +1,4 @@
-From ae39146426642d51de99ba3bdef54912c579991b Mon Sep 17 00:00:00 2001
+From 77d2716cf5579c4ad74df978ad58d983419cc44b Mon Sep 17 00:00:00 2001
 From: Jakub Kicinski <jakub.kicinski@netronome.com>
 Date: Wed, 31 Aug 2016 12:46:44 +0100
 Subject: [PATCH] UPSTREAM: add basic register-field manipulation macros
@@ -167,7 +167,7 @@ index 7f4818673c41..edd3d8d3cd90 100644
  	BUILD_BUG_ON((n) == 0 || (((n) & ((n) - 1)) != 0))
  
 
-From 8c11cf13e9f5c633bc2d1f3414d3b95c9cc82e4c Mon Sep 17 00:00:00 2001
+From 3841d053b087e87d8d3d77738452c3b14d724049 Mon Sep 17 00:00:00 2001
 From: Jakub Kicinski <jakub.kicinski@netronome.com>
 Date: Thu, 9 Feb 2017 09:17:27 -0800
 Subject: [PATCH] UPSTREAM: bitfield.h: add FIELD_FIT() helper
@@ -207,7 +207,7 @@ index f6505d83069d..8b9d6fff002d 100644
   * FIELD_PREP() - prepare a bitfield element
   * @_mask: shifted mask defining the field's length and position
 
-From 9b03f083c3ba2b3ca6dbcfdc76bf24edfe8b2947 Mon Sep 17 00:00:00 2001
+From b0dcc7c8cc60ef7877baf3639a46344d8b184fc7 Mon Sep 17 00:00:00 2001
 From: Laurent Defert <laurent.defert@smartjog.com>
 Date: Wed, 11 Oct 2017 08:46:52 +0200
 Subject: [PATCH] FROMLIST: compat_ioctl: add compat handler for

projects/Rockchip/patches/linux/rockchip-4.4/linux-1000-pl330.patch

@@ -1,4 +1,158 @@
-From 0a3affb0d28223e6ffbdb3ccceeaae1ed7a35b21 Mon Sep 17 00:00:00 2001
+From de1d7ef4900e4083d3eb61a41ef21970cd572a59 Mon Sep 17 00:00:00 2001
+From: Jonas Karlman <jonas@kwiboo.se>
+Date: Sat, 8 Sep 2018 11:03:36 +0200
+Subject: [PATCH] Revert "dmaengine: pl330: add support for interlace single
+ xfer"
+
+This reverts commit 83623425bceb4005151379cc959e41eddd2a0937.
+---
+ drivers/dma/pl330.c | 10 +---------
+ 1 file changed, 1 insertion(+), 9 deletions(-)
+
+diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
+index b14f5c225401..8746c24d3cd7 100644
+--- a/drivers/dma/pl330.c
++++ b/drivers/dma/pl330.c
+@@ -1477,12 +1477,6 @@ static inline int _setup_loops(struct pl330_dmac *pl330,
+ 		off += _emit_FLUSHP(dry_run, &buf[off],
+ 					pxs->desc->peri);
+ #endif
+-	if (pxs->desc->rqtype == DMA_DEV_TO_MEM)
+-		bursts = x->bytes / (BRST_SIZE(ccr) * BRST_LEN(ccr) +
+-				     pxs->desc->dst_interlace_size);
+-	else if (pxs->desc->rqtype == DMA_MEM_TO_DEV)
+-		bursts = x->bytes / (BRST_SIZE(ccr) * BRST_LEN(ccr) +
+-				     pxs->desc->src_interlace_size);
+ 	while (bursts) {
+ 		c = bursts;
+ 		off += _loop(pl330, dry_run, &buf[off], &c, pxs);
+@@ -1507,9 +1501,7 @@ static inline int _setup_xfer(struct pl330_dmac *pl330,
+ 	/* Setup Loop(s) */
+ 	off += _setup_loops(pl330, dry_run, &buf[off], pxs);
+ 
+-	if (pxs->desc->src_interlace_size == 0 &&
+-	    pxs->desc->dst_interlace_size == 0 &&
+-	    pl330->peripherals_req_type == BURST) {
++	if (pl330->peripherals_req_type == BURST) {
+ 		unsigned int ccr = pxs->ccr;
+ 		unsigned long c = 0;
+ 
+
+From 875fb88fb64f5dc61abb8c4a311de82b68792d0e Mon Sep 17 00:00:00 2001
+From: Jonas Karlman <jonas@kwiboo.se>
+Date: Sat, 1 Sep 2018 07:43:58 +0200
+Subject: [PATCH] Revert "dmaengine: pl330: _loop_cyclic: fixup loopcnt is too
+ large"
+
+This reverts commit 8ea3f97aab1b68b5aa1aece7eb83bef6d08b3c84.
+---
+ drivers/dma/pl330.c | 67 +++++++++++++++++------------------------------------
+ 1 file changed, 21 insertions(+), 46 deletions(-)
+
+diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
+index 8746c24d3cd7..5893c11dd858 100644
+--- a/drivers/dma/pl330.c
++++ b/drivers/dma/pl330.c
+@@ -1341,14 +1341,19 @@ static inline int _loop(struct pl330_dmac *pl330, unsigned dry_run, u8 buf[],
+ 	return off;
+ }
+ 
+-static int _period(struct pl330_dmac *pl330, unsigned int dry_run, u8 buf[],
+-		   unsigned long bursts, const struct _xfer_spec *pxs, int ev)
++/* Returns bytes consumed */
++static inline int _loop_cyclic(struct pl330_dmac *pl330, unsigned dry_run,
++		u8 buf[], unsigned long bursts, const struct _xfer_spec *pxs, int ev)
+ {
+-	unsigned int lcnt1, ljmp1;
+-	int cyc, off = 0;
++	int cyc, off;
++	unsigned lcnt0, lcnt1, ljmp0, ljmp1, ljmpfe;
+ 	struct _arg_LPEND lpend;
+ 	struct pl330_xfer *x = &pxs->desc->px;
+ 
++	off = 0;
++	ljmpfe = off;
++	lcnt0 = pxs->desc->num_periods;
++
+ 	if (bursts > 256) {
+ 		lcnt1 = 256;
+ 		cyc = bursts / 256;
+@@ -1357,6 +1362,18 @@ static int _period(struct pl330_dmac *pl330, unsigned int dry_run, u8 buf[],
+ 		cyc = 1;
+ 	}
+ 
++	/* forever loop */
++	off += _emit_MOV(dry_run, &buf[off], SAR, x->src_addr);
++	off += _emit_MOV(dry_run, &buf[off], DAR, x->dst_addr);
++#ifdef CONFIG_ARCH_ROCKCHIP
++	if (!(pl330->quirks & PL330_QUIRK_BROKEN_NO_FLUSHP))
++		off += _emit_FLUSHP(dry_run, &buf[off],
++					pxs->desc->peri);
++#endif
++	/* loop0 */
++	off += _emit_LP(dry_run, &buf[off], 0,  lcnt0);
++	ljmp0 = off;
++
+ 	/* loop1 */
+ 	off += _emit_LP(dry_run, &buf[off], 1, lcnt1);
+ 	ljmp1 = off;
+@@ -1407,54 +1424,12 @@ static int _period(struct pl330_dmac *pl330, unsigned int dry_run, u8 buf[],
+ 
+ 	off += _emit_SEV(dry_run, &buf[off], ev);
+ 
+-	return off;
+-}
+-
+-/* Returns bytes consumed */
+-static inline int _loop_cyclic(struct pl330_dmac *pl330, unsigned int dry_run,
+-		u8 buf[], unsigned long bursts, const struct _xfer_spec *pxs, int ev)
+-{
+-	int off, periods, residue, i;
+-	unsigned int lcnt0, ljmp0, ljmpfe;
+-	struct _arg_LPEND lpend;
+-	struct pl330_xfer *x = &pxs->desc->px;
+-
+-	off = 0;
+-	ljmpfe = off;
+-	lcnt0 = pxs->desc->num_periods;
+-	periods = 1;
+-
+-	while (lcnt0 > 256) {
+-		periods++;
+-		lcnt0 = pxs->desc->num_periods / periods;
+-	}
+-
+-	residue = pxs->desc->num_periods % periods;
+-
+-	/* forever loop */
+-	off += _emit_MOV(dry_run, &buf[off], SAR, x->src_addr);
+-	off += _emit_MOV(dry_run, &buf[off], DAR, x->dst_addr);
+-#ifdef CONFIG_ARCH_ROCKCHIP
+-	if (!(pl330->quirks & PL330_QUIRK_BROKEN_NO_FLUSHP))
+-		off += _emit_FLUSHP(dry_run, &buf[off],
+-					pxs->desc->peri);
+-#endif
+-	/* loop0 */
+-	off += _emit_LP(dry_run, &buf[off], 0,  lcnt0);
+-	ljmp0 = off;
+-
+-	for (i = 0; i < periods; i++)
+-		off += _period(pl330, dry_run, &buf[off], bursts, pxs, ev);
+-
+ 	lpend.cond = ALWAYS;
+ 	lpend.forever = false;
+ 	lpend.loop = 0;
+ 	lpend.bjump = off - ljmp0;
+ 	off += _emit_LPEND(dry_run, &buf[off], &lpend);
+ 
+-	for (i = 0; i < residue; i++)
+-		off += _period(pl330, dry_run, &buf[off], bursts, pxs, ev);
+-
+ 	lpend.cond = ALWAYS;
+ 	lpend.forever = true;
+ 	lpend.loop = 1;
+
+From b773c238a40773bd6f717701324630a917b67567 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 3 Jun 2018 07:36:35 +0200
 Subject: [PATCH] Revert "dmaengine: pl330: add support for interlace cyclic
@@ -78,7 +232,7 @@ index 5893c11dd858..b4a0d48bafa4 100644
  }
  
 
-From 16aaccef2d6178e8ce9bdb676526301fd071c3d6 Mon Sep 17 00:00:00 2001
+From b933f0eb613228472124849615f5a5e075b8b787 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 3 Jun 2018 07:36:53 +0200
 Subject: [PATCH] Revert "dmaengine: pl330: add support for interlace size
@@ -216,7 +370,7 @@ index 3050f88daf9e..948c17e409e9 100644
  
  /**
 
-From ef7bddfb9e1490a323aa322b3f1719f071720f3b Mon Sep 17 00:00:00 2001
+From 90870281a7399dffb49ff4d631ee9df249c3d0c0 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 4 Feb 2018 10:47:28 +0100
 Subject: [PATCH] Revert "dmaengine: pl330: fix bug that chan descdone is null"
@@ -257,7 +411,7 @@ index babaeace0a8a..6e375d7ec09c 100644
  	}
  
 
-From 0e87104dd4138e358202bc6bad1f6ca2701fb711 Mon Sep 17 00:00:00 2001
+From ca7c03b12f7c113e9f722a02c7acebabb2cccc27 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 4 Feb 2018 10:47:38 +0100
 Subject: [PATCH] Revert "dmaengine: pl330: flush before first loop"
@@ -298,7 +452,7 @@ index 6e375d7ec09c..9664f71dbab2 100644
  		c = bursts;
  		off += _loop(pl330, dry_run, &buf[off], &c, pxs);
 
-From 31a66caa86b6ed3bde555f70d7d6cb351ff60156 Mon Sep 17 00:00:00 2001
+From 7e5d6f86b631c40624eb595910c23e7972783347 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 4 Feb 2018 10:47:51 +0100
 Subject: [PATCH] Revert "dmaengine: pl330: fix 2 bursts transfer when dma
@@ -348,7 +502,7 @@ index 9664f71dbab2..9c3699ad2245 100644
  		if (!(pl330->quirks & PL330_QUIRK_BROKEN_NO_FLUSHP))
  			off += _emit_FLUSHP(dry_run, &buf[off],
 
-From 4429392f7f65d46bac1dd0dda3d8611663acce63 Mon Sep 17 00:00:00 2001
+From 846d1829607d8806fd932fa3f8f4f0eb9e71d241 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 21 Oct 2017 19:49:27 +0200
 Subject: [PATCH] Revert "dmaengine: pl330: _loop_cyclic fix cycles of last
@@ -373,7 +527,7 @@ index 9c3699ad2245..be4ea6e089ae 100644
  			off += _bursts(pl330, dry_run, &buf[off], pxs, 1);
  			lpend.cond = ALWAYS;
 
-From 4bd0efa160df1d9cdfd2fd213b96587cb7961c76 Mon Sep 17 00:00:00 2001
+From f7fdbad73413294e56e632fa8353765b8e205582 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 4 Feb 2018 11:05:44 +0100
 Subject: [PATCH] Revert "dmaengine: pl330: pl330_tasklet init power_down by
@@ -398,7 +552,7 @@ index be4ea6e089ae..2ba795d599fb 100644
  	} else {
  		/* Make sure the PL330 Channel thread is active */
 
-From 2550b832a5aec4d0a2b584bed27a789cb76c2d35 Mon Sep 17 00:00:00 2001
+From 07a5172605729425390855a0b6ced66bfde22ee5 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Fri, 16 Jun 2017 23:14:54 +0200
 Subject: [PATCH] Revert "dmaengine: pl330: _loop_cyclic supports unaligned
@@ -474,7 +628,7 @@ index 2ba795d599fb..e5b3893d441e 100644
  						pxs, thrd->ev);
  	}
 
-From ce768db94e3fb2c33d68ccf90001f725c0c7feb5 Mon Sep 17 00:00:00 2001
+From 5083d82f6622749e07174fe6da32e431068b59cb Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Fri, 16 Jun 2017 23:14:54 +0200
 Subject: [PATCH] Revert "dmaengine: pl330: redefine the cyclic transfer"
@@ -689,7 +843,7 @@ index e5b3893d441e..38c46f4e0408 100644
  	fill_px(&desc->px, dst, src, period_len);
  
 
-From 8ad1819a2e61483c3840d09b9a27f669c7fcb8bc Mon Sep 17 00:00:00 2001
+From e8a5eaffda3179b78b9d1bb619ddf25dd651d134 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Fri, 16 Jun 2017 23:14:54 +0200
 Subject: [PATCH] Revert "dmaengine: pl330: make transfer run infinitely
@@ -1032,7 +1186,7 @@ index 38c46f4e0408..ad9d616551f8 100644
  
  	return &desc->txd;
 
-From ef009783e673113536eb2c9809f3787f5aeef87a Mon Sep 17 00:00:00 2001
+From 0cb8495a963957245b2196e34e404472445a9d3a Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 22 Jul 2018 16:07:46 +0200
 Subject: [PATCH] Revert "dmaengine: pl330: fix error message to
@@ -1059,7 +1213,7 @@ index ad9d616551f8..3d5d91084605 100644
  		goto updt_exit;
  	}
 
-From 45c38c611da7df545138bf436f43e78481a6fa1a Mon Sep 17 00:00:00 2001
+From c32a7b1b9bac8450d9c0ff71b2256714ab32e5c3 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Fri, 16 Jun 2017 23:14:55 +0200
 Subject: [PATCH] Revert "dmaengine: pl330: support transfer that doesn't align
@@ -1119,7 +1273,7 @@ index 3d5d91084605..2f5f8d40147c 100644
  	off += _setup_xfer(pl330, dry_run, &buf[off], pxs);
  
 
-From 0be5f99a27515b375304a2dc85226a2fd3d560cd Mon Sep 17 00:00:00 2001
+From 8a5c2aac1f170e5d8a8cdce3ab147cf641e38981 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Fri, 16 Jun 2017 23:14:55 +0200
 Subject: [PATCH] Revert "dmaengine: pl330: add burst mode according to dts
@@ -1220,7 +1374,7 @@ index 2f5f8d40147c..f7977979cbf5 100644
  	for (i = 0; i < ARRAY_SIZE(of_quirks); i++)
  		if (of_property_read_bool(np, of_quirks[i].quirk))
 
-From a3456e55253a88214f07c72127744eee7e81ede1 Mon Sep 17 00:00:00 2001
+From 31567aa7a43385bbc429eff72855b49c90c2ac97 Mon Sep 17 00:00:00 2001
 From: Vinod Koul <vinod.koul@intel.com>
 Date: Tue, 5 Jul 2016 10:02:16 +0530
 Subject: [PATCH] UPSTREAM: dmaengine: pl330: explicitly freeup irq
@@ -1263,7 +1417,7 @@ index f7977979cbf5..b6793b0d53c9 100644
  
  	/* Idle the DMAC */
 
-From f1fd696d39b9ded57b30f79bbe23317262481a80 Mon Sep 17 00:00:00 2001
+From ba1d527ad2e0ac6b1f60f79b6e15cd2231876367 Mon Sep 17 00:00:00 2001
 From: Stephen Barber <smbarber@chromium.org>
 Date: Thu, 18 Aug 2016 17:59:59 -0700
 Subject: [PATCH] UPSTREAM: dmaengine: pl330: fix residual for non-running BUSY
@@ -1323,7 +1477,7 @@ index b6793b0d53c9..7e05ef5ba37f 100644
  			transferred = 0;
  		residual += desc->bytes_requested - transferred;
 
-From 5cb6529514e53ca8db016137788675be769a75b7 Mon Sep 17 00:00:00 2001
+From c6ddb1c340be89262163fc1f1ddbeff2b7adac7c Mon Sep 17 00:00:00 2001
 From: Hsin-Yu Chao <hychao@chromium.org>
 Date: Tue, 23 Aug 2016 17:16:55 +0800
 Subject: [PATCH] UPSTREAM: dmaengine: pl330: Acquire dmac's spinlock in
@@ -1368,7 +1522,7 @@ index 7e05ef5ba37f..93efdcc54f19 100644
  
  out:
 
-From cd1b3fa8ef7ec0a775321d44d2f5469ffbab7431 Mon Sep 17 00:00:00 2001
+From a2bd9dfc9421a44c86ad35c6b29fc28534917553 Mon Sep 17 00:00:00 2001
 From: Stephen Barber <smbarber@chromium.org>
 Date: Tue, 1 Nov 2016 16:44:27 -0700
 Subject: [PATCH] UPSTREAM: dmaengine: pl330: Handle xferred count if DMAMOV
@@ -1403,7 +1557,7 @@ index 93efdcc54f19..497cc048feaa 100644
  }
  
 
-From 5f387aa530599beb607885a28a5bbf8f50d1dbb6 Mon Sep 17 00:00:00 2001
+From 166204f617a83115d81ffdf34329757b4b1f9fb0 Mon Sep 17 00:00:00 2001
 From: Vladimir Murzin <vladimir.murzin@arm.com>
 Date: Wed, 7 Dec 2016 13:17:40 +0000
 Subject: [PATCH] UPSTREAM: dmaengine: pl330: do not generate unaligned access
@@ -1505,7 +1659,7 @@ index 497cc048feaa..eb274eeda0aa 100644
  	return SZ_DMAGO;
  }
 
-From 90b0d473241a84db9a284123c7357231a0ffd7d2 Mon Sep 17 00:00:00 2001
+From 50165cc7de07efd5986eeb604bbefe6328a142c4 Mon Sep 17 00:00:00 2001
 From: Vinod Koul <vinod.koul@intel.com>
 Date: Fri, 9 Dec 2016 15:24:12 +0530
 Subject: [PATCH] =?UTF-8?q?UPSTREAM:=20dmaengine:=20pl330:=20remove=20unus?=
@@ -1546,7 +1700,7 @@ index eb274eeda0aa..14efb0e4a6a8 100644
  	if ((pl330->pcfg.periph_id & 0xfffff) != PERIPH_ID_VAL) {
  		dev_err(pl330->ddma.dev, "PERIPH_ID 0x%x !\n",
 
-From 10abe915578c8bbd0e2621a255718beecc6a3425 Mon Sep 17 00:00:00 2001
+From 9d2bcf1dd31ccb4cf3486deeda428b5e4211aff7 Mon Sep 17 00:00:00 2001
 From: Marek Szyprowski <m.szyprowski@samsung.com>
 Date: Mon, 27 Mar 2017 07:31:03 +0200
 Subject: [PATCH] UPSTREAM: dmaengine: pl330: remove pdata based initialization
@@ -1725,7 +1879,7 @@ index fe93758e8403..000000000000
 -extern bool pl330_filter(struct dma_chan *chan, void *param);
 -#endif	/* __AMBA_PL330_H_ */
 
-From 1ecb8e7abb5ba82380d83c7951621faeba06389e Mon Sep 17 00:00:00 2001
+From 4ecadbeac3bbd8cd7e2377681b458a4036c33233 Mon Sep 17 00:00:00 2001
 From: Jean-Philippe Brucker <jean-philippe.brucker@arm.com>
 Date: Thu, 1 Jun 2017 19:22:01 +0100
 Subject: [PATCH] UPSTREAM: dmaengine: pl330: fix warning in pl330_remove
@@ -1757,7 +1911,7 @@ index 8d6c483663dc..f6a4a89ae8aa 100644
  
  	dma_async_device_unregister(&pl330->ddma);
 
-From 7d8694893a9e8d32c82b52fa589fe1e5660ec590 Mon Sep 17 00:00:00 2001
+From 062d0ddfbc9c08f971870e6ce8636a06b5b6d4d7 Mon Sep 17 00:00:00 2001
 From: Matthias Kaehlcke <mka@chromium.org>
 Date: Thu, 15 Jun 2017 16:55:57 -0700
 Subject: [PATCH] UPSTREAM: dmaengine: pl330: Delete unused functions
@@ -1872,7 +2026,7 @@ index f6a4a89ae8aa..bd4a0c3deaf6 100644
  		enum pl330_cond cond, u8 peri)
  {
 
-From 66625effb6e47117c803249fc0d843eff367f32b Mon Sep 17 00:00:00 2001
+From 5d7da5fbd04fb60500162c823056b836c78ba397 Mon Sep 17 00:00:00 2001
 From: Arvind Yadav <arvind.yadav.cs@gmail.com>
 Date: Wed, 23 Aug 2017 21:57:31 +0530
 Subject: [PATCH] UPSTREAM: dmaengine: pl330: constify amba_id
@@ -1901,7 +2055,7 @@ index bd4a0c3deaf6..63ffb8d1f885 100644
  		.id	= 0x00041330,
  		.mask	= 0x000fffff,
 
-From 32b006c4a5e5af627e8daa773a49da36a5deeced Mon Sep 17 00:00:00 2001
+From 79dd0f02e59662d1f1ce0b118280356ed9e63d65 Mon Sep 17 00:00:00 2001
 From: Alexander Kochetkov <al.kochet@gmail.com>
 Date: Wed, 4 Oct 2017 14:37:23 +0300
 Subject: [PATCH] UPSTREAM: dmaengine: pl330: fix descriptor allocation fail
@@ -2029,7 +2183,7 @@ index 63ffb8d1f885..257492238cea 100644
  
  	INIT_LIST_HEAD(&pd->channels);
 
-From 60af02189c1e3cc3d8e957754ac0f97dc20655f5 Mon Sep 17 00:00:00 2001
+From a285cd8b8945bbe899f23e90c98d54249903e7bf Mon Sep 17 00:00:00 2001
 From: Frank Mori Hess <fmh6jj@gmail.com>
 Date: Wed, 18 Apr 2018 20:31:06 -0400
 Subject: [PATCH] UPSTREAM: dmaengine: pl330: flush before wait, and add dev
@@ -2388,7 +2542,7 @@ index 257492238cea..fd48c031ead8 100644
  		desc->bytes_requested = sg_dma_len(sg);
  	}
 
-From b970d8fda69d56f0c9b59e436493bbbc6448ef10 Mon Sep 17 00:00:00 2001
+From 058373c4d717d3a353bca1345ea90f8ca6531136 Mon Sep 17 00:00:00 2001
 From: Marek Szyprowski <m.szyprowski@samsung.com>
 Date: Tue, 19 Jun 2018 15:20:50 +0200
 Subject: [PATCH] UPSTREAM: dmaengine: pl330: report BURST residue granularity
@@ -2417,3 +2571,140 @@ index fd48c031ead8..029bd0444137 100644
  	pd->max_burst = ((pl330->quirks & PL330_QUIRK_BROKEN_NO_FLUSHP) ?
  			 1 : PL330_MAX_BURST);
  
+
+From 05fa0eafd6eda3e61ac5d4a9511eb4d1bb1924f9 Mon Sep 17 00:00:00 2001
+From: Vinod Koul <vkoul@kernel.org>
+Date: Mon, 9 Jul 2018 17:09:58 +0530
+Subject: [PATCH] dmaengine: pl330: Mark expected switch fall-through
+
+In preparation to enabling -Wimplicit-fallthrough, mark switch cases
+where we are expecting to fall through.
+
+Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
+Signed-off-by: Vinod Koul <vkoul@kernel.org>
+(cherry picked from commit bbcb87555869cb6c249bf00d13d3bc400c476c84)
+---
+ drivers/dma/pl330.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
+index 029bd0444137..c3bd238b0c22 100644
+--- a/drivers/dma/pl330.c
++++ b/drivers/dma/pl330.c
+@@ -1047,13 +1047,16 @@ static bool _start(struct pl330_thread *thrd)
+ 
+ 		if (_state(thrd) == PL330_STATE_KILLING)
+ 			UNTIL(thrd, PL330_STATE_STOPPED)
++		/* fall through */
+ 
+ 	case PL330_STATE_FAULTING:
+ 		_stop(thrd);
++		/* fall through */
+ 
+ 	case PL330_STATE_KILLING:
+ 	case PL330_STATE_COMPLETING:
+ 		UNTIL(thrd, PL330_STATE_STOPPED)
++		/* fall through */
+ 
+ 	case PL330_STATE_STOPPED:
+ 		return _trigger(thrd);
+
+From b654bf6ca9ee98bab1a3c55ebd359f251b9c1a61 Mon Sep 17 00:00:00 2001
+From: Vinod Koul <vkoul@kernel.org>
+Date: Mon, 9 Jul 2018 20:08:48 +0530
+Subject: [PATCH] dmaengine: pl330: remove set but unused variable
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Compiler complains (with W=1):
+drivers/dma/pl330.c: In function ‘pl330_release_channel’:
+drivers/dma/pl330.c:1782:21: warning:
+	variable ‘pl330’ set but not used [-Wunused-but-set-variable]
+  struct pl330_dmac *pl330;
+                     ^~~~~
+
+Remove the pl330 variable in pl330_release_channel as it is set but
+never used.
+
+Signed-off-by: Vinod Koul <vkoul@kernel.org>
+(cherry picked from commit 2f903bab92dea8dec8c93e4fa3c7c5295ef0a0fe)
+---
+ drivers/dma/pl330.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
+index c3bd238b0c22..a25ab357b87c 100644
+--- a/drivers/dma/pl330.c
++++ b/drivers/dma/pl330.c
+@@ -1783,8 +1783,6 @@ static inline void _free_event(struct pl330_thread *thrd, int ev)
+ 
+ static void pl330_release_channel(struct pl330_thread *thrd)
+ {
+-	struct pl330_dmac *pl330;
+-
+ 	if (!thrd || thrd->free)
+ 		return;
+ 
+@@ -1793,8 +1791,6 @@ static void pl330_release_channel(struct pl330_thread *thrd)
+ 	dma_pl330_rqcb(thrd->req[1 - thrd->lstenq].desc, PL330_ERR_ABORT);
+ 	dma_pl330_rqcb(thrd->req[thrd->lstenq].desc, PL330_ERR_ABORT);
+ 
+-	pl330 = thrd->dmac;
+-
+ 	_free_event(thrd, thrd->ev);
+ 	thrd->free = true;
+ }
+
+From 31c885c621005218388ca68648dec38d2ea3f9a2 Mon Sep 17 00:00:00 2001
+From: John Keeping <john@metanate.com>
+Date: Tue, 17 Jul 2018 11:48:16 +0100
+Subject: [PATCH] dmaengine: pl330: fix irq race with terminate_all
+
+In pl330_update() when checking if a channel has been aborted, the
+channel's lock is not taken, only the overall pl330_dmac lock.  But in
+pl330_terminate_all() the aborted flag (req_running==-1) is set under
+the channel lock and not the pl330_dmac lock.
+
+With threaded interrupts, this leads to a potential race:
+
+    pl330_terminate_all	        pl330_update
+    -------------------         ------------
+    lock channel
+                                entry
+    lock pl330
+    _stop channel
+    unlock pl330
+                                lock pl330
+                                check req_running != -1
+    req_running = -1
+                                _start channel
+
+Signed-off-by: John Keeping <john@metanate.com>
+Signed-off-by: Vinod Koul <vkoul@kernel.org>
+(cherry picked from commit e49756544a21f5625b379b3871d27d8500764670)
+---
+ drivers/dma/pl330.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
+index a25ab357b87c..5b0aef7d1f80 100644
+--- a/drivers/dma/pl330.c
++++ b/drivers/dma/pl330.c
+@@ -2209,13 +2209,14 @@ static int pl330_terminate_all(struct dma_chan *chan)
+ 
+ 	pm_runtime_get_sync(pl330->ddma.dev);
+ 	spin_lock_irqsave(&pch->lock, flags);
++
+ 	spin_lock(&pl330->lock);
+ 	_stop(pch->thread);
+-	spin_unlock(&pl330->lock);
+-
+ 	pch->thread->req[0].desc = NULL;
+ 	pch->thread->req[1].desc = NULL;
+ 	pch->thread->req_running = -1;
++	spin_unlock(&pl330->lock);
++
+ 	power_down = pch->active;
+ 	pch->active = false;
+ 

projects/Rockchip/patches/linux/rockchip-4.4/linux-1000-vcodec.patch

@@ -1,4 +1,4 @@
-From 499f15c3237602cca9ccebe902d31bd7404fb2db Mon Sep 17 00:00:00 2001
+From e222e9913d3c70967bae92f1aed46de726974dc7 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Thu, 5 Jul 2018 00:14:14 +0200
 Subject: [PATCH] Revert "drm/drm-prime: cache dma_buf import context"
@@ -124,7 +124,7 @@ index 273a52b5eb66..85bbd19c87b0 100644
  		rockchip_gem_free_buf(rk_obj);
  	}
 
-From 3dd29985f5f1cec249c833b1b2ca33e131f79825 Mon Sep 17 00:00:00 2001
+From 0868438e92b0e9a44d6c6e711ef3be0a429ab4af Mon Sep 17 00:00:00 2001
 From: Rob Clark <robdclark@gmail.com>
 Date: Thu, 9 Jun 2016 15:29:19 -0400
 Subject: [PATCH] UPSTREAM: drm/prime: fix error path deadlock fail
@@ -187,7 +187,7 @@ index 6b7417a194a3..d8d85286764d 100644
  }
  EXPORT_SYMBOL(drm_gem_prime_fd_to_handle);
 
-From a689159fac372a8210d2c63ba63da3a097388b97 Mon Sep 17 00:00:00 2001
+From 8e4ac090d0a814f73d719887f96f7dc44112e03e Mon Sep 17 00:00:00 2001
 From: Chris Wilson <chris@chris-wilson.co.uk>
 Date: Mon, 26 Sep 2016 21:44:14 +0100
 Subject: [PATCH] UPSTREAM: drm: Convert prime dma-buf <-> handle to rbtree
@@ -411,7 +411,7 @@ index 04edcd32b409..93da65df2e7e 100644
  
  /** File private data */
 
-From f977098a9a02ac2df267eafe860370cb4c407d69 Mon Sep 17 00:00:00 2001
+From fcb8af30f524cd437434ec6ddea0231cc37529bc Mon Sep 17 00:00:00 2001
 From: Chris Wilson <chris@chris-wilson.co.uk>
 Date: Wed, 5 Oct 2016 13:21:44 +0100
 Subject: [PATCH] UPSTREAM: drm/prime: Take a ref on the drm_dev when exporting
@@ -588,7 +588,7 @@ index 93da65df2e7e..4aba6478d718 100644
  
  extern int drm_prime_sg_to_page_addr_arrays(struct sg_table *sgt, struct page **pages,
 
-From f30ee0d19425a6c21a9959513e482282ba08dd6a Mon Sep 17 00:00:00 2001
+From 2c0a8737dd35ba259d3bbbf1b956fb43da32f117 Mon Sep 17 00:00:00 2001
 From: Chris Wilson <chris@chris-wilson.co.uk>
 Date: Wed, 7 Dec 2016 21:45:27 +0000
 Subject: [PATCH] UPSTREAM: drm: Take ownership of the dmabuf->obj when
@@ -648,7 +648,7 @@ index 94b4872255c8..dbd34fa7f71c 100644
  	return dmabuf;
  }
 
-From a1fe1ad6076ec27f60555a9393f40959cea94bff Mon Sep 17 00:00:00 2001
+From 595e921b1e908458bd1ee022c9a7ee08cf203ad9 Mon Sep 17 00:00:00 2001
 From: Lucas Stach <l.stach@pengutronix.de>
 Date: Thu, 30 Nov 2017 18:34:28 +0100
 Subject: [PATCH] UPSTREAM: drm/prime: skip CPU sync in map/unmap dma_buf
@@ -704,7 +704,7 @@ index dbd34fa7f71c..133362279591 100644
  			kfree(sgt);
  			sgt = ERR_PTR(-ENOMEM);
 
-From bdfc956545f8292cf462a7feee96d811f5d34414 Mon Sep 17 00:00:00 2001
+From d314fd1a48e930d034eccd49342a23340c3f1c27 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Christian=20K=C3=B6nig?= <ckoenig.leichtzumerken@gmail.com>
 Date: Tue, 27 Feb 2018 12:49:56 +0100
 Subject: [PATCH] UPSTREAM: drm/prime: fix potential race in drm_gem_map_detach
@@ -776,7 +776,7 @@ index 133362279591..95ecc69d03a0 100644
  
  void drm_prime_remove_buf_handle_locked(struct drm_prime_file_private *prime_fpriv,
 
-From 54f13f6370c654d59a9a5938e5953888a65c1980 Mon Sep 17 00:00:00 2001
+From c74449bbd7e3ee3f3195ac9da48271c83c56f101 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Christian=20K=C3=B6nig?= <ckoenig.leichtzumerken@gmail.com>
 Date: Tue, 27 Feb 2018 12:49:57 +0100
 Subject: [PATCH] UPSTREAM: drm/prime: make the pages array optional for
@@ -856,7 +856,7 @@ index 95ecc69d03a0..7ea65c4105c1 100644
  	}
  	return 0;
 
-From c5e39a7e46511dffadabea97e3d74310561d1ba0 Mon Sep 17 00:00:00 2001
+From 2fc969d64eb928db78c9fd99fb68d9d2442a8919 Mon Sep 17 00:00:00 2001
 From: Chris Wilson <chris@chris-wilson.co.uk>
 Date: Sat, 19 Aug 2017 13:05:58 +0100
 Subject: [PATCH] UPSTREAM: drm: Release driver tracking before making the
@@ -912,7 +912,7 @@ index d7f39a03c2c9..966ea63581b1 100644
  
  	return 0;
 
-From 42f26aa9c8d429886b0af174b740f72741e571e2 Mon Sep 17 00:00:00 2001
+From 1d9b65acb4e776f43408afed2b0fd7b86fdb95ce Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sat, 17 Feb 2018 05:30:36 +0100
 Subject: [PATCH] vcodec: skip reduce freq
@@ -922,10 +922,10 @@ Subject: [PATCH] vcodec: skip reduce freq
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/drivers/video/rockchip/vcodec/vcodec_service.c b/drivers/video/rockchip/vcodec/vcodec_service.c
-index 0f177d9ab4c2..903ea8554649 100644
+index c4ee73be92d3..9d5ee5c8b1f9 100644
 --- a/drivers/video/rockchip/vcodec/vcodec_service.c
 +++ b/drivers/video/rockchip/vcodec/vcodec_service.c
-@@ -1602,9 +1602,6 @@ static void try_set_reg(struct vpu_subdev_data *data)
+@@ -1630,9 +1630,6 @@ static void try_set_reg(struct vpu_subdev_data *data)
  			reg_from_wait_to_run(pservice, reg);
  			reg_copy_to_hw(reg->data, reg);
  		}
@@ -935,7 +935,7 @@ index 0f177d9ab4c2..903ea8554649 100644
  	}
  
  	mutex_unlock(&pservice->shutdown_lock);
-@@ -2353,6 +2350,7 @@ static void vcodec_set_freq_rk3328(struct vpu_service_info *pservice,
+@@ -2385,6 +2382,7 @@ static void vcodec_set_freq_rk3328(struct vpu_service_info *pservice,
  	if (curr == reg->freq)
  		return;