diff --git a/config/kernel/linux-rk3399-legacy.config b/config/kernel/linux-rk3399-legacy.config index 7b9111c163..fd9d050522 100644 --- a/config/kernel/linux-rk3399-legacy.config +++ b/config/kernel/linux-rk3399-legacy.config @@ -284,7 +284,7 @@ CONFIG_MODULES_TREE_LOOKUP=y CONFIG_BLOCK=y CONFIG_BLK_DEV_BSG=y CONFIG_BLK_DEV_BSGLIB=y -# CONFIG_BLK_DEV_INTEGRITY is not set +CONFIG_BLK_DEV_INTEGRITY=y CONFIG_BLK_DEV_THROTTLING=y # CONFIG_BLK_CMDLINE_PARSER is not set @@ -432,7 +432,6 @@ CONFIG_HZ_250=y # CONFIG_HZ_1000 is not set CONFIG_HZ=250 CONFIG_SCHED_HRTICK=y -CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_DEFAULT=y @@ -1916,6 +1915,13 @@ CONFIG_DM_SWITCH=m CONFIG_DM_LOG_WRITES=m # CONFIG_DM_VERITY_AVB is not set # CONFIG_DM_ANDROID_VERITY_AT_MOST_ONCE_DEFAULT_ENABLED is not set +CONFIG_TARGET_CORE=m +CONFIG_TCM_IBLOCK=m +CONFIG_TCM_FILEIO=m +CONFIG_TCM_PSCSI=m +CONFIG_TCM_USER2=m +# CONFIG_LOOPBACK_TARGET is not set +CONFIG_ISCSI_TARGET=m # CONFIG_FUSION is not set # @@ -2393,6 +2399,7 @@ CONFIG_RTL8822BU=m CONFIG_RTL8188EU=m CONFIG_RTL8821CU=m CONFIG_88XXAU=m +CONFIG_RTL8192EU=m # CONFIG_ZD1211RW is not set CONFIG_MWIFIEX=y CONFIG_MWIFIEX_SDIO=y @@ -3431,7 +3438,8 @@ CONFIG_REGULATOR_RK818=y # CONFIG_REGULATOR_TPS6524X is not set CONFIG_REGULATOR_TPS6586X=y CONFIG_REGULATOR_XZ3216=y -CONFIG_CEC_CORE=m +CONFIG_CEC_CORE=y +CONFIG_CEC_NOTIFIER=y CONFIG_MEDIA_SUPPORT=y # @@ -3444,7 +3452,7 @@ CONFIG_MEDIA_RADIO_SUPPORT=y CONFIG_MEDIA_SDR_SUPPORT=y CONFIG_MEDIA_RC_SUPPORT=y CONFIG_MEDIA_CEC_SUPPORT=y -# CONFIG_MEDIA_CEC_RC is not set +CONFIG_MEDIA_CEC_RC=y CONFIG_MEDIA_CONTROLLER=y CONFIG_VIDEO_DEV=y CONFIG_VIDEO_V4L2_SUBDEV_API=y @@ -3733,7 +3741,7 @@ CONFIG_VIDEO_CX25840=m # # Camera sensor devices # -# CONFIG_VIDEO_IMX219 is not set +CONFIG_VIDEO_IMX219=y # CONFIG_VIDEO_IMX258 is not set # CONFIG_VIDEO_IMX317 is not set # CONFIG_VIDEO_IMX323 is not set @@ -3745,7 +3753,7 @@ CONFIG_VIDEO_CX25840=m # CONFIG_VIDEO_OV2718 is not set # CONFIG_VIDEO_OV2735 is not set CONFIG_VIDEO_OV4689=y -# CONFIG_VIDEO_OV5647 is not set +CONFIG_VIDEO_OV5647=y # CONFIG_VIDEO_OV5648 is not set # CONFIG_VIDEO_OV5695 is not set # CONFIG_VIDEO_OV7251 is not set @@ -4131,7 +4139,7 @@ CONFIG_DRM_ANALOGIX_DP=y CONFIG_DRM_DW_HDMI=y # CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set CONFIG_DRM_DW_HDMI_I2S_AUDIO=y -# CONFIG_DRM_DW_HDMI_CEC is not set +CONFIG_DRM_DW_HDMI_CEC=y # CONFIG_POWERVR_ROGUE_M is not set # CONFIG_MALI400 is not set CONFIG_MALI_DEVFREQ=y @@ -4992,6 +5000,7 @@ CONFIG_USB_FUNCTIONFS_ETH=y CONFIG_USB_FUNCTIONFS_RNDIS=y CONFIG_USB_FUNCTIONFS_GENERIC=y CONFIG_USB_MASS_STORAGE=m +# CONFIG_USB_GADGET_TARGET is not set CONFIG_USB_G_SERIAL=m CONFIG_USB_MIDI_GADGET=m CONFIG_USB_G_PRINTER=m @@ -6183,6 +6192,7 @@ CONFIG_KVM_ARM_VGIC_V3=y CONFIG_KVM=y CONFIG_KVM_ARM_HOST=y CONFIG_VHOST_NET=m +# CONFIG_VHOST_SCSI is not set # CONFIG_VHOST_VSOCK is not set CONFIG_VHOST=m # CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set @@ -6225,7 +6235,6 @@ CONFIG_DEBUG_KERNEL=y # Memory Debugging # # CONFIG_PAGE_EXTENSION is not set -# CONFIG_DEBUG_PAGEALLOC is not set # CONFIG_DEBUG_OBJECTS is not set # CONFIG_SLUB_DEBUG_ON is not set # CONFIG_SLUB_STATS is not set @@ -6674,12 +6683,3 @@ CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y # CONFIG_SG_SPLIT is not set CONFIG_ARCH_HAS_SG_CHAIN=y - -## LinuxIO - iSCSI Target modules -CONFIG_TARGET_CORE=m -CONFIG_ISCSI_TARGET=m -CONFIG_TCM_IBLOCK=m -CONFIG_TCM_FILEIO=m -CONFIG_TCM_PSCSI=m -CONFIG_TCM_USER2=m - diff --git a/config/kernel/linux-rockchip64-legacy.config b/config/kernel/linux-rockchip64-legacy.config index 6b3851902d..57e8705f63 100644 --- a/config/kernel/linux-rockchip64-legacy.config +++ b/config/kernel/linux-rockchip64-legacy.config @@ -3433,8 +3433,8 @@ CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_SOC_CAMERA=y # CONFIG_SOC_CAMERA_PLATFORM is not set # CONFIG_VIDEO_XILINX is not set -# CONFIG_VIDEO_RK_CIF_ISP10 is not set -# CONFIG_VIDEO_ROCKCHIP_CIF is not set +CONFIG_VIDEO_RK_CIF_ISP10=y +CONFIG_VIDEO_ROCKCHIP_CIF=y CONFIG_VIDEO_ROCKCHIP_ISP1=y CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set @@ -3544,7 +3544,7 @@ CONFIG_VIDEO_CX25840=m # # Camera sensor devices # -# CONFIG_VIDEO_IMX219 is not set +CONFIG_VIDEO_IMX219=y # CONFIG_VIDEO_IMX323 is not set # CONFIG_VIDEO_VIRT_CAMERA is not set # CONFIG_VIDEO_OV2659 is not set @@ -3552,7 +3552,7 @@ CONFIG_VIDEO_CX25840=m # CONFIG_VIDEO_OV2718 is not set # CONFIG_VIDEO_OV2735 is not set CONFIG_VIDEO_OV4689=y -# CONFIG_VIDEO_OV5647 is not set +CONFIG_VIDEO_OV5647=y # CONFIG_VIDEO_OV5695 is not set # CONFIG_VIDEO_OV7251 is not set # CONFIG_VIDEO_OV7640 is not set @@ -3635,6 +3635,16 @@ CONFIG_VIDEO_SC031GS=y # CONFIG_SOC_CAMERA_OV9740 is not set # CONFIG_SOC_CAMERA_RJ54N1 is not set # CONFIG_SOC_CAMERA_TW9910 is not set +# CONFIG_VIDEO_OV8858 is not set +# CONFIG_VIDEO_OV2710 is not set +# CONFIG_VIDEO_TC358749XBG is not set +# CONFIG_VIDEO_ADV7181 is not set +# CONFIG_VIDEO_OV7675 is not set +# CONFIG_VIDEO_NT99230 is not set +# CONFIG_VIDEO_OV9281 is not set +# CONFIG_VIDEO_OV9750 is not set +# CONFIG_VIDEO_ov5640 is not set +# CONFIG_VIDEO_SC2232 is not set # # SPI helper chips diff --git a/patch/kernel/rk3399-legacy/320_fix_kernelcrash_with_isp1.patch b/patch/kernel/rk3399-legacy/320_fix_kernelcrash_with_isp1.patch new file mode 100644 index 0000000000..4c28caddb7 --- /dev/null +++ b/patch/kernel/rk3399-legacy/320_fix_kernelcrash_with_isp1.patch @@ -0,0 +1,13 @@ +diff --git a/drivers/of/property.c b/drivers/of/property.c +index 2c201e2c..ae79a6f8 100644 +--- a/drivers/of/property.c ++++ b/drivers/of/property.c +@@ -900,7 +900,7 @@ of_fwnode_graph_get_port_parent(struct fwnode_handle *fwnode) + struct device_node *np; + + /* Get the parent of the port */ +- np = of_get_next_parent(to_of_node(fwnode)); ++ np = of_get_parent(to_of_node(fwnode)); + if (!np) + return NULL; + diff --git a/patch/kernel/rockchip64-legacy/320_fix_kernelcrash_with_isp1.patch b/patch/kernel/rockchip64-legacy/320_fix_kernelcrash_with_isp1.patch new file mode 100644 index 0000000000..4c28caddb7 --- /dev/null +++ b/patch/kernel/rockchip64-legacy/320_fix_kernelcrash_with_isp1.patch @@ -0,0 +1,13 @@ +diff --git a/drivers/of/property.c b/drivers/of/property.c +index 2c201e2c..ae79a6f8 100644 +--- a/drivers/of/property.c ++++ b/drivers/of/property.c +@@ -900,7 +900,7 @@ of_fwnode_graph_get_port_parent(struct fwnode_handle *fwnode) + struct device_node *np; + + /* Get the parent of the port */ +- np = of_get_next_parent(to_of_node(fwnode)); ++ np = of_get_parent(to_of_node(fwnode)); + if (!np) + return NULL; + diff --git a/patch/kernel/rockchip64-legacy/rockpi4b-add-isp-camera.patch b/patch/kernel/rockchip64-legacy/rockpi4b-add-isp-camera.patch new file mode 100644 index 0000000000..4316284d35 --- /dev/null +++ b/patch/kernel/rockchip64-legacy/rockpi4b-add-isp-camera.patch @@ -0,0 +1,105 @@ +From cc28806a79956cfa531bfa56554c0cd90a382e97 Mon Sep 17 00:00:00 2001 +From: JMCC +Date: Tue, 29 Dec 2020 19:26:31 +0100 +Subject: [PATCH] rockpi4b-add-isp-camera + +Signed-off-by: JMCC +--- + .../boot/dts/rockchip/rk3399-rockpi4b.dts | 35 +++++++++++++------ + 1 file changed, 25 insertions(+), 10 deletions(-) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpi4b.dts b/arch/arm64/boot/dts/rockchip/rk3399-rockpi4b.dts +index 5cc57e16b..09ac9eb89 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3399-rockpi4b.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpi4b.dts +@@ -633,10 +633,8 @@ + }; + + &i2c4 { +- status = "okay"; +- + camera1: camera-module@10 { +- status = "okay"; ++ status = "disabled"; + compatible = "sony,imx219"; + reg = <0x10>; + +@@ -644,7 +642,7 @@ + clock-names = "clk_cif_out"; + pinctrl-names = "rockchip,camera_default"; + pwdn-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; +- ++ + port { + ucam_out0: endpoint { + remote-endpoint = <&mipi_in_ucam0>; +@@ -652,6 +650,23 @@ + }; + }; + }; ++ ++ camera2: camera-module@36 { ++ status = "disabled"; ++ compatible = "ovti,ov5647"; ++ reg = <0x36>; ++ ++ clocks = <&cru SCLK_CIF_OUT>; ++ clock-names = "clk_cif_out"; ++ pinctrl-names = "rockchip,camera_default"; ++ ++ port { ++ ucam_out1: endpoint { ++ remote-endpoint = <&mipi_in_ucam0>; ++ data-lanes = <1 2>; ++ }; ++ }; ++ }; + }; + + &i2c2 { +@@ -1089,11 +1104,12 @@ + }; + }; + +- i2c4 { ++ i2c4 { + i2c4_xfer: i2c4-xfer { + rockchip,pins = + <1 12 RK_FUNC_1 &pcfg_pull_up>, +- <1 11 RK_FUNC_1 &pcfg_pull_up>; ++ <1 11 RK_FUNC_1 &pcfg_pull_up>, ++ <1 13 RK_FUNC_GPIO &pcfg_pull_up>; //camera module enable pin + }; + }; + i2s0 { +@@ -1172,8 +1188,7 @@ + }; + + &rkisp1_0 { +- // TODO: this crashes kernel +- status = "disabled"; ++ status = "okay"; + port { + #address-cells = <1>; + #size-cells = <0>; +@@ -1186,8 +1201,7 @@ + }; + + &mipi_dphy_rx0 { +- // TODO: this crashes kernel +- status = "disabled"; ++ status = "okay"; + + ports { + #address-cells = <1>; +@@ -1218,6 +1232,7 @@ + }; + }; + ++ + &isp0_mmu { + status = "okay"; + }; +-- +Created with Armbian build tools https://github.com/armbian/build +