diff --git a/config/kernel/linux-rk322x-dev.config b/config/kernel/linux-rk322x-dev.config index 4d07a82b7d..44826f2973 100644 --- a/config/kernel/linux-rk322x-dev.config +++ b/config/kernel/linux-rk322x-dev.config @@ -1,11 +1,11 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.10.11 Kernel Configuration +# Linux/arm 5.11.0 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="arm-none-linux-gnueabihf-gcc (GNU Toolchain for the A-profile Architecture 9.2-2019.12 (arm-9.10)) 9.2.1 20191025" +CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=90201 -CONFIG_LD_VERSION=233010000 +CONFIG_GCC_VERSION=80300 +CONFIG_LD_VERSION=232000000 CONFIG_CLANG_VERSION=0 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y @@ -264,7 +264,6 @@ CONFIG_MMU=y CONFIG_ARCH_MMAP_RND_BITS_MIN=8 CONFIG_ARCH_MMAP_RND_BITS_MAX=16 CONFIG_ARCH_MULTIPLATFORM=y -# CONFIG_ARCH_EBSA110 is not set # CONFIG_ARCH_EP93XX is not set # CONFIG_ARCH_FOOTBRIDGE is not set # CONFIG_ARCH_IOP32X is not set @@ -452,7 +451,6 @@ CONFIG_AEABI=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_ENABLE=y -CONFIG_HAVE_ARCH_PFN_VALID=y CONFIG_HIGHMEM=y # CONFIG_HIGHPTE is not set CONFIG_CPU_SW_DOMAIN_PAN=y @@ -652,6 +650,7 @@ CONFIG_HAVE_ARCH_SECCOMP=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_SECCOMP=y CONFIG_SECCOMP_FILTER=y +# CONFIG_SECCOMP_CACHE_DEBUG is not set CONFIG_HAVE_STACKPROTECTOR=y CONFIG_STACKPROTECTOR=y CONFIG_STACKPROTECTOR_STRONG=y @@ -678,6 +677,7 @@ CONFIG_STRICT_MODULE_RWX=y CONFIG_ARCH_HAS_PHYS_TO_DMA=y # CONFIG_LOCK_EVENT_COUNTS is not set CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y +CONFIG_HAVE_ARCH_PFN_VALID=y # # GCOV-based kernel profiling @@ -687,6 +687,7 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y # end of GCOV-based kernel profiling CONFIG_HAVE_GCC_PLUGINS=y +# CONFIG_GCC_PLUGINS is not set # end of General architecture-dependent options CONFIG_RT_MUTEXES=y @@ -832,7 +833,8 @@ CONFIG_GENERIC_EARLY_IOREMAP=y CONFIG_IDLE_PAGE_TRACKING=y CONFIG_FRAME_VECTOR=y # CONFIG_PERCPU_STATS is not set -# CONFIG_GUP_BENCHMARK is not set +# CONFIG_GUP_TEST is not set +CONFIG_KMAP_LOCAL=y # end of Memory Management options CONFIG_NET=y @@ -1046,6 +1048,7 @@ CONFIG_NF_DUP_NETDEV=m CONFIG_NFT_DUP_NETDEV=m CONFIG_NFT_FWD_NETDEV=m CONFIG_NFT_FIB_NETDEV=m +# CONFIG_NFT_REJECT_NETDEV is not set CONFIG_NF_FLOW_TABLE_INET=m CONFIG_NF_FLOW_TABLE=m CONFIG_NETFILTER_XTABLES=y @@ -1363,6 +1366,7 @@ CONFIG_BRIDGE=y CONFIG_BRIDGE_IGMP_SNOOPING=y CONFIG_BRIDGE_VLAN_FILTERING=y # CONFIG_BRIDGE_MRP is not set +# CONFIG_BRIDGE_CFM is not set CONFIG_HAVE_NET_DSA=y CONFIG_NET_DSA=m CONFIG_NET_DSA_TAG_8021Q=m @@ -1370,7 +1374,9 @@ CONFIG_NET_DSA_TAG_8021Q=m CONFIG_NET_DSA_TAG_BRCM_COMMON=m CONFIG_NET_DSA_TAG_BRCM=m CONFIG_NET_DSA_TAG_BRCM_PREPEND=m +# CONFIG_NET_DSA_TAG_HELLCREEK is not set CONFIG_NET_DSA_TAG_GSWIP=m +CONFIG_NET_DSA_TAG_DSA_COMMON=m CONFIG_NET_DSA_TAG_DSA=m CONFIG_NET_DSA_TAG_EDSA=m CONFIG_NET_DSA_TAG_MTK=m @@ -1519,9 +1525,7 @@ CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_MCAST=y -# CONFIG_BATMAN_ADV_DEBUGFS is not set # CONFIG_BATMAN_ADV_DEBUG is not set -CONFIG_BATMAN_ADV_SYSFS=y # CONFIG_BATMAN_ADV_TRACING is not set CONFIG_OPENVSWITCH=m CONFIG_OPENVSWITCH_GRE=m @@ -1718,7 +1722,6 @@ CONFIG_MAC80211_VERBOSE_DEBUG=y # CONFIG_MAC80211_TDLS_DEBUG is not set # CONFIG_MAC80211_DEBUG_COUNTERS is not set CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 -# CONFIG_WIMAX is not set CONFIG_RFKILL=y CONFIG_RFKILL_LEDS=y CONFIG_RFKILL_INPUT=y @@ -1827,6 +1830,13 @@ CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set CONFIG_CDROM=y CONFIG_ZRAM=m +CONFIG_ZRAM_DEF_COMP_LZORLE=y +# CONFIG_ZRAM_DEF_COMP_ZSTD is not set +# CONFIG_ZRAM_DEF_COMP_LZ4 is not set +# CONFIG_ZRAM_DEF_COMP_LZO is not set +# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set +# CONFIG_ZRAM_DEF_COMP_842 is not set +CONFIG_ZRAM_DEF_COMP="lzo-rle" CONFIG_ZRAM_WRITEBACK=y # CONFIG_ZRAM_MEMORY_TRACKING is not set CONFIG_BLK_DEV_LOOP=y @@ -2033,6 +2043,7 @@ CONFIG_B53_SRAB_DRIVER=m # CONFIG_B53_SERDES is not set CONFIG_NET_DSA_BCM_SF2=m CONFIG_NET_DSA_LOOP=m +# CONFIG_NET_DSA_HIRSCHMANN_HELLCREEK is not set # CONFIG_NET_DSA_LANTIQ_GSWIP is not set CONFIG_NET_DSA_MT7530=m CONFIG_NET_DSA_MV88E6060=m @@ -2253,8 +2264,8 @@ CONFIG_USB_SIERRA_NET=m CONFIG_USB_VL600=m CONFIG_USB_NET_CH9200=m CONFIG_USB_NET_AQC111=m +# CONFIG_USB_RTL8153_ECM is not set CONFIG_WLAN=y -# CONFIG_WIRELESS_WDS is not set CONFIG_WLAN_VENDOR_ADMTEK=y CONFIG_ATH_COMMON=m CONFIG_WLAN_VENDOR_ATH=y @@ -2382,6 +2393,7 @@ CONFIG_WLAN_VENDOR_TI=y CONFIG_RTL8723DU=m CONFIG_RTL8723DS=m CONFIG_RTL8822BU=m +CONFIG_RTL8188EU=m CONFIG_RTL8821CU=m CONFIG_88XXAU=m CONFIG_RTL8192EU=m @@ -2395,10 +2407,6 @@ CONFIG_WLAN_VENDOR_QUANTENNA=y # CONFIG_MAC80211_HWSIM is not set CONFIG_USB_NET_RNDIS_WLAN=y CONFIG_VIRT_WIFI=m - -# -# Enable WiMAX (Networking options) to see the WiMAX drivers -# # CONFIG_WAN is not set # CONFIG_NETDEVSIM is not set CONFIG_NET_FAILOVER=m @@ -2411,7 +2419,6 @@ CONFIG_NET_FAILOVER=m CONFIG_INPUT=y CONFIG_INPUT_LEDS=y CONFIG_INPUT_FF_MEMLESS=y -CONFIG_INPUT_POLLDEV=y # CONFIG_INPUT_SPARSEKMAP is not set CONFIG_INPUT_MATRIXKMAP=y @@ -2503,7 +2510,6 @@ CONFIG_JOYSTICK_FSIA6B=m CONFIG_INPUT_TABLET=y # CONFIG_TABLET_USB_ACECAD is not set # CONFIG_TABLET_USB_AIPTEK is not set -# CONFIG_TABLET_USB_GTCO is not set # CONFIG_TABLET_USB_HANWANG is not set # CONFIG_TABLET_USB_KBTAB is not set # CONFIG_TABLET_USB_PEGASUS is not set @@ -2618,6 +2624,7 @@ CONFIG_INPUT_UINPUT=y # CONFIG_INPUT_PWM_VIBRA is not set # CONFIG_INPUT_RK805_PWRKEY is not set # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set +# CONFIG_INPUT_DA7280_HAPTICS is not set # CONFIG_INPUT_ADXL34X is not set # CONFIG_INPUT_IMS_PCU is not set # CONFIG_INPUT_IQS269A is not set @@ -2908,6 +2915,7 @@ CONFIG_PINCTRL_ROCKCHIP=y # CONFIG_PINCTRL_STMFX is not set # CONFIG_PINCTRL_RK805 is not set # CONFIG_PINCTRL_OCELOT is not set +# CONFIG_PINCTRL_MICROCHIP_SGPIO is not set # # Renesas pinctrl drivers @@ -2989,8 +2997,13 @@ CONFIG_GPIO_MAX77650=m # # end of USB GPIO expanders +# +# Virtual GPIO drivers +# # CONFIG_GPIO_AGGREGATOR is not set # CONFIG_GPIO_MOCKUP is not set +# end of Virtual GPIO drivers + CONFIG_W1=m CONFIG_W1_CON=y @@ -3034,6 +3047,7 @@ CONFIG_POWER_RESET=y # CONFIG_POWER_RESET_GPIO is not set CONFIG_POWER_RESET_GPIO_RESTART=y # CONFIG_POWER_RESET_LTC2952 is not set +# CONFIG_POWER_RESET_REGULATOR is not set # CONFIG_POWER_RESET_RESTART is not set # CONFIG_POWER_RESET_VERSATILE is not set CONFIG_POWER_RESET_SYSCON=y @@ -3108,6 +3122,7 @@ CONFIG_HWMON=y # CONFIG_SENSORS_ASPEED is not set # CONFIG_SENSORS_ATXP1 is not set # CONFIG_SENSORS_CORSAIR_CPRO is not set +# CONFIG_SENSORS_CORSAIR_PSU is not set # CONFIG_SENSORS_DS620 is not set # CONFIG_SENSORS_DS1621 is not set # CONFIG_SENSORS_F71805F is not set @@ -3129,6 +3144,7 @@ CONFIG_SENSORS_GPIO_FAN=y # CONFIG_SENSORS_LTC2947_I2C is not set # CONFIG_SENSORS_LTC2947_SPI is not set # CONFIG_SENSORS_LTC2990 is not set +# CONFIG_SENSORS_LTC2992 is not set # CONFIG_SENSORS_LTC4151 is not set # CONFIG_SENSORS_LTC4215 is not set # CONFIG_SENSORS_LTC4222 is not set @@ -3136,6 +3152,7 @@ CONFIG_SENSORS_GPIO_FAN=y # CONFIG_SENSORS_LTC4260 is not set # CONFIG_SENSORS_LTC4261 is not set # CONFIG_SENSORS_MAX1111 is not set +# CONFIG_SENSORS_MAX127 is not set # CONFIG_SENSORS_MAX16065 is not set # CONFIG_SENSORS_MAX1619 is not set # CONFIG_SENSORS_MAX1668 is not set @@ -3180,6 +3197,7 @@ CONFIG_SENSORS_GPIO_FAN=y # CONFIG_SENSORS_PCF8591 is not set # CONFIG_PMBUS is not set CONFIG_SENSORS_PWM_FAN=y +# CONFIG_SENSORS_SBTSI is not set # CONFIG_SENSORS_SHT15 is not set # CONFIG_SENSORS_SHT21 is not set # CONFIG_SENSORS_SHT3x is not set @@ -3410,6 +3428,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y # CONFIG_REGULATOR_ARIZONA_MICSUPP is not set # CONFIG_REGULATOR_BD718XX is not set # CONFIG_REGULATOR_CPCAP is not set +# CONFIG_REGULATOR_DA9121 is not set # CONFIG_REGULATOR_DA9210 is not set # CONFIG_REGULATOR_DA9211 is not set # CONFIG_REGULATOR_FAN53555 is not set @@ -3437,6 +3456,7 @@ CONFIG_REGULATOR_GPIO=y # CONFIG_REGULATOR_MPQ7920 is not set # CONFIG_REGULATOR_MT6311 is not set # CONFIG_REGULATOR_PCA9450 is not set +# CONFIG_REGULATOR_PF8X00 is not set # CONFIG_REGULATOR_PFUZE100 is not set # CONFIG_REGULATOR_PV88060 is not set # CONFIG_REGULATOR_PV88080 is not set @@ -3743,6 +3763,7 @@ CONFIG_V4L_PLATFORM_DRIVERS=y # CONFIG_VIDEO_CADENCE is not set # CONFIG_VIDEO_ASPEED is not set CONFIG_VIDEO_MUX=m +# CONFIG_VIDEO_ROCKCHIP_ISP1 is not set CONFIG_VIDEO_XILINX=m # CONFIG_VIDEO_XILINX_CSI2RXSS is not set CONFIG_VIDEO_XILINX_TPG=m @@ -3881,6 +3902,7 @@ CONFIG_VIDEO_CX25840=m # CONFIG_VIDEO_IMX290 is not set # CONFIG_VIDEO_IMX319 is not set # CONFIG_VIDEO_IMX355 is not set +# CONFIG_VIDEO_OV02A10 is not set # CONFIG_VIDEO_OV2640 is not set # CONFIG_VIDEO_OV2659 is not set # CONFIG_VIDEO_OV2680 is not set @@ -3920,7 +3942,7 @@ CONFIG_VIDEO_CX25840=m # CONFIG_VIDEO_S5K6A3 is not set # CONFIG_VIDEO_S5K4ECGX is not set # CONFIG_VIDEO_S5K5BAF is not set -# CONFIG_VIDEO_SMIAPP is not set +# CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_ET8EK8 is not set # CONFIG_VIDEO_S5C73M3 is not set # end of Camera sensor devices @@ -4226,6 +4248,7 @@ CONFIG_DRM_PANEL=y # # Display Panels # +# CONFIG_DRM_PANEL_ABT_Y030XX067A is not set # CONFIG_DRM_PANEL_ARM_VERSATILE is not set # CONFIG_DRM_PANEL_LVDS is not set CONFIG_DRM_PANEL_SIMPLE=m @@ -4258,6 +4281,7 @@ CONFIG_DRM_PANEL_BRIDGE=y # CONFIG_DRM_CHRONTEL_CH7033 is not set CONFIG_DRM_DISPLAY_CONNECTOR=m # CONFIG_DRM_LONTIUM_LT9611 is not set +# CONFIG_DRM_LONTIUM_LT9611UXC is not set # CONFIG_DRM_ITE_IT66121 is not set # CONFIG_DRM_LVDS_CODEC is not set # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set @@ -4280,6 +4304,7 @@ CONFIG_DRM_SIMPLE_BRIDGE=m # CONFIG_DRM_TI_TPD12S015 is not set # CONFIG_DRM_ANALOGIX_ANX6345 is not set # CONFIG_DRM_ANALOGIX_ANX78XX is not set +# CONFIG_DRM_ANALOGIX_ANX7625 is not set # CONFIG_DRM_I2C_ADV7511 is not set # CONFIG_DRM_CDNS_MHDP8546 is not set CONFIG_DRM_DW_HDMI=y @@ -4443,6 +4468,7 @@ CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y # CONFIG_SND_USB_VARIAX is not set CONFIG_SND_SOC=m CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y +# CONFIG_SND_SOC_ADI is not set # CONFIG_SND_SOC_AMD_ACP is not set # CONFIG_SND_ATMEL_SOC is not set # CONFIG_SND_BCM63XX_I2S_WHISTLER is not set @@ -4462,6 +4488,7 @@ CONFIG_SND_SOC_FSL_AUDMIX=m # CONFIG_SND_SOC_FSL_SPDIF is not set # CONFIG_SND_SOC_FSL_ESAI is not set # CONFIG_SND_SOC_FSL_MICFIL is not set +# CONFIG_SND_SOC_FSL_XCVR is not set # CONFIG_SND_SOC_IMX_AUDMUX is not set # end of SoC Audio for Freescale CPUs @@ -4494,6 +4521,8 @@ CONFIG_SND_SOC_I2C_AND_SPI=m # CODEC drivers # # CONFIG_SND_SOC_AC97_CODEC is not set +# CONFIG_SND_SOC_ADAU1372_I2C is not set +# CONFIG_SND_SOC_ADAU1372_SPI is not set # CONFIG_SND_SOC_ADAU1701 is not set # CONFIG_SND_SOC_ADAU1761_I2C is not set # CONFIG_SND_SOC_ADAU1761_SPI is not set @@ -4565,6 +4594,7 @@ CONFIG_SND_SOC_PCM1789_I2C=m # CONFIG_SND_SOC_PCM3060_SPI is not set # CONFIG_SND_SOC_PCM3168A_I2C is not set # CONFIG_SND_SOC_PCM3168A_SPI is not set +# CONFIG_SND_SOC_PCM5102A is not set # CONFIG_SND_SOC_PCM512x_I2C is not set # CONFIG_SND_SOC_PCM512x_SPI is not set CONFIG_SND_SOC_RK3328=m @@ -4574,6 +4604,7 @@ CONFIG_SND_SOC_RT5616=m CONFIG_SND_SOC_RT5645=m # CONFIG_SND_SOC_SGTL5000 is not set CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m +# CONFIG_SND_SOC_SIMPLE_MUX is not set # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set CONFIG_SND_SOC_SPDIF=m CONFIG_SND_SOC_SSM2305=m @@ -4633,11 +4664,14 @@ CONFIG_SND_SOC_MAX9759=m CONFIG_SND_SOC_MT6351=m CONFIG_SND_SOC_MT6358=m # CONFIG_SND_SOC_MT6660 is not set +# CONFIG_SND_SOC_NAU8315 is not set CONFIG_SND_SOC_NAU8540=m # CONFIG_SND_SOC_NAU8810 is not set # CONFIG_SND_SOC_NAU8822 is not set # CONFIG_SND_SOC_NAU8824 is not set # CONFIG_SND_SOC_TPA6130A2 is not set +# CONFIG_SND_SOC_LPASS_WSA_MACRO is not set +# CONFIG_SND_SOC_LPASS_VA_MACRO is not set # end of CODEC drivers CONFIG_SND_SIMPLE_CARD_UTILS=m @@ -4933,7 +4967,6 @@ CONFIG_USB_SERIAL_SIERRAWIRELESS=m CONFIG_USB_SERIAL_SYMBOL=m CONFIG_USB_SERIAL_TI=m CONFIG_USB_SERIAL_CYBERJACK=m -CONFIG_USB_SERIAL_XIRCOM=m CONFIG_USB_SERIAL_WWAN=m CONFIG_USB_SERIAL_OPTION=m CONFIG_USB_SERIAL_OMNINET=m @@ -5152,6 +5185,10 @@ CONFIG_LEDS_USER=m # CONFIG_LEDS_SPI_BYTE is not set # CONFIG_LEDS_TI_LMU_COMMON is not set +# +# Flash and Torch LED drivers +# + # # LED Triggers # @@ -5248,7 +5285,6 @@ CONFIG_RTC_DRV_DS1390=m CONFIG_RTC_DRV_MAX6916=m CONFIG_RTC_DRV_R9701=m CONFIG_RTC_DRV_RX4581=m -CONFIG_RTC_DRV_RX6110=m CONFIG_RTC_DRV_RS5C348=m CONFIG_RTC_DRV_MAX6902=m CONFIG_RTC_DRV_PCF2123=m @@ -5263,6 +5299,7 @@ CONFIG_RTC_DRV_DS3232_HWMON=y CONFIG_RTC_DRV_PCF2127=m CONFIG_RTC_DRV_RV3029C2=m CONFIG_RTC_DRV_RV3029_HWMON=y +CONFIG_RTC_DRV_RX6110=m # # Platform RTC drivers @@ -5298,6 +5335,7 @@ CONFIG_RTC_DRV_CADENCE=m # HID Sensor RTC drivers # # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set +# CONFIG_RTC_DRV_GOLDFISH is not set CONFIG_DMADEVICES=y # CONFIG_DMADEVICES_DEBUG is not set @@ -5430,13 +5468,11 @@ CONFIG_STAGING_MEDIA=y CONFIG_VIDEO_HANTRO=m CONFIG_VIDEO_HANTRO_ROCKCHIP=y CONFIG_VIDEO_ROCKCHIP_VDEC=m -# CONFIG_VIDEO_ROCKCHIP_ISP1 is not set # # Android # CONFIG_ASHMEM=y -# CONFIG_ION is not set # end of Android # CONFIG_STAGING_BOARD is not set @@ -5490,6 +5526,7 @@ CONFIG_FIELDBUS_DEV=m CONFIG_HMS_ANYBUSS_BUS=m CONFIG_ARCX_ANYBUS_CONTROLLER=m CONFIG_HMS_PROFINET=m +# CONFIG_WIMAX is not set # CONFIG_WFX is not set # CONFIG_GOLDFISH is not set # CONFIG_CHROME_PLATFORMS is not set @@ -5508,7 +5545,6 @@ CONFIG_COMMON_CLK_SI544=m # CONFIG_COMMON_CLK_CDCE706 is not set # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set -# CONFIG_CLK_QORIQ is not set # CONFIG_COMMON_CLK_PWM is not set CONFIG_COMMON_CLK_VC5=m # CONFIG_COMMON_CLK_BD718XX is not set @@ -5540,6 +5576,7 @@ CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y CONFIG_MAILBOX=y # CONFIG_ARM_MHU is not set +# CONFIG_ARM_MHU_V2 is not set # CONFIG_PLATFORM_MHU is not set # CONFIG_PL320_MBOX is not set CONFIG_ROCKCHIP_MBOX=y @@ -5587,11 +5624,6 @@ CONFIG_ROCKCHIP_IOMMU=y # # end of Amlogic SoC drivers -# -# Aspeed SoC drivers -# -# end of Aspeed SoC drivers - # # Broadcom SoC drivers # @@ -5610,6 +5642,12 @@ CONFIG_ROCKCHIP_IOMMU=y # # end of i.MX SoC drivers +# +# Enable LiteX SoC Builder specific drivers +# +# CONFIG_LITEX_SOC_CONTROLLER is not set +# end of Enable LiteX SoC Builder specific drivers + # # Qualcomm SoC drivers # @@ -5656,6 +5694,7 @@ CONFIG_EXTCON=y # CONFIG_EXTCON_RT8973A is not set # CONFIG_EXTCON_SM5502 is not set # CONFIG_EXTCON_USB_GPIO is not set +# CONFIG_EXTCON_USBC_TUSB320 is not set CONFIG_MEMORY=y # CONFIG_ARM_PL172_MPMC is not set CONFIG_PL353_SMC=y @@ -6134,6 +6173,7 @@ CONFIG_MAX31856=m CONFIG_PWM=y CONFIG_PWM_SYSFS=y # CONFIG_PWM_DEBUG is not set +# CONFIG_PWM_ATMEL_TCB is not set # CONFIG_PWM_FSL_FTM is not set # CONFIG_PWM_PCA9685 is not set CONFIG_PWM_ROCKCHIP=y @@ -6426,6 +6466,7 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 # CONFIG_QNX6FS_FS is not set # CONFIG_ROMFS_FS is not set CONFIG_PSTORE=y +CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240 CONFIG_PSTORE_DEFLATE_COMPRESS=m # CONFIG_PSTORE_LZO_COMPRESS is not set # CONFIG_PSTORE_LZ4_COMPRESS is not set @@ -6444,24 +6485,6 @@ CONFIG_PSTORE_RAM=y # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set # CONFIG_EROFS_FS is not set -CONFIG_AUFS_FS=m -CONFIG_AUFS_BRANCH_MAX_127=y -# CONFIG_AUFS_BRANCH_MAX_511 is not set -# CONFIG_AUFS_BRANCH_MAX_1023 is not set -# CONFIG_AUFS_BRANCH_MAX_32767 is not set -CONFIG_AUFS_SBILIST=y -# CONFIG_AUFS_HNOTIFY is not set -# CONFIG_AUFS_EXPORT is not set -# CONFIG_AUFS_XATTR is not set -# CONFIG_AUFS_FHSM is not set -# CONFIG_AUFS_RDU is not set -# CONFIG_AUFS_DIRREN is not set -# CONFIG_AUFS_SHWH is not set -# CONFIG_AUFS_BR_RAMFS is not set -# CONFIG_AUFS_BR_FUSE is not set -CONFIG_AUFS_BR_HFSPLUS=y -CONFIG_AUFS_BDEV_LOOP=y -# CONFIG_AUFS_DEBUG is not set CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=y CONFIG_NFS_V2=y @@ -6518,6 +6541,7 @@ CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y # CONFIG_CIFS_DEBUG is not set # CONFIG_CIFS_DFS_UPCALL is not set +# CONFIG_CIFS_SWN_UPCALL is not set CONFIG_CIFS_FSCACHE=y # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set @@ -6939,6 +6963,7 @@ CONFIG_CMA_SIZE_SEL_MBYTES=y # CONFIG_CMA_SIZE_SEL_MAX is not set CONFIG_CMA_ALIGNMENT=8 # CONFIG_DMA_API_DEBUG is not set +# CONFIG_DMA_MAP_BENCHMARK is not set CONFIG_SGL_ALLOC=y CONFIG_CPU_RMAP=y CONFIG_DQL=y @@ -6963,6 +6988,8 @@ CONFIG_SBITMAP=y # CONFIG_STRING_SELFTEST is not set # end of Library routines +CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y + # # Kernel hacking # @@ -6986,7 +7013,6 @@ CONFIG_DEBUG_BUGVERBOSE=y # Compile-time checks and compiler options # # CONFIG_DEBUG_INFO is not set -CONFIG_ENABLE_MUST_CHECK=y CONFIG_FRAME_WARN=1024 # CONFIG_STRIP_ASM_SYMS is not set # CONFIG_READABLE_ASM is not set @@ -7040,9 +7066,12 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y # CONFIG_DEBUG_VIRTUAL is not set # CONFIG_DEBUG_MEMORY_INIT is not set # CONFIG_DEBUG_PER_CPU_MAPS is not set +# CONFIG_DEBUG_KMAP_LOCAL is not set # CONFIG_DEBUG_HIGHMEM is not set +CONFIG_HAVE_ARCH_KASAN=y CONFIG_CC_HAS_KASAN_GENERIC=y CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y +# CONFIG_KASAN is not set # end of Memory Debugging # CONFIG_DEBUG_SHIRQ is not set @@ -7163,11 +7192,12 @@ CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_TRACEPOINT_BENCHMARK is not set # CONFIG_RING_BUFFER_BENCHMARK is not set # CONFIG_TRACE_EVAL_MAP_FILE is not set +# CONFIG_FTRACE_RECORD_RECURSION is not set # CONFIG_FTRACE_STARTUP_TEST is not set # CONFIG_RING_BUFFER_STARTUP_TEST is not set +# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set # CONFIG_PREEMPTIRQ_DELAY_TEST is not set # CONFIG_SAMPLES is not set -CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y CONFIG_STRICT_DEVMEM=y # CONFIG_IO_STRICT_DEVMEM is not set diff --git a/config/sources/families/rk322x.conf b/config/sources/families/rk322x.conf index 55fccedcf4..a46b47c46c 100644 --- a/config/sources/families/rk322x.conf +++ b/config/sources/families/rk322x.conf @@ -26,7 +26,7 @@ case $BRANCH in dev) - KERNELBRANCH='branch:linux-5.10.y' + KERNELBRANCH='branch:linux-5.11.y' ;; diff --git a/packages/bsp/rk322x/rk322x-config b/packages/bsp/rk322x/rk322x-config index b4cdf6f414..d5a2dfef4a 100755 --- a/packages/bsp/rk322x/rk322x-config +++ b/packages/bsp/rk322x/rk322x-config @@ -59,6 +59,7 @@ DT_FLASH_OVERLAYS+=(["emmc-nand"]="eMMC or NAND flash memory") DT_LED_OVERLAYS+=(["led-conf1"]="LED configuration #1 (Chiptrip)") DT_LED_OVERLAYS+=(["led-conf2"]="LED configuration #2 (R329q)") +DT_LED_OVERLAYS+=(["led-conf3"]="LED configuration #3 (R28-MXQ)") DT_CPU_OVERLAYS+=(["cpu-hs"]="RK3228B or RK3229") diff --git a/patch/kernel/rk322x-current/general-add-overlays.patch b/patch/kernel/rk322x-current/general-add-overlays.patch index 5e01b0c1fb..555a0cf515 100644 --- a/patch/kernel/rk322x-current/general-add-overlays.patch +++ b/patch/kernel/rk322x-current/general-add-overlays.patch @@ -1,9 +1,9 @@ diff --git a/arch/arm/boot/dts/overlay/Makefile b/arch/arm/boot/dts/overlay/Makefile new file mode 100755 -index 000000000..20b3b57f4 +index 000000000..df09b95a7 --- /dev/null +++ b/arch/arm/boot/dts/overlay/Makefile -@@ -0,0 +1,21 @@ +@@ -0,0 +1,22 @@ +# SPDX-License-Identifier: GPL-2.0 +dtbo-$(CONFIG_ARCH_ROCKCHIP) += \ + rk322x-emmc.dtbo \ @@ -11,6 +11,7 @@ index 000000000..20b3b57f4 + rk322x-emmc-nand.dtbo \ + rk322x-led-conf1.dtbo \ + rk322x-led-conf2.dtbo \ ++ rk322x-led-conf3.dtbo \ + rk322x-cpu-hs.dtbo \ + rk322x-wlan-alt-wiring.dtbo + @@ -27,10 +28,10 @@ index 000000000..20b3b57f4 + diff --git a/arch/arm/boot/dts/overlay/README.rk322x-overlays b/arch/arm/boot/dts/overlay/README.rk322x-overlays new file mode 100755 -index 000000000..96d3fc8bb +index 000000000..01a768161 --- /dev/null +++ b/arch/arm/boot/dts/overlay/README.rk322x-overlays -@@ -0,0 +1,57 @@ +@@ -0,0 +1,60 @@ +This document describes overlays provided in the kernel packages +For generic Armbian overlays documentation please see +https://docs.armbian.com/User-Guide_Allwinner_overlays/ @@ -83,6 +84,9 @@ index 000000000..96d3fc8bb +(ie: gpio and active low/high) of the onboard leds. Each board manufacturer +usually choose a different GPIO for the auxiliary led, but the main "working" +led is always wired to the same gpio (although it may be active high or low) ++led-conf1 is suited for boards usually from chiptrip brand (xt-mx4vr, xt-mx1vr, ...) ++led-conf2 is found on boards withs r329q marking ++led-conf3 is found on boards with r28-mxq marking + +### rk322x-alt-wiring + @@ -316,6 +320,69 @@ index 000000000..153f71565 + }; + +}; +diff --git a/arch/arm/boot/dts/overlay/rk322x-led-conf3.dts b/arch/arm/boot/dts/overlay/rk322x-led-conf3.dts +new file mode 100755 +index 000000000..39f4547ed +--- /dev/null ++++ b/arch/arm/boot/dts/overlay/rk322x-led-conf3.dts +@@ -0,0 +1,57 @@ ++/dts-v1/; ++/plugin/; ++ ++#include ++#include ++#include ++ ++/ { ++ ++ fragment@0 { ++ target-path = "/gpio-leds"; ++ __overlay__ { ++ ++ working { ++ gpios = <&gpio3 RK_PC5 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "none"; ++ }; ++ ++ auxiliary { ++ gpios = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; ++ label = "auxiliary"; ++ linux,default-trigger = "mmc2"; ++ default-state = "off"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&gpio_led_aux>; ++ }; ++ ++ }; ++ }; ++ ++ fragment@1 { ++ target-path = "/pinctrl/gpio"; ++ __overlay__ { ++ ++ gpio_led_aux: gpio-led-aux { ++ rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ ++ }; ++ }; ++ ++ fragment@2 { ++ target = <&gpio_keys>; ++ __overlay__ { ++ ++ reset { ++ gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>; ++ label = "reset"; ++ linux,code = ; ++ debounce-interval = <200>; ++ wakeup-source; ++ }; ++ ++ }; ++ }; ++ ++}; diff --git a/arch/arm/boot/dts/overlay/rk322x-nand.dts b/arch/arm/boot/dts/overlay/rk322x-nand.dts new file mode 100755 index 000000000..2a939ab49 @@ -346,7 +413,7 @@ index 000000000..2a939ab49 +}; diff --git a/arch/arm/boot/dts/overlay/rk322x-wlan-alt-wiring.dts b/arch/arm/boot/dts/overlay/rk322x-wlan-alt-wiring.dts new file mode 100755 -index 000000000..b63611295 +index 000000000..f04c9ac16 --- /dev/null +++ b/arch/arm/boot/dts/overlay/rk322x-wlan-alt-wiring.dts @@ -0,0 +1,67 @@ diff --git a/patch/kernel/rk322x-dev/01-linux-0001-rockchip-from-5.11.patch b/patch/kernel/rk322x-dev/01-linux-0001-rockchip-from-5.11.patch.disabled similarity index 100% rename from patch/kernel/rk322x-dev/01-linux-0001-rockchip-from-5.11.patch rename to patch/kernel/rk322x-dev/01-linux-0001-rockchip-from-5.11.patch.disabled diff --git a/patch/kernel/rk322x-dev/01-linux-0002-rockchip-from-list.patch b/patch/kernel/rk322x-dev/01-linux-0002-rockchip-from-list.patch.disabled similarity index 100% rename from patch/kernel/rk322x-dev/01-linux-0002-rockchip-from-list.patch rename to patch/kernel/rk322x-dev/01-linux-0002-rockchip-from-list.patch.disabled diff --git a/patch/kernel/rk322x-dev/01-linux-0010-v4l-from-list.patch b/patch/kernel/rk322x-dev/01-linux-0010-v4l-from-list.patch.disabled similarity index 100% rename from patch/kernel/rk322x-dev/01-linux-0010-v4l-from-list.patch rename to patch/kernel/rk322x-dev/01-linux-0010-v4l-from-list.patch.disabled diff --git a/patch/kernel/rk322x-dev/01-linux-0020-drm-from-5.11.patch b/patch/kernel/rk322x-dev/01-linux-0020-drm-from-5.11.patch deleted file mode 100644 index ea8e5c5f1b..0000000000 --- a/patch/kernel/rk322x-dev/01-linux-0020-drm-from-5.11.patch +++ /dev/null @@ -1,244 +0,0 @@ -From b9335b9a01fc5eadeec6c50a81e68a9e9799de2d Mon Sep 17 00:00:00 2001 -From: Thomas Zimmermann -Date: Wed, 23 Sep 2020 12:21:51 +0200 -Subject: [PATCH] drm/rockchip: Convert to drm_gem_object_funcs -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -GEM object functions deprecate several similar callback interfaces in -struct drm_driver. This patch replaces the per-driver callbacks with -per-instance callbacks in rockchip. The only exception is gem_prime_mmap, -which is non-trivial to convert. - -v3: - * update documentation - -Signed-off-by: Thomas Zimmermann -Reviewed-by: Daniel Vetter -Acked-by: Christian König -Link: https://patchwork.freedesktop.org/patch/msgid/20200923102159.24084-15-tzimmermann@suse.de -(cherry picked from commit 0d590af3140d0f84c537a9ad252aecc780ed7aa5) ---- - drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 5 ----- - drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 12 +++++++++++- - 2 files changed, 11 insertions(+), 6 deletions(-) - -diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c -index 0f3eb392fe39..b7654f5e4225 100644 ---- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c -+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c -@@ -212,15 +212,10 @@ static const struct file_operations rockchip_drm_driver_fops = { - static struct drm_driver rockchip_drm_driver = { - .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, - .lastclose = drm_fb_helper_lastclose, -- .gem_vm_ops = &drm_gem_cma_vm_ops, -- .gem_free_object_unlocked = rockchip_gem_free_object, - .dumb_create = rockchip_gem_dumb_create, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, - .prime_fd_to_handle = drm_gem_prime_fd_to_handle, -- .gem_prime_get_sg_table = rockchip_gem_prime_get_sg_table, - .gem_prime_import_sg_table = rockchip_gem_prime_import_sg_table, -- .gem_prime_vmap = rockchip_gem_prime_vmap, -- .gem_prime_vunmap = rockchip_gem_prime_vunmap, - .gem_prime_mmap = rockchip_gem_mmap_buf, - .fops = &rockchip_drm_driver_fops, - .name = DRIVER_NAME, -diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c -index 62e5d0970525..1cf4631461c9 100644 ---- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c -+++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c -@@ -295,6 +295,14 @@ static void rockchip_gem_release_object(struct rockchip_gem_object *rk_obj) - kfree(rk_obj); - } - -+static const struct drm_gem_object_funcs rockchip_gem_object_funcs = { -+ .free = rockchip_gem_free_object, -+ .get_sg_table = rockchip_gem_prime_get_sg_table, -+ .vmap = rockchip_gem_prime_vmap, -+ .vunmap = rockchip_gem_prime_vunmap, -+ .vm_ops = &drm_gem_cma_vm_ops, -+}; -+ - static struct rockchip_gem_object * - rockchip_gem_alloc_object(struct drm_device *drm, unsigned int size) - { -@@ -309,6 +317,8 @@ static struct rockchip_gem_object * - - obj = &rk_obj->base; - -+ obj->funcs = &rockchip_gem_object_funcs; -+ - drm_gem_object_init(drm, obj, size); - - return rk_obj; -@@ -337,7 +347,7 @@ rockchip_gem_create_object(struct drm_device *drm, unsigned int size, - } - - /* -- * rockchip_gem_free_object - (struct drm_driver)->gem_free_object_unlocked -+ * rockchip_gem_free_object - (struct drm_gem_object_funcs)->free - * callback function - */ - void rockchip_gem_free_object(struct drm_gem_object *obj) - -From ba7e8c9f9c79119c569466b08b58a3b20aa0dca9 Mon Sep 17 00:00:00 2001 -From: Thomas Zimmermann -Date: Mon, 28 Sep 2020 10:16:43 +0200 -Subject: [PATCH] drm/rockchip: Include for - drm_gem_cm_vm_ops -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Include to get drm_gem_cma_vm_ops. Fallout -from the recent conversion to GEM object functions. - -Signed-off-by: Thomas Zimmermann -Reviewed-by: Sam Ravnborg -Reported-by: kernel test robot -Fixes: 0d590af3140d ("drm/rockchip: Convert to drm_gem_object_funcs") -Cc: Thomas Zimmermann -Cc: Daniel Vetter -Cc: Christian König -Cc: Sandy Huang -Cc: "Heiko Stübner" -Cc: dri-devel@lists.freedesktop.org -Cc: linux-arm-kernel@lists.infradead.org -Cc: linux-rockchip@lists.infradead.org -Link: https://patchwork.freedesktop.org/patch/msgid/20200928081643.8575-1-tzimmermann@suse.de -(cherry picked from commit 8f7db83e6abf863c6a2cfddbe7086f1e3251fdbf) ---- - drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c -index 1cf4631461c9..7d5ebb10323b 100644 ---- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c -+++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c -@@ -10,6 +10,7 @@ - - #include - #include -+#include - #include - #include - - -From 40175ca66971e6bde3e4c3e466616da07711271d Mon Sep 17 00:00:00 2001 -From: Qinglang Miao -Date: Mon, 21 Sep 2020 21:10:19 +0800 -Subject: [PATCH] drm/panfrost: simplify the return expression of - cz_ih_hw_init() - -Simplify the return expression. - -Signed-off-by: Qinglang Miao -Reviewed-by: Philipp Zabel -Reviewed-by: Steven Price -Signed-off-by: Steven Price -Link: https://patchwork.freedesktop.org/patch/msgid/20200921131019.91558-1-miaoqinglang@huawei.com -(cherry picked from commit 3c4641d4e75618fa1b5501b9ae9c19f765d75725) ---- - drivers/gpu/drm/panfrost/panfrost_device.c | 8 +------- - 1 file changed, 1 insertion(+), 7 deletions(-) - -diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/panfrost/panfrost_device.c -index e6896733838a..ea8d31863c50 100644 ---- a/drivers/gpu/drm/panfrost/panfrost_device.c -+++ b/drivers/gpu/drm/panfrost/panfrost_device.c -@@ -18,19 +18,13 @@ - - static int panfrost_reset_init(struct panfrost_device *pfdev) - { -- int err; -- - pfdev->rstc = devm_reset_control_array_get(pfdev->dev, false, true); - if (IS_ERR(pfdev->rstc)) { - dev_err(pfdev->dev, "get reset failed %ld\n", PTR_ERR(pfdev->rstc)); - return PTR_ERR(pfdev->rstc); - } - -- err = reset_control_deassert(pfdev->rstc); -- if (err) -- return err; -- -- return 0; -+ return reset_control_deassert(pfdev->rstc); - } - - static void panfrost_reset_fini(struct panfrost_device *pfdev) - -From 7e4d1ac491e3ac8b8b03d74129ef9521cdf479ef Mon Sep 17 00:00:00 2001 -From: Qinglang Miao -Date: Mon, 21 Sep 2020 21:10:21 +0800 -Subject: [PATCH] drm/panfrost: simplify the return expression of - panfrost_devfreq_target() - -Simplify the return expression. - -Signed-off-by: Qinglang Miao -Reviewed-by: Steven Price -Signed-off-by: Steven Price -Link: https://patchwork.freedesktop.org/patch/msgid/20200921131021.91604-1-miaoqinglang@huawei.com -(cherry picked from commit 0c5036590bde1407a6250ea027e836815353820f) ---- - drivers/gpu/drm/panfrost/panfrost_devfreq.c | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.c b/drivers/gpu/drm/panfrost/panfrost_devfreq.c -index 8ab025d0035f..913eaa6d0bc6 100644 ---- a/drivers/gpu/drm/panfrost/panfrost_devfreq.c -+++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.c -@@ -29,18 +29,13 @@ static int panfrost_devfreq_target(struct device *dev, unsigned long *freq, - u32 flags) - { - struct dev_pm_opp *opp; -- int err; - - opp = devfreq_recommended_opp(dev, freq, flags); - if (IS_ERR(opp)) - return PTR_ERR(opp); - dev_pm_opp_put(opp); - -- err = dev_pm_opp_set_rate(dev, *freq); -- if (err) -- return err; -- -- return 0; -+ return dev_pm_opp_set_rate(dev, *freq); - } - - static void panfrost_devfreq_reset(struct panfrost_devfreq *pfdevfreq) - -From 7efe8c0d9576db34e4d5427d5a939a20f4afe96f Mon Sep 17 00:00:00 2001 -From: Rikard Falkeborn -Date: Sun, 4 Oct 2020 22:06:53 +0200 -Subject: [PATCH] drm: bridge: dw-hdmi: Constify dw_hdmi_i2s_ops - -The only usage of dw_hdmi_i2s_ops is to assign its address to the ops -field in the hdmi_codec_pdata struct, which is a const pointer. Make it -const to allow the compiler to put it in read-only memory. - -Signed-off-by: Rikard Falkeborn -Signed-off-by: Daniel Vetter -Link: https://patchwork.freedesktop.org/patch/msgid/20201004200653.14702-1-rikard.falkeborn@gmail.com -(cherry picked from commit f3d52908f6baffc21ba45058103d0226ca5cb073) ---- - drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c -index 9fef6413741d..feb04f127b55 100644 ---- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c -+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c -@@ -170,7 +170,7 @@ static int dw_hdmi_i2s_hook_plugged_cb(struct device *dev, void *data, - return dw_hdmi_set_plugged_cb(hdmi, fn, codec_dev); - } - --static struct hdmi_codec_ops dw_hdmi_i2s_ops = { -+static const struct hdmi_codec_ops dw_hdmi_i2s_ops = { - .hw_params = dw_hdmi_i2s_hw_params, - .audio_startup = dw_hdmi_i2s_audio_startup, - .audio_shutdown = dw_hdmi_i2s_audio_shutdown, - diff --git a/patch/kernel/rk322x-dev/01-linux-1002-v4l-wip.patch b/patch/kernel/rk322x-dev/01-linux-1002-v4l-wip.patch.disabled similarity index 100% rename from patch/kernel/rk322x-dev/01-linux-1002-v4l-wip.patch rename to patch/kernel/rk322x-dev/01-linux-1002-v4l-wip.patch.disabled diff --git a/patch/kernel/rk322x-dev/general-add-overlays.patch b/patch/kernel/rk322x-dev/general-add-overlays.patch index 5e01b0c1fb..555a0cf515 100644 --- a/patch/kernel/rk322x-dev/general-add-overlays.patch +++ b/patch/kernel/rk322x-dev/general-add-overlays.patch @@ -1,9 +1,9 @@ diff --git a/arch/arm/boot/dts/overlay/Makefile b/arch/arm/boot/dts/overlay/Makefile new file mode 100755 -index 000000000..20b3b57f4 +index 000000000..df09b95a7 --- /dev/null +++ b/arch/arm/boot/dts/overlay/Makefile -@@ -0,0 +1,21 @@ +@@ -0,0 +1,22 @@ +# SPDX-License-Identifier: GPL-2.0 +dtbo-$(CONFIG_ARCH_ROCKCHIP) += \ + rk322x-emmc.dtbo \ @@ -11,6 +11,7 @@ index 000000000..20b3b57f4 + rk322x-emmc-nand.dtbo \ + rk322x-led-conf1.dtbo \ + rk322x-led-conf2.dtbo \ ++ rk322x-led-conf3.dtbo \ + rk322x-cpu-hs.dtbo \ + rk322x-wlan-alt-wiring.dtbo + @@ -27,10 +28,10 @@ index 000000000..20b3b57f4 + diff --git a/arch/arm/boot/dts/overlay/README.rk322x-overlays b/arch/arm/boot/dts/overlay/README.rk322x-overlays new file mode 100755 -index 000000000..96d3fc8bb +index 000000000..01a768161 --- /dev/null +++ b/arch/arm/boot/dts/overlay/README.rk322x-overlays -@@ -0,0 +1,57 @@ +@@ -0,0 +1,60 @@ +This document describes overlays provided in the kernel packages +For generic Armbian overlays documentation please see +https://docs.armbian.com/User-Guide_Allwinner_overlays/ @@ -83,6 +84,9 @@ index 000000000..96d3fc8bb +(ie: gpio and active low/high) of the onboard leds. Each board manufacturer +usually choose a different GPIO for the auxiliary led, but the main "working" +led is always wired to the same gpio (although it may be active high or low) ++led-conf1 is suited for boards usually from chiptrip brand (xt-mx4vr, xt-mx1vr, ...) ++led-conf2 is found on boards withs r329q marking ++led-conf3 is found on boards with r28-mxq marking + +### rk322x-alt-wiring + @@ -316,6 +320,69 @@ index 000000000..153f71565 + }; + +}; +diff --git a/arch/arm/boot/dts/overlay/rk322x-led-conf3.dts b/arch/arm/boot/dts/overlay/rk322x-led-conf3.dts +new file mode 100755 +index 000000000..39f4547ed +--- /dev/null ++++ b/arch/arm/boot/dts/overlay/rk322x-led-conf3.dts +@@ -0,0 +1,57 @@ ++/dts-v1/; ++/plugin/; ++ ++#include ++#include ++#include ++ ++/ { ++ ++ fragment@0 { ++ target-path = "/gpio-leds"; ++ __overlay__ { ++ ++ working { ++ gpios = <&gpio3 RK_PC5 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "none"; ++ }; ++ ++ auxiliary { ++ gpios = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; ++ label = "auxiliary"; ++ linux,default-trigger = "mmc2"; ++ default-state = "off"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&gpio_led_aux>; ++ }; ++ ++ }; ++ }; ++ ++ fragment@1 { ++ target-path = "/pinctrl/gpio"; ++ __overlay__ { ++ ++ gpio_led_aux: gpio-led-aux { ++ rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ ++ }; ++ }; ++ ++ fragment@2 { ++ target = <&gpio_keys>; ++ __overlay__ { ++ ++ reset { ++ gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>; ++ label = "reset"; ++ linux,code = ; ++ debounce-interval = <200>; ++ wakeup-source; ++ }; ++ ++ }; ++ }; ++ ++}; diff --git a/arch/arm/boot/dts/overlay/rk322x-nand.dts b/arch/arm/boot/dts/overlay/rk322x-nand.dts new file mode 100755 index 000000000..2a939ab49 @@ -346,7 +413,7 @@ index 000000000..2a939ab49 +}; diff --git a/arch/arm/boot/dts/overlay/rk322x-wlan-alt-wiring.dts b/arch/arm/boot/dts/overlay/rk322x-wlan-alt-wiring.dts new file mode 100755 -index 000000000..b63611295 +index 000000000..f04c9ac16 --- /dev/null +++ b/arch/arm/boot/dts/overlay/rk322x-wlan-alt-wiring.dts @@ -0,0 +1,67 @@ diff --git a/patch/kernel/rk322x-legacy/general-add-overlays.patch b/patch/kernel/rk322x-legacy/general-add-overlays.patch index 6fcae09b35..af87ea44bc 100644 --- a/patch/kernel/rk322x-legacy/general-add-overlays.patch +++ b/patch/kernel/rk322x-legacy/general-add-overlays.patch @@ -1,9 +1,9 @@ diff --git a/arch/arm/boot/dts/overlay/Makefile b/arch/arm/boot/dts/overlay/Makefile new file mode 100755 -index 00000000..3bee64ab +index 00000000..7746f6f5 --- /dev/null +++ b/arch/arm/boot/dts/overlay/Makefile -@@ -0,0 +1,25 @@ +@@ -0,0 +1,26 @@ +# SPDX-License-Identifier: GPL-2.0 +dtbo-$(CONFIG_ARCH_ROCKCHIP) += \ + rk322x-emmc.dtbo \ @@ -11,6 +11,7 @@ index 00000000..3bee64ab + rk322x-emmc-nand.dtbo \ + rk322x-led-conf1.dtbo \ + rk322x-led-conf2.dtbo \ ++ rk322x-led-conf3.dtbo \ + rk322x-cpu-hs.dtbo \ + rk322x-bluetooth.dtbo \ + rk322x-wlan-ssv6051.dtbo \ @@ -31,10 +32,10 @@ index 00000000..3bee64ab + diff --git a/arch/arm/boot/dts/overlay/README.rk322x-overlays b/arch/arm/boot/dts/overlay/README.rk322x-overlays new file mode 100755 -index 00000000..6a7af7c4 +index 00000000..1609a892 --- /dev/null +++ b/arch/arm/boot/dts/overlay/README.rk322x-overlays -@@ -0,0 +1,78 @@ +@@ -0,0 +1,79 @@ +This document describes overlays provided in the kernel packages +For generic Armbian overlays documentation please see +https://docs.armbian.com/User-Guide_Allwinner_overlays/ @@ -89,6 +90,7 @@ index 00000000..6a7af7c4 +led is always wired to the same gpio (although it may be active high or low) +led-conf1 is commonly found in boards made by Chiptrip manufacturer +led-conf2 is found in other boards with R329Q marking ++led-conf3 is found in boards with R28-MXQ marking + +### rk322x-bluetooth + @@ -505,6 +507,69 @@ index 00000000..153f7156 + }; + +}; +diff --git a/arch/arm/boot/dts/overlay/rk322x-led-conf3.dts b/arch/arm/boot/dts/overlay/rk322x-led-conf3.dts +new file mode 100755 +index 00000000..39f4547e +--- /dev/null ++++ b/arch/arm/boot/dts/overlay/rk322x-led-conf3.dts +@@ -0,0 +1,57 @@ ++/dts-v1/; ++/plugin/; ++ ++#include ++#include ++#include ++ ++/ { ++ ++ fragment@0 { ++ target-path = "/gpio-leds"; ++ __overlay__ { ++ ++ working { ++ gpios = <&gpio3 RK_PC5 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "none"; ++ }; ++ ++ auxiliary { ++ gpios = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; ++ label = "auxiliary"; ++ linux,default-trigger = "mmc2"; ++ default-state = "off"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&gpio_led_aux>; ++ }; ++ ++ }; ++ }; ++ ++ fragment@1 { ++ target-path = "/pinctrl/gpio"; ++ __overlay__ { ++ ++ gpio_led_aux: gpio-led-aux { ++ rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ ++ }; ++ }; ++ ++ fragment@2 { ++ target = <&gpio_keys>; ++ __overlay__ { ++ ++ reset { ++ gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>; ++ label = "reset"; ++ linux,code = ; ++ debounce-interval = <200>; ++ wakeup-source; ++ }; ++ ++ }; ++ }; ++ ++}; diff --git a/arch/arm/boot/dts/overlay/rk322x-nand.dts b/arch/arm/boot/dts/overlay/rk322x-nand.dts new file mode 100755 index 00000000..5675f5b3 @@ -535,7 +600,7 @@ index 00000000..5675f5b3 +}; diff --git a/arch/arm/boot/dts/overlay/rk322x-wlan-alt-wiring.dts b/arch/arm/boot/dts/overlay/rk322x-wlan-alt-wiring.dts new file mode 100644 -index 00000000..dadc3a9d +index 00000000..f6a1a720 --- /dev/null +++ b/arch/arm/boot/dts/overlay/rk322x-wlan-alt-wiring.dts @@ -0,0 +1,66 @@