From e4bb1fed8f0679e40401003bcbcbf4fc1b33ba1a Mon Sep 17 00:00:00 2001 From: hzyitc Date: Tue, 13 Dec 2022 21:42:31 +0800 Subject: [PATCH] meson: edge: bump to v6.1 (#4562) * meson: edge: Bump v6.1 * meson: edge: refresh patches * meson: edge: refresh config --- config/kernel/linux-meson-edge.config | 288 ++++++++++-------- .../sources/families/include/meson_common.inc | 2 +- .../0001-m8-m8b-m8m2-Support-HDMI.patch | 50 +-- ...m2-drm-forcefully-enable-XRGB-format.patch | 4 +- ...-clock-speed-before-sending-HS-CMD13.patch | 2 +- .../board_odroidc1/dts-Enable-HDMI.patch | 0 .../board_onecloud/0001-add-dts.patch | 6 +- .../0002-dts-Support-HDMI.patch | 2 +- .../usb-disable-ACA-check.patch | 2 +- .../generate-uImage-instand-of-zImage.patch | 0 patch/kernel/meson-edge | 2 +- 11 files changed, 197 insertions(+), 161 deletions(-) rename patch/kernel/archive/{meson-6.0 => meson-6.1}/0001-m8-m8b-m8m2-Support-HDMI.patch (99%) rename patch/kernel/archive/{meson-6.0 => meson-6.1}/0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch (83%) rename patch/kernel/archive/{meson-6.0 => meson-6.1}/Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch (98%) rename patch/kernel/archive/{meson-6.0 => meson-6.1}/board_odroidc1/dts-Enable-HDMI.patch (100%) rename patch/kernel/archive/{meson-6.0 => meson-6.1}/board_onecloud/0001-add-dts.patch (98%) rename patch/kernel/archive/{meson-6.0 => meson-6.1}/board_onecloud/0002-dts-Support-HDMI.patch (97%) rename patch/kernel/archive/{meson-6.0 => meson-6.1}/board_onecloud/usb-disable-ACA-check.patch (95%) rename patch/kernel/archive/{meson-6.0 => meson-6.1}/generate-uImage-instand-of-zImage.patch (100%) diff --git a/config/kernel/linux-meson-edge.config b/config/kernel/linux-meson-edge.config index eb186acea..148ef5381 100644 --- a/config/kernel/linux-meson-edge.config +++ b/config/kernel/linux-meson-edge.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.0.3 Kernel Configuration +# Linux/arm 6.1.0 Kernel Configuration # 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 @@ -164,7 +164,6 @@ CONFIG_CGROUPS=y CONFIG_PAGE_COUNTER=y CONFIG_CGROUP_FAVOR_DYNMODS=y CONFIG_MEMCG=y -CONFIG_MEMCG_SWAP=y CONFIG_MEMCG_KMEM=y CONFIG_BLK_CGROUP=y CONFIG_CGROUP_WRITEBACK=y @@ -258,7 +257,6 @@ CONFIG_TRACEPOINTS=y CONFIG_ARM=y CONFIG_ARM_HAS_GROUP_RELOCS=y -CONFIG_ARM_HAS_SG_CHAIN=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_HAVE_PROC_CPU=y CONFIG_STACKTRACE_SUPPORT=y @@ -278,12 +276,9 @@ CONFIG_MMU=y CONFIG_ARCH_MMAP_RND_BITS_MIN=8 CONFIG_ARCH_MMAP_RND_BITS_MAX=16 CONFIG_ARCH_MULTIPLATFORM=y -# CONFIG_ARCH_FOOTBRIDGE is not set -# CONFIG_ARCH_RPC is not set -# CONFIG_ARCH_SA1100 is not set # -# Multiple platform selection +# Platform selection # # @@ -292,7 +287,7 @@ CONFIG_ARCH_MULTIPLATFORM=y # CONFIG_ARCH_MULTI_V6 is not set CONFIG_ARCH_MULTI_V7=y CONFIG_ARCH_MULTI_V6_V7=y -# end of Multiple platform selection +# end of Platform selection # CONFIG_ARCH_VIRT is not set # CONFIG_ARCH_AIROHA is not set @@ -472,7 +467,7 @@ CONFIG_HIGHPTE=y CONFIG_CPU_SW_DOMAIN_PAN=y CONFIG_HW_PERF_EVENTS=y CONFIG_ARM_MODULE_PLTS=y -CONFIG_FORCE_MAX_ZONEORDER=12 +CONFIG_ARCH_FORCE_MAX_ORDER=11 CONFIG_ALIGNMENT_TRAP=y # CONFIG_UACCESS_WITH_MEMCPY is not set # CONFIG_PARAVIRT is not set @@ -596,25 +591,6 @@ CONFIG_ARM_CPU_SUSPEND=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y # end of Power management options -CONFIG_ARM_CRYPTO=y -CONFIG_CRYPTO_SHA1_ARM=m -CONFIG_CRYPTO_SHA1_ARM_NEON=m -CONFIG_CRYPTO_SHA1_ARM_CE=m -CONFIG_CRYPTO_SHA2_ARM_CE=m -CONFIG_CRYPTO_SHA256_ARM=m -CONFIG_CRYPTO_SHA512_ARM=m -CONFIG_CRYPTO_BLAKE2S_ARM=y -CONFIG_CRYPTO_BLAKE2B_NEON=m -CONFIG_CRYPTO_AES_ARM=m -CONFIG_CRYPTO_AES_ARM_BS=m -CONFIG_CRYPTO_AES_ARM_CE=m -CONFIG_CRYPTO_GHASH_ARM_CE=m -# CONFIG_CRYPTO_CRCT10DIF_ARM_CE is not set -CONFIG_CRYPTO_CRC32_ARM_CE=m -CONFIG_CRYPTO_CHACHA20_NEON=m -CONFIG_CRYPTO_POLY1305_ARM=m -CONFIG_CRYPTO_NHPOLY1305_NEON=m -CONFIG_CRYPTO_CURVE25519_NEON=m CONFIG_AS_VFP_VMRS_FPINST=y # @@ -850,6 +826,7 @@ CONFIG_ARCH_KEEP_MEMBLOCK=y CONFIG_MEMORY_ISOLATION=y CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_COMPACTION=y +CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1 # CONFIG_PAGE_REPORTING is not set CONFIG_MIGRATION=y CONFIG_CONTIG_ALLOC=y @@ -872,6 +849,7 @@ CONFIG_KMAP_LOCAL=y CONFIG_KMAP_LOCAL_NON_LINEAR_PTE_ARRAY=y # CONFIG_ANON_VMA_NAME is not set # CONFIG_USERFAULTFD is not set +# CONFIG_LRU_GEN is not set # # Data Access Monitoring @@ -946,6 +924,7 @@ CONFIG_INET_ESP=m CONFIG_INET_ESP_OFFLOAD=m CONFIG_INET_ESPINTCP=y CONFIG_INET_IPCOMP=m +CONFIG_INET_TABLE_PERTURB_ORDER=16 CONFIG_INET_XFRM_TUNNEL=m CONFIG_INET_TUNNEL=m CONFIG_INET_DIAG=m @@ -1336,13 +1315,6 @@ CONFIG_IP6_NF_TARGET_NPT=m # end of IPv6: Netfilter Configuration CONFIG_NF_DEFRAG_IPV6=m - -# -# DECnet: Netfilter Configuration -# -CONFIG_DECNET_NF_GRABULATOR=m -# end of DECnet: Netfilter Configuration - CONFIG_NF_TABLES_BRIDGE=m CONFIG_NFT_BRIDGE_META=m CONFIG_NFT_BRIDGE_REJECT=m @@ -1427,8 +1399,6 @@ CONFIG_BRIDGE_CFM=y CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_GVRP=y CONFIG_VLAN_8021Q_MVRP=y -CONFIG_DECNET=m -CONFIG_DECNET_ROUTER=y CONFIG_LLC=m CONFIG_LLC2=m CONFIG_ATALK=m @@ -2043,6 +2013,7 @@ CONFIG_EEPROM_93CX6=m CONFIG_MISC_RTSX_USB=m # CONFIG_HABANA_AI is not set # CONFIG_PVPANIC is not set +# CONFIG_GP_PCI1XXXX is not set # end of Misc devices # @@ -2153,6 +2124,7 @@ CONFIG_SATA_PMP=y CONFIG_SATA_AHCI=y CONFIG_SATA_MOBILE_LPM_POLICY=0 CONFIG_SATA_AHCI_PLATFORM=y +# CONFIG_AHCI_DWC is not set # CONFIG_AHCI_CEVA is not set # CONFIG_AHCI_QORIQ is not set # CONFIG_SATA_INIC162X is not set @@ -2227,7 +2199,7 @@ CONFIG_SATA_MV=y # CONFIG_PATA_MPIIX is not set # CONFIG_PATA_NS87410 is not set # CONFIG_PATA_OPTI is not set -# CONFIG_PATA_PLATFORM is not set +# CONFIG_PATA_OF_PLATFORM is not set # CONFIG_PATA_RZ1000 is not set # @@ -2373,6 +2345,7 @@ CONFIG_ETHERNET=y # CONFIG_NET_VENDOR_INTEL is not set # CONFIG_NET_VENDOR_WANGXUN is not set # CONFIG_JME is not set +# CONFIG_NET_VENDOR_ADI is not set # CONFIG_NET_VENDOR_LITEX is not set # CONFIG_NET_VENDOR_MARVELL is not set # CONFIG_NET_VENDOR_MELLANOX is not set @@ -2483,6 +2456,7 @@ CONFIG_SMSC_PHY=m # CONFIG_VITESSE_PHY is not set # CONFIG_XILINX_GMII2RGMII is not set # CONFIG_MICREL_KS8995MA is not set +# CONFIG_PSE_CONTROLLER is not set CONFIG_MDIO_DEVICE=y CONFIG_MDIO_BUS=y CONFIG_FWNODE_MDIO=y @@ -2756,6 +2730,7 @@ CONFIG_KEYBOARD_GPIO_POLLED=y # CONFIG_KEYBOARD_MPR121 is not set # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_OPENCORES is not set +# CONFIG_KEYBOARD_PINEPHONE is not set # CONFIG_KEYBOARD_SAMSUNG is not set # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_SUNKBD is not set @@ -2951,6 +2926,7 @@ CONFIG_I2C_MESON=y # # CONFIG_I2C_DIOLAN_U2C is not set # CONFIG_I2C_CP2615 is not set +# CONFIG_I2C_PCI1XXXX is not set # CONFIG_I2C_ROBOTFUZZ_OSIF is not set # CONFIG_I2C_TAOS_EVM is not set # CONFIG_I2C_TINY_USB is not set @@ -2992,6 +2968,7 @@ CONFIG_SPI_GPIO=m CONFIG_SPI_MESON_SPICC=y CONFIG_SPI_MESON_SPIFC=y # CONFIG_SPI_MICROCHIP_CORE is not set +# CONFIG_SPI_MICROCHIP_CORE_QSPI is not set # CONFIG_SPI_OC_TINY is not set # CONFIG_SPI_PXA2XX is not set # CONFIG_SPI_ROCKCHIP is not set @@ -3050,6 +3027,7 @@ CONFIG_GENERIC_PINMUX_FUNCTIONS=y CONFIG_PINCONF=y CONFIG_GENERIC_PINCONF=y # CONFIG_DEBUG_PINCTRL is not set +# CONFIG_PINCTRL_CY8C95X0 is not set # CONFIG_PINCTRL_MCP23S08 is not set # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set # CONFIG_PINCTRL_OCELOT is not set @@ -3100,7 +3078,6 @@ CONFIG_GPIO_SYSCON=y # # I2C GPIO expanders # -# CONFIG_GPIO_ADP5588 is not set # CONFIG_GPIO_ADNP is not set # CONFIG_GPIO_GW_PLD is not set # CONFIG_GPIO_MAX7300 is not set @@ -3239,7 +3216,6 @@ CONFIG_HWMON=y # CONFIG_SENSORS_ASC7621 is not set # CONFIG_SENSORS_AXI_FAN_CONTROL is not set CONFIG_SENSORS_ARM_SCMI=m -# 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 @@ -3281,6 +3257,7 @@ CONFIG_SENSORS_IIO_HWMON=y # CONFIG_SENSORS_MAX197 is not set # CONFIG_SENSORS_MAX31722 is not set # CONFIG_SENSORS_MAX31730 is not set +# CONFIG_SENSORS_MAX31760 is not set # CONFIG_SENSORS_MAX6620 is not set # CONFIG_SENSORS_MAX6621 is not set # CONFIG_SENSORS_MAX6639 is not set @@ -3332,10 +3309,10 @@ CONFIG_SENSORS_PWM_FAN=m # CONFIG_SENSORS_SHT4x is not set # CONFIG_SENSORS_SHTC1 is not set # CONFIG_SENSORS_SIS5595 is not set -# CONFIG_SENSORS_SY7636A is not set # CONFIG_SENSORS_DME1737 is not set # CONFIG_SENSORS_EMC1403 is not set # CONFIG_SENSORS_EMC2103 is not set +# CONFIG_SENSORS_EMC2305 is not set # CONFIG_SENSORS_EMC6W201 is not set # CONFIG_SENSORS_SMSC47M1 is not set # CONFIG_SENSORS_SMSC47M192 is not set @@ -3493,8 +3470,10 @@ CONFIG_MFD_CORE=m # CONFIG_MFD_MAX8997 is not set # CONFIG_MFD_MAX8998 is not set # CONFIG_MFD_MT6360 is not set +# CONFIG_MFD_MT6370 is not set # CONFIG_MFD_MT6397 is not set # CONFIG_MFD_MENF21BMC is not set +# CONFIG_MFD_OCELOT is not set # CONFIG_EZX_PCAP is not set # CONFIG_MFD_CPCAP is not set # CONFIG_MFD_VIPERBOARD is not set @@ -3502,15 +3481,16 @@ CONFIG_MFD_CORE=m # CONFIG_MFD_RETU is not set # CONFIG_MFD_PCF50633 is not set # CONFIG_MFD_PM8XXX is not set +# CONFIG_MFD_SY7636A is not set # CONFIG_MFD_RDC321X is not set # CONFIG_MFD_RT4831 is not set # CONFIG_MFD_RT5033 is not set +# CONFIG_MFD_RT5120 is not set # CONFIG_MFD_RC5T583 is not set # CONFIG_MFD_RK808 is not set # CONFIG_MFD_RN5T618 is not set # CONFIG_MFD_SEC_CORE is not set # CONFIG_MFD_SI476X_CORE is not set -# CONFIG_MFD_SIMPLE_MFD_I2C is not set # CONFIG_MFD_SM501 is not set # CONFIG_MFD_SKY81452 is not set # CONFIG_MFD_STMPE is not set @@ -3620,7 +3600,6 @@ CONFIG_REGULATOR_PWM=y # CONFIG_REGULATOR_RTMV20 is not set # CONFIG_REGULATOR_RTQ6752 is not set # CONFIG_REGULATOR_SLG51000 is not set -# CONFIG_REGULATOR_SY7636A is not set # CONFIG_REGULATOR_SY8106A is not set # CONFIG_REGULATOR_SY8824X is not set # CONFIG_REGULATOR_SY8827N is not set @@ -3718,8 +3697,6 @@ CONFIG_VIDEO_TUNER=m CONFIG_V4L2_MEM2MEM_DEV=m CONFIG_V4L2_FWNODE=m CONFIG_V4L2_ASYNC=m -CONFIG_VIDEOBUF_GEN=m -CONFIG_VIDEOBUF_VMALLOC=m # end of Video4Linux options # @@ -3752,7 +3729,6 @@ CONFIG_MEDIA_USB_SUPPORT=y # # Webcam devices # -CONFIG_VIDEO_CPIA2=m CONFIG_USB_GSPCA=m CONFIG_USB_GSPCA_BENQ=m CONFIG_USB_GSPCA_CONEX=m @@ -3810,7 +3786,6 @@ CONFIG_USB_S2255=m CONFIG_VIDEO_USBTV=m CONFIG_USB_VIDEO_CLASS=m CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y -CONFIG_USB_ZR364XX=m # # Analog TV USB devices @@ -3837,9 +3812,6 @@ CONFIG_VIDEO_CX231XX=m CONFIG_VIDEO_CX231XX_RC=y CONFIG_VIDEO_CX231XX_ALSA=m CONFIG_VIDEO_CX231XX_DVB=m -CONFIG_VIDEO_TM6000=m -CONFIG_VIDEO_TM6000_ALSA=m -CONFIG_VIDEO_TM6000_DVB=m # # Digital TV USB devices @@ -4020,6 +3992,10 @@ CONFIG_VIDEO_MESON_GE2D=m # Texas Instruments drivers # +# +# Verisilicon media platform drivers +# + # # VIA media platform drivers # @@ -4494,7 +4470,6 @@ CONFIG_APERTURE_HELPERS=y # CONFIG_IMX_IPUV3_CORE is not set CONFIG_DRM=y # CONFIG_DRM_DEBUG_MM is not set -# CONFIG_DRM_DEBUG_SELFTEST is not set CONFIG_DRM_KMS_HELPER=y # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set # CONFIG_DRM_DEBUG_MODESET_LOCK is not set @@ -4506,7 +4481,7 @@ CONFIG_DRM_DISPLAY_HELPER=y CONFIG_DRM_DISPLAY_HDMI_HELPER=y # CONFIG_DRM_DP_AUX_CHARDEV is not set # CONFIG_DRM_DP_CEC is not set -CONFIG_DRM_GEM_CMA_HELPER=y +CONFIG_DRM_GEM_DMA_HELPER=y CONFIG_DRM_GEM_SHMEM_HELPER=y CONFIG_DRM_SCHED=y @@ -4539,7 +4514,7 @@ CONFIG_DRM_MALI_DISPLAY=y # CONFIG_DRM_ARMADA is not set # CONFIG_DRM_RCAR_DW_HDMI is not set # CONFIG_DRM_RCAR_USE_LVDS is not set -# CONFIG_DRM_RCAR_MIPI_DSI is not set +# CONFIG_DRM_RCAR_USE_MIPI_DSI is not set # CONFIG_DRM_OMAP is not set # CONFIG_DRM_TILCDC is not set # CONFIG_DRM_QXL is not set @@ -4920,6 +4895,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=m # CONFIG_SND_SOC_CS42L52 is not set # CONFIG_SND_SOC_CS42L56 is not set # CONFIG_SND_SOC_CS42L73 is not set +# CONFIG_SND_SOC_CS42L83 is not set # CONFIG_SND_SOC_CS4234 is not set # CONFIG_SND_SOC_CS4265 is not set # CONFIG_SND_SOC_CS4270 is not set @@ -4937,6 +4913,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_ES7134 is not set # CONFIG_SND_SOC_ES7241 is not set # CONFIG_SND_SOC_ES8316 is not set +# CONFIG_SND_SOC_ES8326 is not set # CONFIG_SND_SOC_ES8328_I2C is not set # CONFIG_SND_SOC_ES8328_SPI is not set # CONFIG_SND_SOC_GTM601 is not set @@ -4977,6 +4954,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set # CONFIG_SND_SOC_SIMPLE_MUX is not set # CONFIG_SND_SOC_SPDIF is not set +# CONFIG_SND_SOC_SRC4XXX_I2C is not set # CONFIG_SND_SOC_SSM2305 is not set # CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_SPI is not set @@ -5109,6 +5087,7 @@ CONFIG_HID_GENERIC=y # CONFIG_HID_UCLOGIC is not set # CONFIG_HID_WALTOP is not set # CONFIG_HID_VIEWSONIC is not set +# CONFIG_HID_VRC2 is not set # CONFIG_HID_XIAOMI is not set # CONFIG_HID_GYRATION is not set # CONFIG_HID_ICADE is not set @@ -5138,6 +5117,7 @@ CONFIG_HID_GENERIC=y # CONFIG_HID_PETALYNX is not set # CONFIG_HID_PICOLCD is not set # CONFIG_HID_PLANTRONICS is not set +# CONFIG_HID_PXRC is not set # CONFIG_HID_RAZER is not set # CONFIG_HID_PRIMAX is not set # CONFIG_HID_RETRODE is not set @@ -5835,6 +5815,7 @@ CONFIG_COMMON_CLK=y # CONFIG_COMMON_CLK_PWM is not set # CONFIG_COMMON_CLK_RS9_PCIE is not set # CONFIG_COMMON_CLK_VC5 is not set +# CONFIG_COMMON_CLK_VC7 is not set # CONFIG_COMMON_CLK_FIXED_MMIO is not set # @@ -5847,6 +5828,7 @@ CONFIG_COMMON_CLK_MESON8B=y # end of Clock support for Amlogic platforms # CONFIG_XILINX_VCU is not set +# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set CONFIG_HWSPINLOCK=y # @@ -5987,7 +5969,6 @@ CONFIG_EXTCON=y # CONFIG_EXTCON_RT8973A is not set # CONFIG_EXTCON_SM5502 is not set CONFIG_EXTCON_USB_GPIO=y -# CONFIG_EXTCON_USBC_TUSB320 is not set CONFIG_MEMORY=y CONFIG_IIO=y CONFIG_IIO_BUFFER=y @@ -6041,6 +6022,7 @@ CONFIG_IIO_TRIGGERED_EVENT=m # CONFIG_MMA8452 is not set # CONFIG_MMA9551 is not set # CONFIG_MMA9553 is not set +# CONFIG_MSA311 is not set # CONFIG_MXC4005 is not set # CONFIG_MXC6255 is not set # CONFIG_SCA3000 is not set @@ -6085,6 +6067,7 @@ CONFIG_IIO_TRIGGERED_EVENT=m # CONFIG_MAX1027 is not set # CONFIG_MAX11100 is not set # CONFIG_MAX1118 is not set +# CONFIG_MAX11205 is not set # CONFIG_MAX1241 is not set # CONFIG_MAX1363 is not set # CONFIG_MAX9611 is not set @@ -6093,6 +6076,7 @@ CONFIG_IIO_TRIGGERED_EVENT=m # CONFIG_MCP3911 is not set CONFIG_MESON_SARADC=m # CONFIG_NAU7802 is not set +# CONFIG_RICHTEK_RTQ6056 is not set # CONFIG_SD_ADC_MODULATOR is not set # CONFIG_TI_ADC081C is not set # CONFIG_TI_ADC0832 is not set @@ -6137,6 +6121,7 @@ CONFIG_MESON_SARADC=m # Capacitance to digital converters # # CONFIG_AD7150 is not set +# CONFIG_AD7746 is not set # end of Capacitance to digital converters # @@ -6302,6 +6287,8 @@ CONFIG_MPU3050_I2C=y # CONFIG_ADIS16480 is not set # CONFIG_BMI160_I2C is not set # CONFIG_BMI160_SPI is not set +# CONFIG_BOSCH_BNO055_SERIAL is not set +# CONFIG_BOSCH_BNO055_I2C is not set # CONFIG_FXOS8700_I2C is not set # CONFIG_FXOS8700_SPI is not set # CONFIG_KMX61 is not set @@ -6338,6 +6325,7 @@ CONFIG_MPU3050_I2C=y # CONFIG_JSA1212 is not set # CONFIG_RPR0521 is not set # CONFIG_LTR501 is not set +# CONFIG_LTRF216A is not set # CONFIG_LV0104CS is not set # CONFIG_MAX44000 is not set # CONFIG_MAX44009 is not set @@ -6590,7 +6578,7 @@ CONFIG_RAS=y CONFIG_DAX=m CONFIG_NVMEM=y CONFIG_NVMEM_SYSFS=y -CONFIG_MESON_MX_EFUSE=y +CONFIG_NVMEM_MESON_MX_EFUSE=y CONFIG_NVMEM_RMEM=m # @@ -6867,7 +6855,6 @@ CONFIG_EROFS_FS_POSIX_ACL=y CONFIG_EROFS_FS_SECURITY=y CONFIG_EROFS_FS_ZIP=y CONFIG_EROFS_FS_ZIP_LZMA=y -# CONFIG_AUFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=y CONFIG_NFS_V2=y @@ -7074,6 +7061,7 @@ CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_SIMD=m +# end of Crypto core or helper # # Public-key cryptography @@ -7087,77 +7075,15 @@ CONFIG_CRYPTO_ECDSA=m CONFIG_CRYPTO_ECRDSA=m CONFIG_CRYPTO_SM2=m CONFIG_CRYPTO_CURVE25519=m +# end of Public-key cryptography # -# Authenticated Encryption with Associated Data -# -CONFIG_CRYPTO_CCM=m -CONFIG_CRYPTO_GCM=m -CONFIG_CRYPTO_CHACHA20POLY1305=m -CONFIG_CRYPTO_AEGIS128=m -CONFIG_CRYPTO_AEGIS128_SIMD=y -CONFIG_CRYPTO_SEQIV=m -CONFIG_CRYPTO_ECHAINIV=m - -# -# Block modes -# -CONFIG_CRYPTO_CBC=m -CONFIG_CRYPTO_CFB=m -CONFIG_CRYPTO_CTR=m -CONFIG_CRYPTO_CTS=m -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_LRW=m -CONFIG_CRYPTO_OFB=m -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_XCTR=m -CONFIG_CRYPTO_XTS=m -CONFIG_CRYPTO_KEYWRAP=m -CONFIG_CRYPTO_NHPOLY1305=m -CONFIG_CRYPTO_ADIANTUM=m -CONFIG_CRYPTO_HCTR2=m -CONFIG_CRYPTO_ESSIV=m - -# -# Hash modes -# -CONFIG_CRYPTO_CMAC=m -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_XCBC=m -CONFIG_CRYPTO_VMAC=m - -# -# Digest -# -CONFIG_CRYPTO_CRC32C=y -CONFIG_CRYPTO_CRC32=y -CONFIG_CRYPTO_XXHASH=y -CONFIG_CRYPTO_BLAKE2B=y -CONFIG_CRYPTO_CRCT10DIF=y -CONFIG_CRYPTO_CRC64_ROCKSOFT=y -CONFIG_CRYPTO_GHASH=m -CONFIG_CRYPTO_POLYVAL=m -CONFIG_CRYPTO_POLY1305=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_RMD160=m -CONFIG_CRYPTO_SHA1=y -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_SHA3=m -CONFIG_CRYPTO_SM3=m -# CONFIG_CRYPTO_SM3_GENERIC is not set -CONFIG_CRYPTO_STREEBOG=m -CONFIG_CRYPTO_WP512=m - -# -# Ciphers +# Block ciphers # CONFIG_CRYPTO_AES=m CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_ARIA=m CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_BLOWFISH_COMMON=m CONFIG_CRYPTO_CAMELLIA=m @@ -7167,14 +7093,83 @@ CONFIG_CRYPTO_CAST6=m CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_CHACHA20=m CONFIG_CRYPTO_SEED=m -CONFIG_CRYPTO_ARIA=m CONFIG_CRYPTO_SERPENT=m -# CONFIG_CRYPTO_SM4_GENERIC is not set +CONFIG_CRYPTO_SM4=m +CONFIG_CRYPTO_SM4_GENERIC=m CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_TWOFISH_COMMON=m +# end of Block ciphers + +# +# Length-preserving ciphers and modes +# +CONFIG_CRYPTO_ADIANTUM=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_CHACHA20=m +CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_CFB=m +CONFIG_CRYPTO_CTR=m +CONFIG_CRYPTO_CTS=m +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_HCTR2=m +CONFIG_CRYPTO_KEYWRAP=m +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_OFB=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XCTR=m +CONFIG_CRYPTO_XTS=m +CONFIG_CRYPTO_NHPOLY1305=m +# end of Length-preserving ciphers and modes + +# +# AEAD (authenticated encryption with associated data) ciphers +# +CONFIG_CRYPTO_AEGIS128=m +CONFIG_CRYPTO_AEGIS128_SIMD=y +CONFIG_CRYPTO_CHACHA20POLY1305=m +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_SEQIV=m +CONFIG_CRYPTO_ECHAINIV=m +CONFIG_CRYPTO_ESSIV=m +# end of AEAD (authenticated encryption with associated data) ciphers + +# +# Hashes, digests, and MACs +# +CONFIG_CRYPTO_BLAKE2B=y +CONFIG_CRYPTO_CMAC=m +CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_POLYVAL=m +CONFIG_CRYPTO_POLY1305=m +CONFIG_CRYPTO_RMD160=m +CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_SHA3=m +CONFIG_CRYPTO_SM3=m +CONFIG_CRYPTO_SM3_GENERIC=m +CONFIG_CRYPTO_STREEBOG=m +CONFIG_CRYPTO_VMAC=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_XXHASH=y +# end of Hashes, digests, and MACs + +# +# CRCs (cyclic redundancy checks) +# +CONFIG_CRYPTO_CRC32C=y +CONFIG_CRYPTO_CRC32=y +CONFIG_CRYPTO_CRCT10DIF=y +CONFIG_CRYPTO_CRC64_ROCKSOFT=y +# end of CRCs (cyclic redundancy checks) # # Compression @@ -7185,9 +7180,10 @@ CONFIG_CRYPTO_842=m CONFIG_CRYPTO_LZ4=m CONFIG_CRYPTO_LZ4HC=m CONFIG_CRYPTO_ZSTD=y +# end of Compression # -# Random Number Generation +# Random number generation # CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_DRBG_MENU=m @@ -7196,6 +7192,11 @@ CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG=m CONFIG_CRYPTO_JITTERENTROPY=m +# end of Random number generation + +# +# Userspace interface +# CONFIG_CRYPTO_USER_API=m CONFIG_CRYPTO_USER_API_HASH=m CONFIG_CRYPTO_USER_API_SKCIPHER=m @@ -7204,7 +7205,33 @@ CONFIG_CRYPTO_USER_API_RNG=m CONFIG_CRYPTO_USER_API_AEAD=m CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y CONFIG_CRYPTO_STATS=y +# end of Userspace interface + CONFIG_CRYPTO_HASH_INFO=y + +# +# Accelerated Cryptographic Algorithms for CPU (arm) +# +CONFIG_CRYPTO_CURVE25519_NEON=m +CONFIG_CRYPTO_GHASH_ARM_CE=m +CONFIG_CRYPTO_NHPOLY1305_NEON=m +CONFIG_CRYPTO_POLY1305_ARM=m +CONFIG_CRYPTO_BLAKE2S_ARM=y +CONFIG_CRYPTO_BLAKE2B_NEON=m +CONFIG_CRYPTO_SHA1_ARM=m +CONFIG_CRYPTO_SHA1_ARM_NEON=m +CONFIG_CRYPTO_SHA1_ARM_CE=m +CONFIG_CRYPTO_SHA2_ARM_CE=m +CONFIG_CRYPTO_SHA256_ARM=m +CONFIG_CRYPTO_SHA512_ARM=m +CONFIG_CRYPTO_AES_ARM=m +CONFIG_CRYPTO_AES_ARM_BS=m +CONFIG_CRYPTO_AES_ARM_CE=m +CONFIG_CRYPTO_CHACHA20_NEON=m +CONFIG_CRYPTO_CRC32_ARM_CE=m +CONFIG_CRYPTO_CRCT10DIF_ARM_CE=m +# end of Accelerated Cryptographic Algorithms for CPU (arm) + # CONFIG_CRYPTO_HW is not set CONFIG_ASYMMETRIC_KEY_TYPE=y CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y @@ -7255,6 +7282,7 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y # # Crypto library routines # +CONFIG_CRYPTO_LIB_UTILS=y CONFIG_CRYPTO_LIB_AES=m CONFIG_CRYPTO_LIB_ARC4=m CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y @@ -7274,7 +7302,6 @@ CONFIG_CRYPTO_LIB_SHA1=y CONFIG_CRYPTO_LIB_SHA256=y # end of Crypto library routines -CONFIG_LIB_MEMNEQ=y CONFIG_CRC_CCITT=m CONFIG_CRC16=y CONFIG_CRC_T10DIF=y @@ -7303,6 +7330,7 @@ CONFIG_LZO_DECOMPRESS=y CONFIG_LZ4_COMPRESS=y CONFIG_LZ4HC_COMPRESS=y CONFIG_LZ4_DECOMPRESS=y +CONFIG_ZSTD_COMMON=y CONFIG_ZSTD_COMPRESS=y CONFIG_ZSTD_DECOMPRESS=y CONFIG_XZ_DEC=y @@ -7358,6 +7386,7 @@ CONFIG_CMA_ALIGNMENT=8 # CONFIG_DMA_API_DEBUG is not set # CONFIG_DMA_MAP_BENCHMARK is not set CONFIG_SGL_ALLOC=y +# CONFIG_FORCE_NR_CPUS is not set CONFIG_CPU_RMAP=y CONFIG_DQL=y CONFIG_GLOB=y @@ -7539,6 +7568,7 @@ CONFIG_STACKTRACE=y # CONFIG_DEBUG_SG is not set # CONFIG_DEBUG_NOTIFIERS is not set # CONFIG_BUG_ON_DATA_CORRUPTION is not set +# CONFIG_DEBUG_MAPLE_TREE is not set # end of Debug kernel data structures # CONFIG_DEBUG_CREDENTIALS is not set @@ -7656,6 +7686,7 @@ CONFIG_RUNTIME_TESTING_MENU=y # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_UUID is not set # CONFIG_TEST_XARRAY is not set +# CONFIG_TEST_MAPLE_TREE is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_SIPHASH is not set # CONFIG_TEST_IDA is not set @@ -7677,4 +7708,9 @@ CONFIG_RUNTIME_TESTING_MENU=y CONFIG_ARCH_USE_MEMTEST=y # CONFIG_MEMTEST is not set # end of Kernel Testing and Coverage + +# +# Rust hacking +# +# end of Rust hacking # end of Kernel hacking diff --git a/config/sources/families/include/meson_common.inc b/config/sources/families/include/meson_common.inc index 868005665..21ac68402 100644 --- a/config/sources/families/include/meson_common.inc +++ b/config/sources/families/include/meson_common.inc @@ -50,7 +50,7 @@ case $BRANCH in edge) - KERNELBRANCH="branch:linux-6.0.y" + KERNELBRANCH="branch:linux-6.1.y" KERNELPATCHDIR='meson-'$BRANCH ;; diff --git a/patch/kernel/archive/meson-6.0/0001-m8-m8b-m8m2-Support-HDMI.patch b/patch/kernel/archive/meson-6.1/0001-m8-m8b-m8m2-Support-HDMI.patch similarity index 99% rename from patch/kernel/archive/meson-6.0/0001-m8-m8b-m8m2-Support-HDMI.patch rename to patch/kernel/archive/meson-6.1/0001-m8-m8b-m8m2-Support-HDMI.patch index 6d3a5ab88..6276d6dce 100644 --- a/patch/kernel/archive/meson-6.0/0001-m8-m8b-m8m2-Support-HDMI.patch +++ b/patch/kernel/archive/meson-6.1/0001-m8-m8b-m8m2-Support-HDMI.patch @@ -33,7 +33,7 @@ Special thank to Martin Blumenstingl. create mode 100644 drivers/phy/amlogic/phy-meson-cvbs-dac.c diff --git a/Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml b/Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml -index 6655a93b1874..bbc58c8bdfc2 100644 +index 6655a93b187..bbc58c8bdfc 100644 --- a/Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml +++ b/Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml @@ -66,8 +66,12 @@ properties: @@ -77,7 +77,7 @@ index 6655a93b1874..bbc58c8bdfc2 100644 reg = <0>; diff --git a/Documentation/devicetree/bindings/phy/amlogic,meson-cvbs-dac-phy.yaml b/Documentation/devicetree/bindings/phy/amlogic,meson-cvbs-dac-phy.yaml new file mode 100644 -index 000000000000..d73cb12c0d9f +index 00000000000..d73cb12c0d9 --- /dev/null +++ b/Documentation/devicetree/bindings/phy/amlogic,meson-cvbs-dac-phy.yaml @@ -0,0 +1,81 @@ @@ -163,7 +163,7 @@ index 000000000000..d73cb12c0d9f + clocks = <&vdac_clock>; + }; diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi -index 8e3860d5d916..9a56cdf776af 100644 +index 8e3860d5d91..9a56cdf776a 100644 --- a/arch/arm/boot/dts/meson.dtsi +++ b/arch/arm/boot/dts/meson.dtsi @@ -35,6 +35,19 @@ hhi: system-controller@4000 { @@ -187,7 +187,7 @@ index 8e3860d5d916..9a56cdf776af 100644 aiu: audio-controller@5400 { diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi -index 0f8bac8bac8b..646bb8b102b3 100644 +index 0f8bac8bac8..646bb8b102b 100644 --- a/arch/arm/boot/dts/meson8.dtsi +++ b/arch/arm/boot/dts/meson8.dtsi @@ -314,6 +314,113 @@ mali: gpu@c0000 { @@ -423,7 +423,7 @@ index 0f8bac8bac8b..646bb8b102b3 100644 &hwrng { diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi -index cf9c04a61ba3..20acfc607f00 100644 +index cf9c04a61ba..20acfc607f0 100644 --- a/arch/arm/boot/dts/meson8b.dtsi +++ b/arch/arm/boot/dts/meson8b.dtsi @@ -276,6 +276,116 @@ mali: gpu@c0000 { @@ -662,7 +662,7 @@ index cf9c04a61ba3..20acfc607f00 100644 &hwrng { diff --git a/arch/arm/boot/dts/meson8m2.dtsi b/arch/arm/boot/dts/meson8m2.dtsi -index 6725dd9fd825..fcb2ad976098 100644 +index 6725dd9fd82..fcb2ad97609 100644 --- a/arch/arm/boot/dts/meson8m2.dtsi +++ b/arch/arm/boot/dts/meson8m2.dtsi @@ -96,6 +96,10 @@ &usb1_phy { @@ -677,7 +677,7 @@ index 6725dd9fd825..fcb2ad976098 100644 compatible = "amlogic,meson8m2-wdt", "amlogic,meson8b-wdt"; }; diff --git a/drivers/gpu/drm/meson/Kconfig b/drivers/gpu/drm/meson/Kconfig -index 6c70fc3214af..8a839b68cdfc 100644 +index 823909da87d..ba9f1bc8408 100644 --- a/drivers/gpu/drm/meson/Kconfig +++ b/drivers/gpu/drm/meson/Kconfig @@ -10,6 +10,7 @@ config DRM_MESON @@ -701,7 +701,7 @@ index 6c70fc3214af..8a839b68cdfc 100644 + select REGMAP_MMIO + select SND_SOC_HDMI_CODEC if SND_SOC diff --git a/drivers/gpu/drm/meson/Makefile b/drivers/gpu/drm/meson/Makefile -index 3afa31bdc950..817a5270aee6 100644 +index 3afa31bdc95..817a5270aee 100644 --- a/drivers/gpu/drm/meson/Makefile +++ b/drivers/gpu/drm/meson/Makefile @@ -6,3 +6,4 @@ meson-drm-y += meson_encoder_hdmi.o @@ -710,7 +710,7 @@ index 3afa31bdc950..817a5270aee6 100644 obj-$(CONFIG_DRM_MESON_DW_HDMI) += meson_dw_hdmi.o +obj-$(CONFIG_DRM_MESON_TRANSWITCH_HDMI) += meson_transwitch_hdmi.o diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c -index 86b90d0f5780..ff8286b2b9b4 100644 +index 3b24a924b7b..091c670ab0e 100644 --- a/drivers/gpu/drm/meson/meson_drv.c +++ b/drivers/gpu/drm/meson/meson_drv.c @@ -12,6 +12,7 @@ @@ -1179,7 +1179,7 @@ index 86b90d0f5780..ff8286b2b9b4 100644 .data = (void *)&meson_drm_gxbb_data }, { .compatible = "amlogic,meson-gxl-vpu", diff --git a/drivers/gpu/drm/meson/meson_drv.h b/drivers/gpu/drm/meson/meson_drv.h -index c62ee358456f..fe0a8f8762fd 100644 +index c62ee358456..fe0a8f8762f 100644 --- a/drivers/gpu/drm/meson/meson_drv.h +++ b/drivers/gpu/drm/meson/meson_drv.h @@ -7,22 +7,29 @@ @@ -1265,7 +1265,7 @@ index c62ee358456f..fe0a8f8762fd 100644 struct { bool osd1_enabled; diff --git a/drivers/gpu/drm/meson/meson_encoder_cvbs.c b/drivers/gpu/drm/meson/meson_encoder_cvbs.c -index 5675bc2a92cf..3e40bd45c90f 100644 +index 5675bc2a92c..3e40bd45c90 100644 --- a/drivers/gpu/drm/meson/meson_encoder_cvbs.c +++ b/drivers/gpu/drm/meson/meson_encoder_cvbs.c @@ -11,6 +11,7 @@ @@ -1382,7 +1382,7 @@ index 5675bc2a92cf..3e40bd45c90f 100644 .get_modes = meson_encoder_cvbs_get_modes, .atomic_enable = meson_encoder_cvbs_atomic_enable, diff --git a/drivers/gpu/drm/meson/meson_encoder_hdmi.c b/drivers/gpu/drm/meson/meson_encoder_hdmi.c -index 53231bfdf7e2..f950c557d5f8 100644 +index 53231bfdf7e..f950c557d5f 100644 --- a/drivers/gpu/drm/meson/meson_encoder_hdmi.c +++ b/drivers/gpu/drm/meson/meson_encoder_hdmi.c @@ -188,13 +188,13 @@ static void meson_encoder_hdmi_atomic_enable(struct drm_bridge *bridge, @@ -1508,10 +1508,10 @@ index 53231bfdf7e2..f950c557d5f8 100644 pdev = of_find_device_by_node(remote); of_node_put(remote); diff --git a/drivers/gpu/drm/meson/meson_plane.c b/drivers/gpu/drm/meson/meson_plane.c -index 03acc68abf2c..0e373f5b01c0 100644 +index 815dfe30492..27e39577218 100644 --- a/drivers/gpu/drm/meson/meson_plane.c +++ b/drivers/gpu/drm/meson/meson_plane.c -@@ -201,8 +201,11 @@ static void meson_plane_atomic_update(struct drm_plane *plane, +@@ -200,8 +200,11 @@ static void meson_plane_atomic_update(struct drm_plane *plane, priv->viu.osd1_ctrl_stat2 &= ~OSD_DPATH_MALI_AFBCD; } @@ -1525,7 +1525,7 @@ index 03acc68abf2c..0e373f5b01c0 100644 priv->viu.osd1_blk0_cfg[0] |= OSD_OUTPUT_COLOR_RGB; if (priv->viu.osd1_afbcd && -@@ -472,7 +475,20 @@ static const struct drm_plane_funcs meson_plane_funcs = { +@@ -471,7 +474,20 @@ static const struct drm_plane_funcs meson_plane_funcs = { .format_mod_supported = meson_plane_format_mod_supported, }; @@ -1547,7 +1547,7 @@ index 03acc68abf2c..0e373f5b01c0 100644 DRM_FORMAT_ARGB8888, DRM_FORMAT_ABGR8888, DRM_FORMAT_XRGB8888, -@@ -534,6 +550,8 @@ int meson_plane_create(struct meson_drm *priv) +@@ -533,6 +549,8 @@ int meson_plane_create(struct meson_drm *priv) { struct meson_plane *meson_plane; struct drm_plane *plane; @@ -1556,7 +1556,7 @@ index 03acc68abf2c..0e373f5b01c0 100644 const uint64_t *format_modifiers = format_modifiers_default; meson_plane = devm_kzalloc(priv->drm->dev, sizeof(*meson_plane), -@@ -549,10 +567,19 @@ int meson_plane_create(struct meson_drm *priv) +@@ -548,10 +566,19 @@ int meson_plane_create(struct meson_drm *priv) else if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A)) format_modifiers = format_modifiers_afbc_g12a; @@ -1580,7 +1580,7 @@ index 03acc68abf2c..0e373f5b01c0 100644 diff --git a/drivers/gpu/drm/meson/meson_transwitch_hdmi.c b/drivers/gpu/drm/meson/meson_transwitch_hdmi.c new file mode 100644 -index 000000000000..e88bdba7c16f +index 00000000000..e88bdba7c16 --- /dev/null +++ b/drivers/gpu/drm/meson/meson_transwitch_hdmi.c @@ -0,0 +1,1579 @@ @@ -3165,7 +3165,7 @@ index 000000000000..e88bdba7c16f +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/meson/meson_transwitch_hdmi.h b/drivers/gpu/drm/meson/meson_transwitch_hdmi.h new file mode 100644 -index 000000000000..14929475c0c8 +index 00000000000..14929475c0c --- /dev/null +++ b/drivers/gpu/drm/meson/meson_transwitch_hdmi.h @@ -0,0 +1,536 @@ @@ -3706,7 +3706,7 @@ index 000000000000..14929475c0c8 + +#endif /* __MESON_TRANSWITCH_HDMI_H__ */ diff --git a/drivers/gpu/drm/meson/meson_vclk.c b/drivers/gpu/drm/meson/meson_vclk.c -index 2a82119eb58e..a2c1bf1aed77 100644 +index 2a82119eb58..a2c1bf1aed7 100644 --- a/drivers/gpu/drm/meson/meson_vclk.c +++ b/drivers/gpu/drm/meson/meson_vclk.c @@ -732,6 +732,11 @@ meson_vclk_dmt_supported_freq(struct meson_drm *priv, unsigned int freq) @@ -3884,7 +3884,7 @@ index 2a82119eb58e..a2c1bf1aed77 100644 meson_venci_cvbs_clock_config(priv); return; diff --git a/drivers/gpu/drm/meson/meson_venc.c b/drivers/gpu/drm/meson/meson_venc.c -index 3c55ed003359..009882bda7b9 100644 +index 3c55ed00335..009882bda7b 100644 --- a/drivers/gpu/drm/meson/meson_venc.c +++ b/drivers/gpu/drm/meson/meson_venc.c @@ -60,10 +60,6 @@ @@ -3959,7 +3959,7 @@ index 3c55ed003359..009882bda7b9 100644 /* Disable HDMI */ writel_bits_relaxed(VPU_HDMI_ENCI_DATA_TO_HDMI | diff --git a/drivers/gpu/drm/meson/meson_viu.c b/drivers/gpu/drm/meson/meson_viu.c -index d4b907889a21..836dac22c8e1 100644 +index d4b907889a2..836dac22c8e 100644 --- a/drivers/gpu/drm/meson/meson_viu.c +++ b/drivers/gpu/drm/meson/meson_viu.c @@ -436,10 +436,22 @@ void meson_viu_init(struct meson_drm *priv) @@ -4015,7 +4015,7 @@ index d4b907889a21..836dac22c8e1 100644 /* Disable VD1 AFBC */ /* di_mif0_en=0 mif0_to_vpp_en=0 di_mad_en=0 and afbc vd1 set=0*/ diff --git a/drivers/phy/amlogic/Kconfig b/drivers/phy/amlogic/Kconfig -index ce7ba3eb2a8e..671435b605f2 100644 +index ce7ba3eb2a8..671435b605f 100644 --- a/drivers/phy/amlogic/Kconfig +++ b/drivers/phy/amlogic/Kconfig @@ -25,6 +25,16 @@ config PHY_MESON8B_USB2 @@ -4036,7 +4036,7 @@ index ce7ba3eb2a8e..671435b605f2 100644 tristate "Meson GXL and GXM USB2 PHY drivers" default ARCH_MESON diff --git a/drivers/phy/amlogic/Makefile b/drivers/phy/amlogic/Makefile -index 91e3b9790c03..f6c38f7386a6 100644 +index 91e3b9790c0..f6c38f7386a 100644 --- a/drivers/phy/amlogic/Makefile +++ b/drivers/phy/amlogic/Makefile @@ -1,6 +1,7 @@ @@ -4049,7 +4049,7 @@ index 91e3b9790c03..f6c38f7386a6 100644 obj-$(CONFIG_PHY_MESON_G12A_USB3_PCIE) += phy-meson-g12a-usb3-pcie.o diff --git a/drivers/phy/amlogic/phy-meson-cvbs-dac.c b/drivers/phy/amlogic/phy-meson-cvbs-dac.c new file mode 100644 -index 000000000000..96549e63bc1e +index 00000000000..96549e63bc1 --- /dev/null +++ b/drivers/phy/amlogic/phy-meson-cvbs-dac.c @@ -0,0 +1,375 @@ diff --git a/patch/kernel/archive/meson-6.0/0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch b/patch/kernel/archive/meson-6.1/0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch similarity index 83% rename from patch/kernel/archive/meson-6.0/0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch rename to patch/kernel/archive/meson-6.1/0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch index 3dee32a8b..fcb18fae8 100644 --- a/patch/kernel/archive/meson-6.0/0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch +++ b/patch/kernel/archive/meson-6.1/0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch @@ -5,10 +5,10 @@ meson8/meson8b/meson8m2: drm: Forcefully enable XRGB format 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/meson/meson_plane.c b/drivers/gpu/drm/meson/meson_plane.c -index 0e373f5b01c0..9c0db63e17e3 100644 +index 27e39577218..027b2fe7ff8 100644 --- a/drivers/gpu/drm/meson/meson_plane.c +++ b/drivers/gpu/drm/meson/meson_plane.c -@@ -484,6 +484,8 @@ static const struct drm_plane_funcs meson_plane_funcs = { +@@ -483,6 +483,8 @@ static const struct drm_plane_funcs meson_plane_funcs = { static const uint32_t supported_drm_formats_m8[] = { DRM_FORMAT_ARGB8888, DRM_FORMAT_ABGR8888, diff --git a/patch/kernel/archive/meson-6.0/Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch b/patch/kernel/archive/meson-6.1/Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch similarity index 98% rename from patch/kernel/archive/meson-6.0/Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch rename to patch/kernel/archive/meson-6.1/Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch index 888e4db15..a69258f9d 100644 --- a/patch/kernel/archive/meson-6.0/Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch +++ b/patch/kernel/archive/meson-6.1/Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch @@ -7,7 +7,7 @@ This reverts commit 4bc31edebde51fcf8ad0794763b8679a7ecb5ec0. 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c -index 89cd48fcec79..a776ac641541 100644 +index 89cd48fcec7..a776ac64154 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1391,17 +1391,13 @@ static int mmc_select_hs400es(struct mmc_card *card) diff --git a/patch/kernel/archive/meson-6.0/board_odroidc1/dts-Enable-HDMI.patch b/patch/kernel/archive/meson-6.1/board_odroidc1/dts-Enable-HDMI.patch similarity index 100% rename from patch/kernel/archive/meson-6.0/board_odroidc1/dts-Enable-HDMI.patch rename to patch/kernel/archive/meson-6.1/board_odroidc1/dts-Enable-HDMI.patch diff --git a/patch/kernel/archive/meson-6.0/board_onecloud/0001-add-dts.patch b/patch/kernel/archive/meson-6.1/board_onecloud/0001-add-dts.patch similarity index 98% rename from patch/kernel/archive/meson-6.0/board_onecloud/0001-add-dts.patch rename to patch/kernel/archive/meson-6.1/board_onecloud/0001-add-dts.patch index 7a383d9ea..8b35d8448 100644 --- a/patch/kernel/archive/meson-6.0/board_onecloud/0001-add-dts.patch +++ b/patch/kernel/archive/meson-6.1/board_onecloud/0001-add-dts.patch @@ -7,10 +7,10 @@ Add dts create mode 100644 arch/arm/boot/dts/meson8b-onecloud.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 05d8aef6e5d2..5bd78919d1cd 100644 +index 6aa7dc4db2f..e3a3577b3ce 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -400,6 +400,7 @@ dtb-$(CONFIG_MACH_MESON8) += \ +@@ -401,6 +401,7 @@ dtb-$(CONFIG_MACH_MESON8) += \ meson8b-ec100.dtb \ meson8b-mxq.dtb \ meson8b-odroidc1.dtb \ @@ -20,7 +20,7 @@ index 05d8aef6e5d2..5bd78919d1cd 100644 pxa168-aspenite.dtb \ diff --git a/arch/arm/boot/dts/meson8b-onecloud.dts b/arch/arm/boot/dts/meson8b-onecloud.dts new file mode 100644 -index 000000000000..d517e45e22ba +index 00000000000..d517e45e22b --- /dev/null +++ b/arch/arm/boot/dts/meson8b-onecloud.dts @@ -0,0 +1,402 @@ diff --git a/patch/kernel/archive/meson-6.0/board_onecloud/0002-dts-Support-HDMI.patch b/patch/kernel/archive/meson-6.1/board_onecloud/0002-dts-Support-HDMI.patch similarity index 97% rename from patch/kernel/archive/meson-6.0/board_onecloud/0002-dts-Support-HDMI.patch rename to patch/kernel/archive/meson-6.1/board_onecloud/0002-dts-Support-HDMI.patch index 8bf41e5d1..1b6d85946 100644 --- a/patch/kernel/archive/meson-6.0/board_onecloud/0002-dts-Support-HDMI.patch +++ b/patch/kernel/archive/meson-6.1/board_onecloud/0002-dts-Support-HDMI.patch @@ -5,7 +5,7 @@ dts: Support HDMI 1 file changed, 58 insertions(+) diff --git a/arch/arm/boot/dts/meson8b-onecloud.dts b/arch/arm/boot/dts/meson8b-onecloud.dts -index d517e45e22ba..89e3e3238dec 100644 +index d517e45e22b..89e3e3238de 100644 --- a/arch/arm/boot/dts/meson8b-onecloud.dts +++ b/arch/arm/boot/dts/meson8b-onecloud.dts @@ -32,6 +32,48 @@ emmc_pwrseq: emmc-pwrseq { diff --git a/patch/kernel/archive/meson-6.0/board_onecloud/usb-disable-ACA-check.patch b/patch/kernel/archive/meson-6.1/board_onecloud/usb-disable-ACA-check.patch similarity index 95% rename from patch/kernel/archive/meson-6.0/board_onecloud/usb-disable-ACA-check.patch rename to patch/kernel/archive/meson-6.1/board_onecloud/usb-disable-ACA-check.patch index f2f6111a3..cc72cdc7d 100644 --- a/patch/kernel/archive/meson-6.0/board_onecloud/usb-disable-ACA-check.patch +++ b/patch/kernel/archive/meson-6.1/board_onecloud/usb-disable-ACA-check.patch @@ -9,7 +9,7 @@ So just disable this check. 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/phy/amlogic/phy-meson8b-usb2.c b/drivers/phy/amlogic/phy-meson8b-usb2.c -index dd96763911b8..dff1bc44f1ca 100644 +index dd96763911b..dff1bc44f1c 100644 --- a/drivers/phy/amlogic/phy-meson8b-usb2.c +++ b/drivers/phy/amlogic/phy-meson8b-usb2.c @@ -197,13 +197,13 @@ static int phy_meson8b_usb2_power_on(struct phy *phy) diff --git a/patch/kernel/archive/meson-6.0/generate-uImage-instand-of-zImage.patch b/patch/kernel/archive/meson-6.1/generate-uImage-instand-of-zImage.patch similarity index 100% rename from patch/kernel/archive/meson-6.0/generate-uImage-instand-of-zImage.patch rename to patch/kernel/archive/meson-6.1/generate-uImage-instand-of-zImage.patch diff --git a/patch/kernel/meson-edge b/patch/kernel/meson-edge index 125a749fb..ba712ebc8 120000 --- a/patch/kernel/meson-edge +++ b/patch/kernel/meson-edge @@ -1 +1 @@ -archive/meson-6.0 \ No newline at end of file +archive/meson-6.1/ \ No newline at end of file