diff --git a/kernel-6.1/arch/arm64/Makefile b/kernel-6.1/arch/arm64/Makefile index 4be097a9a41..4eba07d8543 100644 --- a/kernel-6.1/arch/arm64/Makefile +++ b/kernel-6.1/arch/arm64/Makefile @@ -258,7 +258,7 @@ ifeq ("$(CONFIG_MODULES)$(MAKE_MODULES)$(srctree)","yy$(objtree)") else $(Q)$(MAKE) rockchip/$*.dtb Image.lz4 endif - $(Q)$(srctree)/scripts/mkimg --dtb $*.dtb + $(Q)$(srctree)/scripts/mkimg --dtb $*.dtb --boot CLEAN_DIRS += out CLEAN_FILES += boot.img kernel.img resource.img zboot.img diff --git a/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3568-nanopi5-common.dtsi b/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3568-nanopi5-common.dtsi index cb74a1607d5..87cea97fd77 100644 --- a/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3568-nanopi5-common.dtsi +++ b/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3568-nanopi5-common.dtsi @@ -898,6 +898,9 @@ &usbdrd_dwc3 { dr_mode = "otg"; extcon = <&usb2phy0>; + role-switch-default-mode = "host"; + role-switch-visible; + usb-role-switch; status = "okay"; }; diff --git a/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-common.dtsi b/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-common.dtsi index fc2d035c772..b585ff6647a 100644 --- a/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-common.dtsi +++ b/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-common.dtsi @@ -176,8 +176,8 @@ }; &display_subsystem { - clocks = <&hdptxphy_hdmi0>, <&hdptxphy_hdmi0>; - clock-names = "hdmi0_phy_pll", "hdmi1_phy_pll"; + clocks = <&hdptxphy_hdmi0>; + clock-names = "hdmi0_phy_pll"; }; &gpu { diff --git a/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev01.dts b/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev01.dts index a6882686237..dcb86e1c622 100644 --- a/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev01.dts +++ b/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev01.dts @@ -690,28 +690,21 @@ dsi1_pwm: &pwm11 { gpio = <&gpio4 RK_PA5 GPIO_ACTIVE_LOW>; }; -&vop { - disable-win-move; -}; - &vp0 { rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER0 | 1 << ROCKCHIP_VOP2_ESMART0 | 1 << ROCKCHIP_VOP2_CLUSTER1)>; rockchip,primary-plane = ; - cursor-win-id = ; }; &vp1 { rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER2 | 1 << ROCKCHIP_VOP2_ESMART1 | 1 << ROCKCHIP_VOP2_ESMART2)>; rockchip,primary-plane = ; - cursor-win-id = ; }; &vp2 { rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER3 | 1 << ROCKCHIP_VOP2_ESMART3)>; rockchip,primary-plane = ; - cursor-win-id = ; }; &vp3 { diff --git a/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev02.dts b/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev02.dts index 5aea6af5005..2b46498b801 100644 --- a/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev02.dts +++ b/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev02.dts @@ -181,24 +181,28 @@ status = "okay"; }; +&usbdrd_dwc3_0 { + dr_mode = "otg"; + role-switch-default-mode = "host"; + role-switch-visible; + usb-role-switch; +}; + &vp0 { rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER0 | 1 << ROCKCHIP_VOP2_ESMART0 | 1 << ROCKCHIP_VOP2_CLUSTER1)>; rockchip,primary-plane = ; - cursor-win-id = ; }; &vp1 { rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER2 | 1 << ROCKCHIP_VOP2_ESMART1 | 1 << ROCKCHIP_VOP2_ESMART2)>; rockchip,primary-plane = ; - cursor-win-id = ; }; &vp2 { - /delete-property/ rockchip,plane-mask; - /delete-property/ rockchip,primary-plane; - status = "disabled"; + rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER3 | 1 << ROCKCHIP_VOP2_ESMART3)>; + rockchip,primary-plane = ; }; &vp3 { diff --git a/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev08.dts b/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev08.dts index 259c9fcf45c..ffa038b644e 100644 --- a/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev08.dts +++ b/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev08.dts @@ -721,30 +721,22 @@ gpio = <&gpio4 RK_PA5 GPIO_ACTIVE_LOW>; }; -&vop { - disable-win-move; -}; - &vp0 { rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER0 | 1 << ROCKCHIP_VOP2_ESMART0)>; rockchip,primary-plane = ; - cursor-win-id = ; }; &vp1 { rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER1 | 1 << ROCKCHIP_VOP2_ESMART1)>; rockchip,primary-plane = ; - cursor-win-id = ; }; &vp2 { rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER2 | 1 << ROCKCHIP_VOP2_ESMART2)>; rockchip,primary-plane = ; - cursor-win-id = ; }; &vp3 { rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER3 | 1 << ROCKCHIP_VOP2_ESMART3)>; rockchip,primary-plane = ; - cursor-win-id = ; }; diff --git a/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev09.dts b/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev09.dts index 91987099434..a6796be7661 100644 --- a/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev09.dts +++ b/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev09.dts @@ -775,28 +775,21 @@ dsi0_pwm: &pwm2 { gpio = <&gpio4 RK_PA5 GPIO_ACTIVE_LOW>; }; -&vop { - disable-win-move; -}; - &vp0 { rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER0 | 1 << ROCKCHIP_VOP2_ESMART0 | 1 << ROCKCHIP_VOP2_CLUSTER1)>; rockchip,primary-plane = ; - cursor-win-id = ; }; &vp1 { rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER2 | 1 << ROCKCHIP_VOP2_ESMART1 | 1 << ROCKCHIP_VOP2_ESMART2)>; rockchip,primary-plane = ; - cursor-win-id = ; }; &vp2 { rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER3 | 1 << ROCKCHIP_VOP2_ESMART3)>; rockchip,primary-plane = ; - cursor-win-id = ; }; &vp3 { diff --git a/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev0a.dts b/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev0a.dts index 924401348e1..87711505646 100644 --- a/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev0a.dts +++ b/kernel-6.1/arch/arm64/boot/dts/rockchip/rk3588-nanopi6-rev0a.dts @@ -335,28 +335,21 @@ dsi1_pwm: &pwm11 { status = "okay"; }; -&vop { - disable-win-move; -}; - &vp0 { rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER0 | 1 << ROCKCHIP_VOP2_ESMART0 | 1 << ROCKCHIP_VOP2_CLUSTER1)>; rockchip,primary-plane = ; - cursor-win-id = ; }; &vp1 { rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER2 | 1 << ROCKCHIP_VOP2_ESMART1 | 1 << ROCKCHIP_VOP2_ESMART2)>; rockchip,primary-plane = ; - cursor-win-id = ; }; &vp2 { rockchip,plane-mask = <(1 << ROCKCHIP_VOP2_CLUSTER3 | 1 << ROCKCHIP_VOP2_ESMART3)>; rockchip,primary-plane = ; - cursor-win-id = ; }; &vp3 { diff --git a/kernel-6.1/arch/arm64/configs/nanopi6_gki.config b/kernel-6.1/arch/arm64/configs/nanopi6_gki.config new file mode 100644 index 00000000000..1bca124e7f4 --- /dev/null +++ b/kernel-6.1/arch/arm64/configs/nanopi6_gki.config @@ -0,0 +1,390 @@ +CONFIG_PWRSEQ_SIMPLE=m +CONFIG_AP6XXX=m +CONFIG_ARCH_ROCKCHIP=y +CONFIG_ARM_ROCKCHIP_BUS_DEVFREQ=m +CONFIG_ARM_ROCKCHIP_CPUFREQ=m +CONFIG_ARM_ROCKCHIP_DMC_DEVFREQ=m +CONFIG_ATA=m +# CONFIG_ATA_SFF is not set +CONFIG_BACKLIGHT_PWM=m +CONFIG_BATTERY_CW2015=m +CONFIG_BATTERY_CW2017=m +CONFIG_BATTERY_CW221X=m +CONFIG_BATTERY_RK817=m +CONFIG_BATTERY_RK818=m +CONFIG_BMA2XX_ACC=m +CONFIG_CHARGER_BQ25700=m +CONFIG_CHARGER_BQ25890=m +CONFIG_CHARGER_RK817=m +CONFIG_CHARGER_RK818=m +CONFIG_CHARGER_SC89890=m +CONFIG_CHARGER_SGM41542=m +CONFIG_CHR_DEV_SG=m +CONFIG_COMMON_CLK_PWM=m +CONFIG_COMMON_CLK_RK808=m +CONFIG_COMMON_CLK_ROCKCHIP=m +CONFIG_COMMON_CLK_SCMI=m +CONFIG_COMPASS_AK8963=m +CONFIG_COMPASS_AK8975=m +CONFIG_COMPASS_DEVICE=m +CONFIG_CPUFREQ_DT=m +CONFIG_CPU_FREQ_GOV_ONDEMAND=m +CONFIG_CPU_FREQ_GOV_USERSPACE=m +CONFIG_CPU_PX30=y +CONFIG_CPU_RK3399=y +CONFIG_CPU_RK3562=y +CONFIG_CPU_RK3568=y +CONFIG_CPU_RK3576=y +CONFIG_CPU_RK3588=y +CONFIG_CRYPTO_AES_ARM64_CE_CCM=m +CONFIG_CRYPTO_DEV_ROCKCHIP=m +CONFIG_CRYPTO_DEV_ROCKCHIP_DEV=m +CONFIG_CRYPTO_SHA1_ARM64_CE=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_DEVFREQ_EVENT_ROCKCHIP_NOCP=m +CONFIG_DMABUF_HEAPS_CMA=m +CONFIG_DMABUF_HEAPS_SYSTEM=m +CONFIG_DRAGONRISE_FF=y +CONFIG_DRM_DISPLAY_CONNECTOR=m +CONFIG_DRM_DW_HDMI_CEC=m +CONFIG_DRM_DW_HDMI_I2S_AUDIO=m +CONFIG_DRM_MAXIM_MAX96745=m +CONFIG_DRM_MAXIM_MAX96755F=m +CONFIG_DRM_PANEL_SIMPLE=m +CONFIG_DRM_RK1000_TVE=m +CONFIG_DRM_RK630_TVE=m +CONFIG_DRM_ROCKCHIP=m +CONFIG_DRM_ROCKCHIP_RK618=m +CONFIG_DRM_ROHM_BU18XL82=m +CONFIG_DRM_SII902X=m +CONFIG_DTC_SYMBOLS=y +# CONFIG_DWMAC_GENERIC is not set +# CONFIG_DWMAC_IPQ806X is not set +# CONFIG_DWMAC_QCOM_ETHQOS is not set +# CONFIG_DWMAC_SUN8I is not set +# CONFIG_DWMAC_SUNXI is not set +CONFIG_DW_WATCHDOG=m +CONFIG_FIQ_DEBUGGER=m +CONFIG_FIQ_DEBUGGER_CONSOLE=y +CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE=y +CONFIG_FIQ_DEBUGGER_NO_SLEEP=y +CONFIG_FIQ_DEBUGGER_TRUST_ZONE=y +CONFIG_GPIO_ROCKCHIP=m +CONFIG_GREENASIA_FF=y +CONFIG_GSENSOR_DEVICE=m +CONFIG_GS_DA223=m +CONFIG_GS_KXTJ9=m +CONFIG_GS_LIS3DH=m +CONFIG_GS_LSM303D=m +CONFIG_GS_MC3230=m +CONFIG_GS_MMA7660=m +CONFIG_GS_MMA8452=m +CONFIG_GS_MXC6655XA=m +CONFIG_GS_SC7660=m +CONFIG_GS_SC7A20=m +CONFIG_GS_SC7A30=m +CONFIG_GYROSCOPE_DEVICE=m +CONFIG_GYRO_EWTSA=m +CONFIG_GYRO_ICM4260X=m +CONFIG_GYRO_L3G20D=m +CONFIG_GYRO_L3G4200D=m +CONFIG_GYRO_LSM330=m +CONFIG_GYRO_MPU6500=m +CONFIG_GYRO_MPU6880=m +CONFIG_HALL_DEVICE=m +CONFIG_HID_A4TECH=m +CONFIG_HID_ACRUX=m +CONFIG_HID_ACRUX_FF=y +CONFIG_HID_ALPS=m +CONFIG_HID_APPLEIR=m +CONFIG_HID_AUREAL=m +CONFIG_HID_BELKIN=m +CONFIG_HID_CHERRY=m +CONFIG_HID_CHICONY=m +CONFIG_HID_CYPRESS=m +CONFIG_HID_DRAGONRISE=m +CONFIG_HID_EMS_FF=m +CONFIG_HID_EZKEY=m +CONFIG_HID_GREENASIA=m +CONFIG_HID_GYRATION=m +CONFIG_HID_HOLTEK=m +CONFIG_HID_ICADE=m +CONFIG_HID_KENSINGTON=m +CONFIG_HID_KEYTOUCH=m +CONFIG_HID_KYE=m +CONFIG_HID_LCPOWER=m +CONFIG_HID_LENOVO=m +CONFIG_HID_MONTEREY=m +CONFIG_HID_NTRIG=m +CONFIG_HID_ORTEK=m +CONFIG_HID_PANTHERLORD=m +CONFIG_HID_PETALYNX=m +CONFIG_HID_PRIMAX=m +CONFIG_HID_SAITEK=m +CONFIG_HID_SAMSUNG=m +CONFIG_HID_SMARTJOYPLUS=m +CONFIG_HID_SPEEDLINK=m +CONFIG_HID_STEELSERIES=m +CONFIG_HID_SUNPLUS=m +CONFIG_HID_THINGM=m +CONFIG_HID_THRUSTMASTER=m +CONFIG_HID_TIVO=m +CONFIG_HID_TOPSEED=m +CONFIG_HID_TWINHAN=m +CONFIG_HID_WALTOP=m +CONFIG_HID_ZEROPLUS=m +CONFIG_HID_ZYDACRON=m +CONFIG_HS_MH248=m +CONFIG_HW_RANDOM_ROCKCHIP=m +CONFIG_I2C_CHARDEV=m +CONFIG_I2C_GPIO=m +CONFIG_I2C_HID_OF=m +CONFIG_I2C_RK3X=m +CONFIG_ICM4260X_ACC=m +CONFIG_IEP=m +CONFIG_IIO_BUFFER_CB=m +CONFIG_IIO_ST_LSM6DSX=m +CONFIG_INPUT_RK805_PWRKEY=m +CONFIG_KEYBOARD_ADC=m +CONFIG_LEDS_GPIO=m +CONFIG_LEDS_RGB13H=m +CONFIG_LEDS_TRIGGER_BACKLIGHT=m +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m +CONFIG_LEDS_TRIGGER_HEARTBEAT=m +CONFIG_LIGHT_DEVICE=m +CONFIG_LSM330_ACC=m +CONFIG_LS_CM3217=m +CONFIG_LS_CM3218=m +CONFIG_LS_STK3410=m +CONFIG_LS_UCS14620=m +CONFIG_MALI_BIFROST=m +CONFIG_MALI_BIFROST_DEBUG=y +CONFIG_MALI_BIFROST_EXPERT=y +CONFIG_MALI_CSF_SUPPORT=y +CONFIG_MALI_PLATFORM_NAME="rk" +CONFIG_MALI_PWRSOFT_765=y +CONFIG_MFD_RK618=m +CONFIG_MFD_RK630_I2C=m +CONFIG_MFD_RK806_I2C=m +CONFIG_MFD_RK806_SPI=m +CONFIG_MFD_RK808=m +CONFIG_MMC_DW=m +CONFIG_MMC_DW_ROCKCHIP=m +CONFIG_MMC_SDHCI_OF_ARASAN=m +CONFIG_MMC_SDHCI_OF_DWCMSHC=m +# CONFIG_MODULE_SIG_ALL is not set +CONFIG_MPU6500_ACC=m +CONFIG_MPU6880_ACC=m +CONFIG_NVMEM_ROCKCHIP_EFUSE=m +CONFIG_NVMEM_ROCKCHIP_OTP=m +CONFIG_OPTEE=m +CONFIG_PANTHERLORD_FF=y +CONFIG_PCIEASPM_EXT=m +CONFIG_PCIE_DW_ROCKCHIP=m +CONFIG_PCIE_ROCKCHIP_HOST=m +CONFIG_PHY_ROCKCHIP_CSI2_DPHY=m +CONFIG_PHY_ROCKCHIP_DP=m +CONFIG_PHY_ROCKCHIP_EMMC=m +CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m +CONFIG_PHY_ROCKCHIP_INNO_HDMI=m +CONFIG_PHY_ROCKCHIP_INNO_USB2=m +CONFIG_PHY_ROCKCHIP_INNO_USB3=m +CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=m +CONFIG_PHY_ROCKCHIP_NANENG_EDP=m +CONFIG_PHY_ROCKCHIP_PCIE=m +CONFIG_PHY_ROCKCHIP_SAMSUNG_DCPHY=m +CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX=m +CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX_HDMI=m +CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=m +CONFIG_PHY_ROCKCHIP_TYPEC=m +CONFIG_PHY_ROCKCHIP_USB=m +CONFIG_PHY_ROCKCHIP_USBDP=m +CONFIG_PINCTRL_RK805=m +CONFIG_PINCTRL_RK806=m +CONFIG_PINCTRL_ROCKCHIP=m +CONFIG_PL330_DMA=m +CONFIG_PROXIMITY_DEVICE=m +CONFIG_PS_STK3410=m +CONFIG_PS_UCS14620=m +CONFIG_PWM_ROCKCHIP=m +CONFIG_R8168=m +CONFIG_REGULATOR_ACT8865=m +CONFIG_REGULATOR_FAN53555=m +CONFIG_REGULATOR_GPIO=m +CONFIG_REGULATOR_LP8752=m +CONFIG_REGULATOR_MP8865=m +CONFIG_REGULATOR_PWM=m +CONFIG_REGULATOR_RK806=m +CONFIG_REGULATOR_RK808=m +CONFIG_REGULATOR_RK860X=m +CONFIG_REGULATOR_TPS65132=m +CONFIG_REGULATOR_WL2868C=m +CONFIG_REGULATOR_XZ3216=m +CONFIG_RFKILL_RK=m +CONFIG_RK628_MISC=m +CONFIG_RK628_MISC_HDMITX=y +CONFIG_RK_CONSOLE_THREAD=y +CONFIG_RK_HEADSET=m +CONFIG_ROCKCHIP_ANALOGIX_DP=y +CONFIG_ROCKCHIP_CDN_DP=y +CONFIG_ROCKCHIP_CHARGER_MANAGER=m +CONFIG_ROCKCHIP_CPUINFO=m +CONFIG_ROCKCHIP_CSU=m +CONFIG_ROCKCHIP_DEBUG=m +CONFIG_ROCKCHIP_DP_MST_AUX_CLIENT=m +CONFIG_ROCKCHIP_DW_DP=y +CONFIG_ROCKCHIP_DW_HDCP2=m +CONFIG_ROCKCHIP_DW_HDMI=y +CONFIG_ROCKCHIP_DW_MIPI_DSI=y +CONFIG_ROCKCHIP_EARLYSUSPEND=y +CONFIG_ROCKCHIP_GRF=m +CONFIG_ROCKCHIP_INNO_HDMI=y +CONFIG_ROCKCHIP_IODOMAIN=m +CONFIG_ROCKCHIP_IOMMU=m +CONFIG_ROCKCHIP_IPA=m +CONFIG_ROCKCHIP_LVDS=y +CONFIG_ROCKCHIP_MPP_AV1DEC=y +CONFIG_ROCKCHIP_MPP_IEP2=y +CONFIG_ROCKCHIP_MPP_JPGDEC=y +CONFIG_ROCKCHIP_MPP_JPGENC=y +CONFIG_ROCKCHIP_MPP_RKVDEC=y +CONFIG_ROCKCHIP_MPP_RKVDEC2=y +CONFIG_ROCKCHIP_MPP_RKVENC=y +CONFIG_ROCKCHIP_MPP_RKVENC2=y +CONFIG_ROCKCHIP_MPP_SERVICE=m +CONFIG_ROCKCHIP_MPP_VDPP=y +CONFIG_ROCKCHIP_MPP_VDPU1=y +CONFIG_ROCKCHIP_MPP_VDPU2=y +CONFIG_ROCKCHIP_MPP_VEPU1=y +CONFIG_ROCKCHIP_MPP_VEPU2=y +CONFIG_ROCKCHIP_MULTI_RGA=m +CONFIG_ROCKCHIP_OPP=m +CONFIG_ROCKCHIP_PHY=m +CONFIG_ROCKCHIP_PM_DOMAINS=m +CONFIG_ROCKCHIP_PVTM=m +CONFIG_ROCKCHIP_RAM_VENDOR_STORAGE=m +CONFIG_ROCKCHIP_REMOTECTL=m +CONFIG_ROCKCHIP_REMOTECTL_PWM=m +CONFIG_ROCKCHIP_RGB=y +CONFIG_ROCKCHIP_RKNPU=m +CONFIG_ROCKCHIP_SARADC=m +CONFIG_ROCKCHIP_SIP=m +CONFIG_ROCKCHIP_SUSPEND_MODE=m +CONFIG_ROCKCHIP_SYSTEM_MONITOR=m +CONFIG_ROCKCHIP_THERMAL=m +CONFIG_ROCKCHIP_TIMER=m +CONFIG_ROCKCHIP_VENDOR_STORAGE=m +CONFIG_ROCKCHIP_VENDOR_STORAGE_UPDATE_LOADER=y +CONFIG_ROCKCHIP_VIDEO_TUNNEL=m +CONFIG_RTC_DRV_HYM8563=m +CONFIG_RTC_DRV_RK808=m +CONFIG_SATA_AHCI=m +CONFIG_SATA_AHCI_PLATFORM=m +CONFIG_SCSI_UFS_ROCKCHIP=m +CONFIG_SENSOR_DEVICE=m +CONFIG_SMARTJOYPLUS_FF=y +CONFIG_SND_SIMPLE_CARD=m +CONFIG_SND_SOC_AW883XX=m +CONFIG_SND_SOC_BT_SCO=m +CONFIG_SND_SOC_CX2072X=m +CONFIG_SND_SOC_DUMMY_CODEC=m +CONFIG_SND_SOC_ES7202=m +CONFIG_SND_SOC_ES7210=m +CONFIG_SND_SOC_ES7243E=m +CONFIG_SND_SOC_ES8311=m +CONFIG_SND_SOC_ES8316=m +CONFIG_SND_SOC_ES8323=m +CONFIG_SND_SOC_ES8326=m +CONFIG_SND_SOC_ES8396=m +CONFIG_SND_SOC_RK3328=m +CONFIG_SND_SOC_RK817=m +CONFIG_SND_SOC_RK_CODEC_DIGITAL=m +CONFIG_SND_SOC_RK_DSM=m +CONFIG_SND_SOC_ROCKCHIP=m +CONFIG_SND_SOC_ROCKCHIP_HDMI=m +CONFIG_SND_SOC_ROCKCHIP_I2S=m +CONFIG_SND_SOC_ROCKCHIP_I2S_TDM=m +CONFIG_SND_SOC_ROCKCHIP_MULTICODECS=m +CONFIG_SND_SOC_ROCKCHIP_PDM=m +CONFIG_SND_SOC_ROCKCHIP_PDM_V2=m +CONFIG_SND_SOC_ROCKCHIP_SAI=m +CONFIG_SND_SOC_ROCKCHIP_SPDIF=m +CONFIG_SND_SOC_ROCKCHIP_SPDIFRX=m +CONFIG_SND_SOC_RT5640=m +CONFIG_SND_SOC_SPDIF=m +CONFIG_SPI_ROCKCHIP=m +CONFIG_SPI_SPIDEV=m +CONFIG_STMMAC_ETH=m +CONFIG_SW_SYNC=m +CONFIG_SYSCON_REBOOT_MODE=m +CONFIG_TEE=m +CONFIG_TEST_POWER=m +CONFIG_TOUCHSCREEN_CHIPONE_9551R=m +CONFIG_TOUCHSCREEN_ELAN5515=m +CONFIG_TOUCHSCREEN_GSL3673=m +CONFIG_TOUCHSCREEN_GSL3673_800X1280=m +CONFIG_TOUCHSCREEN_GSLX680_PAD=m +CONFIG_TOUCHSCREEN_GT1X=m +CONFIG_TYPEC_FUSB302=m +CONFIG_TYPEC_HUSB311=m +CONFIG_UCS12CM0=m +CONFIG_USB_CONFIGFS_RNDIS=m +CONFIG_USB_DWC2=m +CONFIG_USB_NET_CDC_MBIM=m +CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_KALMIA=m +CONFIG_USB_NET_MCS7830=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_SMSC75XX=m +CONFIG_USB_NET_SMSC95XX=m +CONFIG_USB_OHCI_HCD=m +# CONFIG_USB_OHCI_HCD_PCI is not set +CONFIG_USB_OHCI_HCD_PLATFORM=m +CONFIG_USB_PRINTER=m +CONFIG_USB_TRANCEVIBRATOR=m +CONFIG_VENDOR_FRIENDLYELEC=y +CONFIG_VIDEO_AW36518=m +CONFIG_VIDEO_AW8601=m +CONFIG_VIDEO_CES6301=m +CONFIG_VIDEO_CN3927V=m +CONFIG_VIDEO_DW9714=m +CONFIG_VIDEO_DW9763=m +CONFIG_VIDEO_FP5510=m +CONFIG_VIDEO_GC05A2=m +CONFIG_VIDEO_GC2145=m +CONFIG_VIDEO_GC2385=m +CONFIG_VIDEO_GC4C33=m +CONFIG_VIDEO_GC8034=m +CONFIG_VIDEO_IMX415=m +CONFIG_VIDEO_LT6911UXC=m +CONFIG_VIDEO_LT7911D=m +CONFIG_VIDEO_NVP6188=m +CONFIG_VIDEO_OV02B10=m +CONFIG_VIDEO_OV13850=m +CONFIG_VIDEO_OV13855=m +CONFIG_VIDEO_OV16880=m +CONFIG_VIDEO_OV50C40=m +CONFIG_VIDEO_OV5695=m +CONFIG_VIDEO_OV8858=m +CONFIG_VIDEO_OV8865=m +CONFIG_VIDEO_RK628_BT1120=m +CONFIG_VIDEO_RK628_CSI=m +CONFIG_VIDEO_RK_IRCUT=m +CONFIG_VIDEO_ROCKCHIP_CIF=m +CONFIG_VIDEO_ROCKCHIP_HDMIRX=m +CONFIG_VIDEO_ROCKCHIP_ISP=m +CONFIG_VIDEO_ROCKCHIP_ISPP=m +CONFIG_VIDEO_ROCKCHIP_RKISP1=m +CONFIG_VIDEO_ROCKCHIP_VPSS=m +CONFIG_VIDEO_S5K3L6XX=m +CONFIG_VIDEO_S5K3L8XX=m +CONFIG_VIDEO_S5KJN1=m +CONFIG_VIDEO_SC4336=m +CONFIG_VIDEO_SGM3784=m +CONFIG_VIDEO_THCV244=m +CONFIG_VIDEO_VM149C=m +CONFIG_VL6180=m +CONFIG_WIFI_BUILD_MODULE=y +CONFIG_WL_ROCKCHIP=m +CONFIG_ZRAM_WRITEBACK=y diff --git a/kernel-6.1/drivers/bluetooth/btusb.c b/kernel-6.1/drivers/bluetooth/btusb.c index 625e6a391ae..3a4bd54a607 100644 --- a/kernel-6.1/drivers/bluetooth/btusb.c +++ b/kernel-6.1/drivers/bluetooth/btusb.c @@ -33,7 +33,7 @@ static bool disable_scofix; static bool force_scofix; static bool enable_autosuspend = IS_ENABLED(CONFIG_BT_HCIBTUSB_AUTOSUSPEND); static bool reset = true; -static bool ignore_mediatek = true; +static bool ignore_mediatek = false; static struct usb_driver btusb_driver; diff --git a/kernel-6.1/drivers/gpu/drm/drm_probe_helper.c b/kernel-6.1/drivers/gpu/drm/drm_probe_helper.c index 3b968ad187c..650d2cc92df 100644 --- a/kernel-6.1/drivers/gpu/drm/drm_probe_helper.c +++ b/kernel-6.1/drivers/gpu/drm/drm_probe_helper.c @@ -494,6 +494,7 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector, int count = 0, ret; enum drm_connector_status old_status; struct drm_modeset_acquire_ctx ctx; + unsigned int poll_delay = 0; WARN_ON(!mutex_is_locked(&dev->mode_config.mutex)); @@ -549,6 +550,15 @@ retry: drm_get_connector_status_name(old_status), drm_get_connector_status_name(connector->status)); + /* + * Change of unknown to disconnected on boot should + * considered as nothing. + */ + if (old_status == connector_status_unknown && + connector->status == connector_status_disconnected) { + poll_delay = msecs_to_jiffies(3000); + } + /* * The hotplug event code might call into the fb * helpers, and so expects that we do not hold any @@ -559,7 +569,7 @@ retry: if (dev->mode_config.poll_enabled) mod_delayed_work(system_wq, &dev->mode_config.output_poll_work, - 0); + poll_delay); } /* Re-enable polling in case the global poll config changed. */ diff --git a/kernel-6.1/drivers/gpu/drm/rockchip/rockchip_drm_logo.c b/kernel-6.1/drivers/gpu/drm/rockchip/rockchip_drm_logo.c index 53ae6a9c65c..ab903c32843 100644 --- a/kernel-6.1/drivers/gpu/drm/rockchip/rockchip_drm_logo.c +++ b/kernel-6.1/drivers/gpu/drm/rockchip/rockchip_drm_logo.c @@ -640,7 +640,7 @@ static int rockchip_drm_fill_connector_modes(struct drm_connector *connector, dev->mode_config.delayed_event = true; if (dev->mode_config.poll_enabled) schedule_delayed_work(&dev->mode_config.output_poll_work, - 0); + msecs_to_jiffies(3000)); } } diff --git a/kernel-6.1/drivers/net/usb/qmi_wwan.c b/kernel-6.1/drivers/net/usb/qmi_wwan.c index 2d82481d34e..fd7dfc69001 100644 --- a/kernel-6.1/drivers/net/usb/qmi_wwan.c +++ b/kernel-6.1/drivers/net/usb/qmi_wwan.c @@ -842,6 +842,20 @@ static int qmi_wwan_bind(struct usbnet *dev, struct usb_interface *intf) } dev->net->netdev_ops = &qmi_wwan_netdev_ops; dev->net->sysfs_groups[0] = &qmi_wwan_sysfs_attr_group; + +#define DEV_MATCH(ud, vid, pid) \ + (ud.idVendor == cpu_to_le16(vid) && ud.idProduct == cpu_to_le16(pid)) + if (dev->udev->descriptor.idVendor == cpu_to_le16(0x2C7C) || + DEV_MATCH(dev->udev->descriptor, 0x1286, 0x4e3c) || + DEV_MATCH(dev->udev->descriptor, 0x05C6, 0x9090) || + DEV_MATCH(dev->udev->descriptor, 0x05C6, 0x9003) || + DEV_MATCH(dev->udev->descriptor, 0x05C6, 0x9215)) { + info->flags |= QMI_WWAN_FLAG_RAWIP; + qmi_wwan_netdev_setup(dev->net); + dev_info(&intf->dev, "Quectel EC21&EC25 work on RawIP mode\n"); + } +#undef DEV_MATCH + err: return status; } diff --git a/kernel-6.1/drivers/phy/rockchip/phy-rockchip-samsung-hdptx-hdmi.c b/kernel-6.1/drivers/phy/rockchip/phy-rockchip-samsung-hdptx-hdmi.c index 4f3b9f07542..58afac898ac 100644 --- a/kernel-6.1/drivers/phy/rockchip/phy-rockchip-samsung-hdptx-hdmi.c +++ b/kernel-6.1/drivers/phy/rockchip/phy-rockchip-samsung-hdptx-hdmi.c @@ -2356,15 +2356,16 @@ static int rockchip_hdptx_phy_probe(struct platform_device *pdev) reset_control_deassert(hdptx->cmn_reset); reset_control_deassert(hdptx->init_reset); + if (hdptx_grf_read(hdptx, GRF_HDPTX_STATUS) & HDPTX_O_PLL_LOCK_DONE) { + hdptx->initialized = true; + hdptx->rate = hdptx_cal_current_rate(hdptx); + } + ret = rockchip_hdptx_phy_clk_register(hdptx); if (ret) goto err_regsmap; platform_set_drvdata(pdev, hdptx); - if (hdptx_grf_read(hdptx, GRF_HDPTX_STATUS) & HDPTX_O_PLL_LOCK_DONE) { - hdptx->initialized = true; - hdptx->rate = hdptx_cal_current_rate(hdptx); - } dev_info(dev, "hdptx phy init success\n"); return 0; diff --git a/kernel-6.1/drivers/usb/dwc3/drd.c b/kernel-6.1/drivers/usb/dwc3/drd.c index 3bf470032e1..94d8089de84 100644 --- a/kernel-6.1/drivers/usb/dwc3/drd.c +++ b/kernel-6.1/drivers/usb/dwc3/drd.c @@ -538,6 +538,11 @@ static int dwc3_setup_role_switch(struct dwc3 *dwc) dwc3_role_switch.set = dwc3_usb_role_switch_set; dwc3_role_switch.get = dwc3_usb_role_switch_get; dwc3_role_switch.driver_data = dwc; + +#if defined(CONFIG_ARCH_ROCKCHIP) && defined(CONFIG_NO_GKI) + if (device_property_read_bool(dwc->dev, "role-switch-visible")) + dwc3_role_switch.allow_userspace_control = true; +#endif dwc->role_sw = usb_role_switch_register(dwc->dev, &dwc3_role_switch); if (IS_ERR(dwc->role_sw)) return PTR_ERR(dwc->role_sw); diff --git a/kernel-6.1/scripts/mkimg b/kernel-6.1/scripts/mkimg index 2e3bb5cebb4..7a030005522 100755 --- a/kernel-6.1/scripts/mkimg +++ b/kernel-6.1/scripts/mkimg @@ -23,6 +23,8 @@ while [ $# -gt 0 ]; do ;; --keep-dtb-name) DTB_ARGS="--dtbname"; shift 1;; + --boot) + GEN_BOOT_IMG="y"; shift 1;; -h) usage exit 0 @@ -78,6 +80,8 @@ MKIMAGE_ARG="-E -p 0x800" make_boot_img() { + [ "${GEN_BOOT_IMG}" == "y" ] || return 0 + RAMDISK_IMG_PATH=${objtree}/ramdisk.img [ -f ${RAMDISK_IMG_PATH} ] && RAMDISK_IMG=ramdisk.img && RAMDISK_ARG="--ramdisk ${RAMDISK_IMG_PATH}" diff --git a/kernel-6.1/tools/bpf/resolve_btfids/.gitignore b/kernel-6.1/tools/bpf/resolve_btfids/.gitignore index 16913fffc98..52d5e9721d9 100644 --- a/kernel-6.1/tools/bpf/resolve_btfids/.gitignore +++ b/kernel-6.1/tools/bpf/resolve_btfids/.gitignore @@ -1,3 +1,4 @@ /fixdep /resolve_btfids /libbpf/ +/libsubcmd/