add m2m support

back up config
add patch for dram clk

file-backup/other/.config-nnair

@@ -1668,7 +1668,8 @@ CONFIG_ZABBIX_POSTGRESQL=y
 # CONFIG_PACKAGE_debian-archive-keyring is not set
 # CONFIG_PACKAGE_debootstrap is not set
 # CONFIG_PACKAGE_gkrellmd is not set
-# CONFIG_PACKAGE_htop is not set
+CONFIG_PACKAGE_htop=y
+# CONFIG_HTOP_LMSENSORS is not set
 # CONFIG_PACKAGE_ipmitool is not set
 # CONFIG_PACKAGE_monit is not set
 # CONFIG_PACKAGE_monit-nossl is not set
@@ -2644,13 +2645,14 @@ CONFIG_PACKAGE_kmod-camera-ov5640=y
 # CONFIG_PACKAGE_kmod-fb-sys-ram is not set
 # CONFIG_PACKAGE_kmod-fb-tft is not set
 # CONFIG_PACKAGE_kmod-fb-tft-ili9486 is not set
+CONFIG_PACKAGE_kmod-sunxi-cedar=y
 CONFIG_PACKAGE_kmod-video-core=y
 CONFIG_PACKAGE_kmod-sunxi-csi=y
 # CONFIG_PACKAGE_kmod-v4l2loopback is not set
 # CONFIG_PACKAGE_kmod-video-cpia2 is not set
 # CONFIG_PACKAGE_kmod-video-gspca-core is not set
 # CONFIG_PACKAGE_kmod-video-pwc is not set
-# CONFIG_PACKAGE_kmod-video-uvc is not set
+CONFIG_PACKAGE_kmod-video-uvc=y
 CONFIG_PACKAGE_kmod-video-videobuf2=y
 # end of Video Support
 
@@ -3858,7 +3860,7 @@ CONFIG_PACKAGE_libcomerr=y
 # CONFIG_PACKAGE_libesmtp is not set
 # CONFIG_PACKAGE_libestr is not set
 # CONFIG_PACKAGE_libev is not set
-# CONFIG_PACKAGE_libevdev is not set
+CONFIG_PACKAGE_libevdev=y
 # CONFIG_PACKAGE_libevent2 is not set
 # CONFIG_PACKAGE_libevent2-core is not set
 # CONFIG_PACKAGE_libevent2-extra is not set
@@ -3958,7 +3960,7 @@ CONFIG_PACKAGE_libmnl=y
 # CONFIG_PACKAGE_libmpeg2 is not set
 # CONFIG_PACKAGE_libmpg123 is not set
 # CONFIG_PACKAGE_libnatpmp is not set
-# CONFIG_PACKAGE_libncurses is not set
+CONFIG_PACKAGE_libncurses=y
 # CONFIG_PACKAGE_libndpi is not set
 # CONFIG_PACKAGE_libneon is not set
 # CONFIG_PACKAGE_libnet-1.2.x is not set
@@ -4108,7 +4110,7 @@ CONFIG_PACKAGE_libuci=y
 # CONFIG_PACKAGE_libuci-lua is not set
 # CONFIG_PACKAGE_libuci2 is not set
 CONFIG_PACKAGE_libuclient=y
-# CONFIG_PACKAGE_libudev-zero is not set
+CONFIG_PACKAGE_libudev-zero=y
 # CONFIG_PACKAGE_libudns is not set
 # CONFIG_PACKAGE_libuecc is not set
 # CONFIG_PACKAGE_libugpio is not set
@@ -4126,7 +4128,7 @@ CONFIG_PACKAGE_libustream-wolfssl=y
 CONFIG_PACKAGE_libuuid=y
 # CONFIG_PACKAGE_libuv is not set
 # CONFIG_PACKAGE_libuwifi is not set
-# CONFIG_PACKAGE_libv4l is not set
+CONFIG_PACKAGE_libv4l=y
 # CONFIG_PACKAGE_libvorbis is not set
 # CONFIG_PACKAGE_libvorbisidec is not set
 # CONFIG_PACKAGE_libvpx is not set
@@ -4174,7 +4176,7 @@ CONFIG_PACKAGE_rpcd-mod-rrdns=y
 # CONFIG_PACKAGE_sbc is not set
 # CONFIG_PACKAGE_serdisplib is not set
 # CONFIG_PACKAGE_taglib is not set
-# CONFIG_PACKAGE_terminfo is not set
+CONFIG_PACKAGE_terminfo=y
 # CONFIG_PACKAGE_tinycdb is not set
 # CONFIG_PACKAGE_totem-pl-parser is not set
 # CONFIG_PACKAGE_uw-imap is not set
@@ -5035,7 +5037,7 @@ CONFIG_PACKAGE_nftables-json=y
 # CONFIG_PACKAGE_openssh-server-pam is not set
 # CONFIG_PACKAGE_openssh-sftp-avahi-service is not set
 # CONFIG_PACKAGE_openssh-sftp-client is not set
-# CONFIG_PACKAGE_openssh-sftp-server is not set
+CONFIG_PACKAGE_openssh-sftp-server=y
 # CONFIG_PACKAGE_sshtunnel is not set
 # CONFIG_PACKAGE_tmate is not set
 # end of SSH
@@ -6229,7 +6231,7 @@ CONFIG_PACKAGE_libucode=y
 # CONFIG_PACKAGE_sexpect is not set
 # CONFIG_PACKAGE_shadow-utils is not set
 # CONFIG_PACKAGE_shared-mime-info is not set
-CONFIG_PACKAGE_singleflight=m
+CONFIG_PACKAGE_singleflight=y
 # CONFIG_PACKAGE_sipcalc is not set
 # CONFIG_PACKAGE_sispmctl is not set
 # CONFIG_PACKAGE_slide-switch is not set
@@ -6294,7 +6296,7 @@ CONFIG_PACKAGE_ucode-mod-uci=y
 # CONFIG_PACKAGE_uuidd is not set
 # CONFIG_PACKAGE_uuidgen is not set
 # CONFIG_PACKAGE_uvcdynctrl is not set
-# CONFIG_PACKAGE_v4l-utils is not set
+CONFIG_PACKAGE_v4l-utils=y
 # CONFIG_PACKAGE_view1090 is not set
 # CONFIG_PACKAGE_viewadsb is not set
 # CONFIG_PACKAGE_watchcat is not set

package/boot/uboot-sunxi/patches/511-nanopi-change-dram-clk.patch

@@ -0,0 +1,11 @@
+--- a/configs/nanopi_neo_air_defconfig
++++ b/configs/nanopi_neo_air_defconfig
+@@ -2,7 +2,7 @@ CONFIG_ARM=y
+ CONFIG_ARCH_SUNXI=y
+ CONFIG_SPL=y
+ CONFIG_MACH_SUN8I_H3=y
+-CONFIG_DRAM_CLK=408
++CONFIG_DRAM_CLK=384 # 504 480 456 432 408 384 360 336 312 288 264 240 216
+ # CONFIG_VIDEO_DE2 is not set
+ # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+ CONFIG_CONSOLE_MUX=y

package/kernel/linux/modules/video.mk

@@ -401,6 +401,7 @@ define KernelPackage/video-core
 	CONFIG_VIDEO_DEV \
 	CONFIG_VIDEO_ADV_DEBUG=y \
 	CONFIG_MEDIA_CONTROLLER=y \
+  CONFIG_MEDIA_CONTROLLER_DVB=n \
   CONFIG_V4L2_FWNODE \
 	CONFIG_V4L_PLATFORM_DRIVERS=y
   FILES:= \
@@ -430,17 +431,23 @@ endef
 
 define KernelPackage/video-videobuf2
   TITLE:=videobuf2 lib
-  DEPENDS:=+kmod-dma-buf
+  DEPENDS:=+kmod-dma-buf +kmod-video-core
   KCONFIG:= \
 	CONFIG_VIDEOBUF2_CORE \
+  CONFIG_V4L_MEM2MEM_DRIVERS=y \
+  CONFIG_VIDEO_MEM2MEM_DEINTERLACE=y \
+  CONFIG_V4L2_MEM2MEM_DEV=y \
 	CONFIG_VIDEOBUF2_MEMOPS \
+  CONFIG_VIDEOBUF2_VMALLOC \
 	VIDEOBUF2_DMA_CONTIG
   FILES:= \
 	$(LINUX_DIR)/drivers/media/common/videobuf2/videobuf2-common.ko \
 	$(LINUX_DIR)/drivers/media/common/videobuf2/videobuf2-v4l2.ko \
 	$(LINUX_DIR)/drivers/media/common/videobuf2/videobuf2-memops.ko \
-	$(LINUX_DIR)/drivers/media/common/videobuf2/videobuf2-dma-contig.ko
-  AUTOLOAD:=$(call AutoLoad,65,videobuf2-core videobuf-v4l2 videobuf2-memops videobuf2-dma-contig)
+  $(LINUX_DIR)/drivers/media/common/videobuf2/videobuf2-vmalloc.ko \
+	$(LINUX_DIR)/drivers/media/common/videobuf2/videobuf2-dma-contig.ko \
+  $(LINUX_DIR)/drivers/media/v4l2-core/v4l2-mem2mem.ko
+  AUTOLOAD:=$(call AutoLoad,65,videobuf2-core videobuf-v4l2 videobuf2-memops videobuf2-dma-contig videobuf2-vmalloc v4l2-mem2mem)
   $(call AddDepends/video)
 endef
 

target/linux/sunxi/modules.mk

@@ -6,8 +6,9 @@ define KernelPackage/sunxi-csi
     TITLE:=SUN6I SoC CSI
     DEPENDS:=@TARGET_sunxi +kmod-video-videobuf2
     KCONFIG:= CONFIG_VIDEO_SUN4I_CSI=n \
-              CONFIG_VIDEO_SUN6I_CSI \
-              CONFIG_MEDIA_CONTROLLER_DVB=n
+              CONFIG_VIDEO_SUN8I_DEINTERLACE=n \
+              CONFIG_VIDEO_SUN8I_ROTATE=n \
+              CONFIG_VIDEO_SUN6I_CSI
 
     FILES:=$(LINUX_DIR)/drivers/media/platform/sunxi/sun6i-csi/sun6i-csi.ko
     AUTOLOAD:=$(call AutoLoad,70,sun6i-csi)