From 01e5e2ca37d5e215fdcdbce7f11e4c4a085a5d07 Mon Sep 17 00:00:00 2001 From: hzyitc Date: Wed, 26 Oct 2022 15:33:31 +0800 Subject: [PATCH] meson: edge: bump v6.0 (#4348) * meson: edge: Bump v6.0 * meson: edge: refresh patches * meson: edge: refresh config --- config/kernel/linux-meson-edge.config | 63 ++++++++++++--- .../sources/families/include/meson_common.inc | 2 +- .../0001-m8-m8b-m8m2-Support-HDMI.patch | 78 ++++++++++--------- ...m2-drm-forcefully-enable-XRGB-format.patch | 4 +- ...-clock-speed-before-sending-HS-CMD13.patch | 0 .../board_odroidc1/dts-Enable-HDMI.patch | 0 .../board_onecloud/0001-add-dts.patch | 4 +- .../0002-dts-Support-HDMI.patch | 0 .../usb-disable-ACA-check.patch | 0 .../generate-uImage-instand-of-zImage.patch | 0 patch/kernel/meson-edge | 2 +- 11 files changed, 100 insertions(+), 53 deletions(-) rename patch/kernel/archive/{meson-5.19 => meson-6.0}/0001-m8-m8b-m8m2-Support-HDMI.patch (98%) rename patch/kernel/archive/{meson-5.19 => meson-6.0}/0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch (83%) rename patch/kernel/archive/{meson-5.19 => meson-6.0}/Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch (100%) rename patch/kernel/archive/{meson-5.19 => meson-6.0}/board_odroidc1/dts-Enable-HDMI.patch (100%) rename patch/kernel/archive/{meson-5.19 => meson-6.0}/board_onecloud/0001-add-dts.patch (98%) rename patch/kernel/archive/{meson-5.19 => meson-6.0}/board_onecloud/0002-dts-Support-HDMI.patch (100%) rename patch/kernel/archive/{meson-5.19 => meson-6.0}/board_onecloud/usb-disable-ACA-check.patch (100%) rename patch/kernel/archive/{meson-5.19 => meson-6.0}/generate-uImage-instand-of-zImage.patch (100%) diff --git a/config/kernel/linux-meson-edge.config b/config/kernel/linux-meson-edge.config index 96649cff3a..eb186acea4 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 5.19.14 Kernel Configuration +# Linux/arm 6.0.3 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 @@ -13,7 +13,6 @@ CONFIG_LD_VERSION=23200 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y -CONFIG_CC_HAS_ASM_GOTO=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_PAHOLE_VERSION=122 @@ -78,6 +77,8 @@ CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_ARCH_HAS_TICK_BROADCAST=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_CONTEXT_TRACKING=y +CONFIG_CONTEXT_TRACKING_IDLE=y # # Timers subsystem @@ -161,6 +162,7 @@ CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" CONFIG_GCC12_NO_ARRAY_BOUNDS=y CONFIG_CGROUPS=y CONFIG_PAGE_COUNTER=y +CONFIG_CGROUP_FAVOR_DYNMODS=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y CONFIG_MEMCG_KMEM=y @@ -340,6 +342,7 @@ CONFIG_MACH_MESON8=y # CONFIG_PLAT_SPEAR is not set # CONFIG_ARCH_STI is not set # CONFIG_ARCH_STM32 is not set +# CONFIG_ARCH_SUNPLUS is not set # CONFIG_ARCH_SUNXI is not set # CONFIG_ARCH_TEGRA is not set # CONFIG_ARCH_UNIPHIER is not set @@ -483,6 +486,7 @@ CONFIG_STACKPROTECTOR_PER_TASK=y # CONFIG_USE_OF=y CONFIG_ATAGS=y +# CONFIG_UNUSED_BOARD_FILES is not set # CONFIG_DEPRECATED_PARAM_STRUCT is not set CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 @@ -575,6 +579,7 @@ CONFIG_SUSPEND_FREEZER=y CONFIG_PM_SLEEP=y CONFIG_PM_SLEEP_SMP=y # CONFIG_PM_AUTOSLEEP is not set +# CONFIG_PM_USERSPACE_AUTOSLEEP is not set # CONFIG_PM_WAKELOCKS is not set CONFIG_PM=y # CONFIG_PM_DEBUG is not set @@ -655,13 +660,14 @@ CONFIG_HAVE_STACKPROTECTOR=y CONFIG_STACKPROTECTOR=y CONFIG_STACKPROTECTOR_STRONG=y CONFIG_LTO_NONE=y -CONFIG_HAVE_CONTEXT_TRACKING=y +CONFIG_HAVE_CONTEXT_TRACKING_USER=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_MODULES_USE_ELF_REL=y CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y +CONFIG_SOFTIRQ_ON_OWN_STACK=y CONFIG_ARCH_HAS_ELF_RANDOMIZE=y CONFIG_HAVE_ARCH_MMAP_RND_BITS=y CONFIG_HAVE_EXIT_THREAD=y @@ -681,7 +687,6 @@ CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y CONFIG_STRICT_KERNEL_RWX=y CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y 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 @@ -1096,6 +1101,7 @@ CONFIG_NFT_FIB_NETDEV=m CONFIG_NFT_REJECT_NETDEV=m CONFIG_NF_FLOW_TABLE_INET=m CONFIG_NF_FLOW_TABLE=m +CONFIG_NF_FLOW_TABLE_PROCFS=y CONFIG_NETFILTER_XTABLES=m # @@ -1877,6 +1883,7 @@ CONFIG_ARM_SCMI_TRANSPORT_SMC=y CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE=y # CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set CONFIG_ARM_SCMI_POWER_DOMAIN=m +CONFIG_ARM_SCMI_POWER_CONTROL=m # end of ARM System Control and Management Interface Protocol # CONFIG_ARM_SCPI_PROTOCOL is not set @@ -1955,7 +1962,6 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 CONFIG_BLK_DEV_DRBD=m CONFIG_DRBD_FAULT_INJECTION=y CONFIG_BLK_DEV_NBD=m -# CONFIG_BLK_DEV_SX8 is not set CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=65536 @@ -1963,6 +1969,7 @@ CONFIG_BLK_DEV_RAM_SIZE=65536 CONFIG_ATA_OVER_ETH=m # CONFIG_VIRTIO_BLK is not set CONFIG_BLK_DEV_RBD=m +CONFIG_BLK_DEV_UBLK=m # # NVME Support @@ -2002,6 +2009,7 @@ CONFIG_SRAM_EXEC=y CONFIG_MISC_RTSX=m # CONFIG_HISI_HIKEY_USB is not set # CONFIG_OPEN_DICE is not set +# CONFIG_VCPU_STALL_DETECTOR is not set # CONFIG_C2PORT is not set # @@ -2103,6 +2111,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m # CONFIG_SCSI_MPI3MR is not set # CONFIG_SCSI_SMARTPQI is not set # CONFIG_SCSI_HPTIOP is not set +# CONFIG_SCSI_BUSLOGIC is not set # CONFIG_SCSI_MYRB is not set # CONFIG_SCSI_MYRS is not set # CONFIG_LIBFC is not set @@ -2362,6 +2371,7 @@ CONFIG_ETHERNET=y # CONFIG_NET_VENDOR_HISILICON is not set # CONFIG_NET_VENDOR_HUAWEI is not set # CONFIG_NET_VENDOR_INTEL is not set +# CONFIG_NET_VENDOR_WANGXUN is not set # CONFIG_JME is not set # CONFIG_NET_VENDOR_LITEX is not set # CONFIG_NET_VENDOR_MARVELL is not set @@ -2866,6 +2876,7 @@ CONFIG_DEVPORT=y # CONFIG_TCG_TPM is not set # CONFIG_XILLYBUS is not set # CONFIG_XILLYUSB is not set +CONFIG_RANDOM_TRUST_CPU=y CONFIG_RANDOM_TRUST_BOOTLOADER=y # end of Character devices @@ -2980,6 +2991,7 @@ CONFIG_SPI_GPIO=m # CONFIG_SPI_FSL_SPI is not set CONFIG_SPI_MESON_SPICC=y CONFIG_SPI_MESON_SPIFC=y +# CONFIG_SPI_MICROCHIP_CORE is not set # CONFIG_SPI_OC_TINY is not set # CONFIG_SPI_PXA2XX is not set # CONFIG_SPI_ROCKCHIP is not set @@ -3078,7 +3090,6 @@ CONFIG_GPIO_GENERIC_PLATFORM=y # CONFIG_GPIO_LOGICVC is not set # CONFIG_GPIO_MB86S7X is not set # CONFIG_GPIO_MPC8XXX is not set -# CONFIG_GPIO_SAMA5D2_PIOBU is not set # CONFIG_GPIO_SIFIVE is not set CONFIG_GPIO_SYSCON=y # CONFIG_GPIO_XILINX is not set @@ -3796,7 +3807,6 @@ CONFIG_USB_PWC=m # CONFIG_USB_PWC_DEBUG is not set CONFIG_USB_PWC_INPUT_EVDEV=y CONFIG_USB_S2255=m -CONFIG_USB_STKWEBCAM=m CONFIG_VIDEO_USBTV=m CONFIG_USB_VIDEO_CLASS=m CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y @@ -4065,6 +4075,7 @@ CONFIG_VIDEO_IR_I2C=m # # Camera sensor devices # +# CONFIG_VIDEO_AR0521 is not set # CONFIG_VIDEO_HI556 is not set # CONFIG_VIDEO_HI846 is not set # CONFIG_VIDEO_HI847 is not set @@ -4479,6 +4490,7 @@ CONFIG_DVB_SP2=m # # Graphics support # +CONFIG_APERTURE_HELPERS=y # CONFIG_IMX_IPUV3_CORE is not set CONFIG_DRM=y # CONFIG_DRM_DEBUG_MM is not set @@ -4601,6 +4613,7 @@ CONFIG_DRM_DISPLAY_CONNECTOR=y # CONFIG_DRM_TOSHIBA_TC358767 is not set # CONFIG_DRM_TOSHIBA_TC358768 is not set # CONFIG_DRM_TOSHIBA_TC358775 is not set +# CONFIG_DRM_TI_DLPC3433 is not set # CONFIG_DRM_TI_TFP410 is not set # CONFIG_DRM_TI_SN65DSI83 is not set # CONFIG_DRM_TI_SN65DSI86 is not set @@ -4619,7 +4632,9 @@ CONFIG_DRM_DW_HDMI=y # CONFIG_DRM_STI is not set # CONFIG_DRM_ETNAVIV is not set +# CONFIG_DRM_LOGICVC is not set # CONFIG_DRM_MXSFB is not set +# CONFIG_DRM_IMX_LCDIF is not set CONFIG_DRM_MESON=y CONFIG_DRM_MESON_DW_HDMI=y CONFIG_DRM_MESON_TRANSWITCH_HDMI=y @@ -4767,7 +4782,9 @@ CONFIG_SND_SUPPORT_OLD_API=y CONFIG_SND_PROC_FS=y CONFIG_SND_VERBOSE_PROCFS=y # CONFIG_SND_VERBOSE_PRINTK is not set +CONFIG_SND_CTL_FAST_LOOKUP=y # CONFIG_SND_DEBUG is not set +# CONFIG_SND_CTL_INPUT_VALIDATION is not set CONFIG_SND_VMASTER=y # CONFIG_SND_SEQUENCER is not set CONFIG_SND_DRIVERS=y @@ -4923,6 +4940,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_ES8328_I2C is not set # CONFIG_SND_SOC_ES8328_SPI is not set # CONFIG_SND_SOC_GTM601 is not set +# CONFIG_SND_SOC_HDA is not set # CONFIG_SND_SOC_ICS43432 is not set # CONFIG_SND_SOC_INNO_RK3036 is not set # CONFIG_SND_SOC_MAX98088 is not set @@ -4971,6 +4989,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_TAS2562 is not set # CONFIG_SND_SOC_TAS2764 is not set # CONFIG_SND_SOC_TAS2770 is not set +# CONFIG_SND_SOC_TAS2780 is not set # CONFIG_SND_SOC_TAS5086 is not set # CONFIG_SND_SOC_TAS571X is not set # CONFIG_SND_SOC_TAS5720 is not set @@ -5137,6 +5156,7 @@ CONFIG_HID_GENERIC=y # CONFIG_HID_SMARTJOYPLUS is not set # CONFIG_HID_TIVO is not set # CONFIG_HID_TOPSEED is not set +# CONFIG_HID_TOPRE is not set # CONFIG_HID_THINGM is not set # CONFIG_HID_THRUSTMASTER is not set # CONFIG_HID_UDRAW_PS3 is not set @@ -5163,6 +5183,7 @@ CONFIG_USB_HID=y # I2C HID support # # CONFIG_I2C_HID_OF is not set +# CONFIG_I2C_HID_OF_ELAN is not set # CONFIG_I2C_HID_OF_GOODIX is not set # end of I2C HID support # end of HID support @@ -5362,6 +5383,7 @@ CONFIG_USB_EZUSB_FX2=m # CONFIG_USB_HSIC_USB4604 is not set # CONFIG_USB_LINK_LAYER_TEST is not set # CONFIG_USB_CHAOSKEY is not set +# CONFIG_USB_ONBOARD_HUB is not set # CONFIG_USB_ATM is not set # @@ -5632,6 +5654,7 @@ CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_DRV_DS1672 is not set # CONFIG_RTC_DRV_HYM8563 is not set # CONFIG_RTC_DRV_MAX6900 is not set +# CONFIG_RTC_DRV_NCT3018Y is not set # CONFIG_RTC_DRV_RS5C372 is not set # CONFIG_RTC_DRV_ISL1208 is not set # CONFIG_RTC_DRV_ISL12022 is not set @@ -5907,6 +5930,11 @@ CONFIG_MESON_MX_SOCINFO=y # CONFIG_FSL_RCPM is not set # end of NXP/Freescale QorIQ SoC drivers +# +# fujitsu SoC drivers +# +# end of fujitsu SoC drivers + # # i.MX SoC drivers # @@ -6469,11 +6497,11 @@ CONFIG_IIO_HRTIMER_TRIGGER=y # end of Temperature sensors # CONFIG_NTB is not set -# CONFIG_VME_BUS is not set CONFIG_PWM=y CONFIG_PWM_SYSFS=y # CONFIG_PWM_DEBUG is not set # CONFIG_PWM_ATMEL_TCB is not set +# CONFIG_PWM_CLK is not set # CONFIG_PWM_DWC is not set # CONFIG_PWM_FSL_FTM is not set CONFIG_PWM_MESON=y @@ -6496,7 +6524,9 @@ CONFIG_RESET_CONTROLLER=y CONFIG_RESET_MESON=y CONFIG_RESET_MESON_AUDIO_ARB=m CONFIG_RESET_SCMI=m +# CONFIG_RESET_SIMPLE is not set # CONFIG_RESET_TI_SYSCON is not set +# CONFIG_RESET_TI_TPS380X is not set # # PHY Subsystem @@ -6507,6 +6537,7 @@ CONFIG_PHY_MESON8_HDMI_TX=y CONFIG_PHY_MESON8B_USB2=y CONFIG_PHY_MESON_CVBS_DAC=y # CONFIG_PHY_MESON_GXL_USB2 is not set +# CONFIG_PHY_MESON_G12A_MIPI_DPHY_ANALOG is not set # CONFIG_PHY_MESON_G12A_USB2 is not set # CONFIG_PHY_MESON_G12A_USB3_PCIE is not set # CONFIG_PHY_MESON_AXG_PCIE is not set @@ -6553,7 +6584,7 @@ CONFIG_RAS=y # # Android # -# CONFIG_ANDROID is not set +# CONFIG_ANDROID_BINDER_IPC is not set # end of Android CONFIG_DAX=m @@ -6956,6 +6987,7 @@ CONFIG_NLS_MAC_ROMANIAN=m CONFIG_NLS_MAC_TURKISH=m CONFIG_NLS_UTF8=y CONFIG_DLM=y +# CONFIG_DLM_DEPRECATED_API is not set # CONFIG_DLM_DEBUG is not set CONFIG_UNICODE=y # CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set @@ -7078,10 +7110,12 @@ 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 # @@ -7102,6 +7136,7 @@ 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 @@ -7134,6 +7169,7 @@ 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_TEA=m @@ -7234,6 +7270,7 @@ CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m CONFIG_CRYPTO_LIB_POLY1305=m CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m +CONFIG_CRYPTO_LIB_SHA1=y CONFIG_CRYPTO_LIB_SHA256=y # end of Crypto library routines @@ -7293,6 +7330,7 @@ CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m CONFIG_TEXTSEARCH_FSM=m +CONFIG_XARRAY_MULTI=y CONFIG_ASSOCIATIVE_ARRAY=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y @@ -7302,6 +7340,8 @@ CONFIG_NEED_DMA_MAP_STATE=y CONFIG_DMA_DECLARE_COHERENT=y CONFIG_ARCH_HAS_SETUP_DMA_OPS=y CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y +CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y +CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y CONFIG_DMA_NONCOHERENT_MMAP=y CONFIG_DMA_CMA=y # CONFIG_DMA_PERNUMA_CMA is not set @@ -7339,7 +7379,6 @@ CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y CONFIG_SG_POOL=y CONFIG_STACKDEPOT=y -CONFIG_STACK_HASH_ORDER=20 CONFIG_SBITMAP=y # end of Library routines @@ -7371,6 +7410,7 @@ CONFIG_DEBUG_MISC=y # # Compile-time checks and compiler options # +CONFIG_AS_HAS_NON_CONST_LEB128=y CONFIG_DEBUG_INFO_NONE=y # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set # CONFIG_DEBUG_INFO_DWARF4 is not set @@ -7422,6 +7462,7 @@ CONFIG_SLUB_DEBUG=y # CONFIG_DEBUG_RODATA_TEST is not set # CONFIG_DEBUG_WX is not set # CONFIG_DEBUG_OBJECTS is not set +# CONFIG_SHRINKER_DEBUG is not set CONFIG_HAVE_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_KMEMLEAK is not set # CONFIG_DEBUG_STACK_USAGE is not set @@ -7434,6 +7475,7 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y # CONFIG_DEBUG_KMAP_LOCAL is not set # CONFIG_DEBUG_HIGHMEM is not set CONFIG_HAVE_ARCH_KASAN=y +CONFIG_HAVE_ARCH_KASAN_VMALLOC=y CONFIG_CC_HAS_KASAN_GENERIC=y CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y # CONFIG_KASAN is not set @@ -7562,6 +7604,7 @@ CONFIG_PROBE_EVENTS=y # CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set # CONFIG_PREEMPTIRQ_DELAY_TEST is not set # CONFIG_KPROBE_EVENT_GEN_TEST is not set +# CONFIG_RV is not set # CONFIG_SAMPLES is not set # CONFIG_STRICT_DEVMEM is not set diff --git a/config/sources/families/include/meson_common.inc b/config/sources/families/include/meson_common.inc index 26e3532f79..18aadf051a 100644 --- a/config/sources/families/include/meson_common.inc +++ b/config/sources/families/include/meson_common.inc @@ -43,7 +43,7 @@ case $BRANCH in edge) - KERNELBRANCH="branch:linux-5.19.y" + KERNELBRANCH="branch:linux-6.0.y" KERNELPATCHDIR='meson-'$BRANCH ;; diff --git a/patch/kernel/archive/meson-5.19/0001-m8-m8b-m8m2-Support-HDMI.patch b/patch/kernel/archive/meson-6.0/0001-m8-m8b-m8m2-Support-HDMI.patch similarity index 98% rename from patch/kernel/archive/meson-5.19/0001-m8-m8b-m8m2-Support-HDMI.patch rename to patch/kernel/archive/meson-6.0/0001-m8-m8b-m8m2-Support-HDMI.patch index f5f8ff5459..6d3a5ab88b 100644 --- a/patch/kernel/archive/meson-5.19/0001-m8-m8b-m8m2-Support-HDMI.patch +++ b/patch/kernel/archive/meson-6.0/0001-m8-m8b-m8m2-Support-HDMI.patch @@ -16,7 +16,7 @@ Special thank to Martin Blumenstingl. drivers/gpu/drm/meson/meson_drv.c | 315 +++- drivers/gpu/drm/meson/meson_drv.h | 49 +- drivers/gpu/drm/meson/meson_encoder_cvbs.c | 61 +- - drivers/gpu/drm/meson/meson_encoder_hdmi.c | 63 +- + drivers/gpu/drm/meson/meson_encoder_hdmi.c | 69 +- drivers/gpu/drm/meson/meson_plane.c | 37 +- drivers/gpu/drm/meson/meson_transwitch_hdmi.c | 1579 +++++++++++++++++ drivers/gpu/drm/meson/meson_transwitch_hdmi.h | 536 ++++++ @@ -26,14 +26,14 @@ Special thank to Martin Blumenstingl. drivers/phy/amlogic/Kconfig | 10 + drivers/phy/amlogic/Makefile | 1 + drivers/phy/amlogic/phy-meson-cvbs-dac.c | 375 ++++ - 21 files changed, 3591 insertions(+), 126 deletions(-) + 21 files changed, 3593 insertions(+), 130 deletions(-) create mode 100644 Documentation/devicetree/bindings/phy/amlogic,meson-cvbs-dac-phy.yaml create mode 100644 drivers/gpu/drm/meson/meson_transwitch_hdmi.c create mode 100644 drivers/gpu/drm/meson/meson_transwitch_hdmi.h 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 047fd69e0377..d3614bb641ea 100644 +index 6655a93b1874..bbc58c8bdfc2 100644 --- a/Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml +++ b/Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml @@ -66,8 +66,12 @@ properties: @@ -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 26eaba3fa96f..28caf20d4181 100644 +index 8e3860d5d916..9a56cdf776af 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 26eaba3fa96f..28caf20d4181 100644 aiu: audio-controller@5400 { diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi -index 9997a5d0333a..e8073f6abd20 100644 +index 0f8bac8bac8b..646bb8b102b3 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 9997a5d0333a..e8073f6abd20 100644 &hwrng { diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi -index 94f1c03decce..5519086a1887 100644 +index cf9c04a61ba3..20acfc607f00 100644 --- a/arch/arm/boot/dts/meson8b.dtsi +++ b/arch/arm/boot/dts/meson8b.dtsi @@ -276,6 +276,116 @@ mali: gpu@c0000 { @@ -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 bd4ca11d3ff5..bd5bdbdfe662 100644 +index 86b90d0f5780..ff8286b2b9b4 100644 --- a/drivers/gpu/drm/meson/meson_drv.c +++ b/drivers/gpu/drm/meson/meson_drv.c @@ -12,6 +12,7 @@ @@ -1118,7 +1118,7 @@ index bd4ca11d3ff5..bd5bdbdfe662 100644 free_drm: drm_dev_put(drm); -@@ -394,6 +588,10 @@ static void meson_drv_unbind(struct device *dev) +@@ -398,6 +592,10 @@ static void meson_drv_unbind(struct device *dev) if (priv->afbcd.ops) priv->afbcd.ops->exit(priv); @@ -1129,7 +1129,7 @@ index bd4ca11d3ff5..bd5bdbdfe662 100644 } static const struct component_master_ops meson_drv_master_ops = { -@@ -408,6 +606,8 @@ static int __maybe_unused meson_drv_pm_suspend(struct device *dev) +@@ -412,6 +610,8 @@ static int __maybe_unused meson_drv_pm_suspend(struct device *dev) if (!priv) return 0; @@ -1138,7 +1138,7 @@ index bd4ca11d3ff5..bd5bdbdfe662 100644 return drm_mode_config_helper_suspend(priv->drm); } -@@ -418,6 +618,7 @@ static int __maybe_unused meson_drv_pm_resume(struct device *dev) +@@ -422,6 +622,7 @@ static int __maybe_unused meson_drv_pm_resume(struct device *dev) if (!priv) return 0; @@ -1146,9 +1146,9 @@ index bd4ca11d3ff5..bd5bdbdfe662 100644 meson_vpu_init(priv); meson_venc_init(priv); meson_vpp_init(priv); -@@ -493,6 +694,18 @@ static int meson_drv_probe(struct platform_device *pdev) +@@ -504,6 +705,18 @@ static int meson_drv_remove(struct platform_device *pdev) return 0; - }; + } +static struct meson_drm_match_data meson_drm_m8_data = { + .compat = VPU_COMPATIBLE_M8, @@ -1165,7 +1165,7 @@ index bd4ca11d3ff5..bd5bdbdfe662 100644 static struct meson_drm_match_data meson_drm_gxbb_data = { .compat = VPU_COMPATIBLE_GXBB, }; -@@ -512,6 +725,12 @@ static struct meson_drm_match_data meson_drm_g12a_data = { +@@ -523,6 +736,12 @@ static struct meson_drm_match_data meson_drm_g12a_data = { }; static const struct of_device_id dt_match[] = { @@ -1179,7 +1179,7 @@ index bd4ca11d3ff5..bd5bdbdfe662 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 177dac3ca3be..10c99fd13146 100644 +index c62ee358456f..fe0a8f8762fd 100644 --- a/drivers/gpu/drm/meson/meson_drv.h +++ b/drivers/gpu/drm/meson/meson_drv.h @@ -7,22 +7,29 @@ @@ -1215,8 +1215,8 @@ index 177dac3ca3be..10c99fd13146 100644 + VPU_COMPATIBLE_G12A = 6, }; - struct meson_drm_match_data { -@@ -34,6 +41,25 @@ struct meson_drm_soc_limits { + enum { +@@ -40,6 +47,25 @@ struct meson_drm_soc_limits { unsigned int max_hdmi_phy_freq; }; @@ -1242,7 +1242,7 @@ index 177dac3ca3be..10c99fd13146 100644 struct meson_drm { struct device *dev; enum vpu_compatible compat; -@@ -54,6 +80,21 @@ struct meson_drm { +@@ -61,6 +87,21 @@ struct meson_drm { const struct meson_drm_soc_limits *limits; @@ -1265,7 +1265,7 @@ index 177dac3ca3be..10c99fd13146 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 8110a6e39320..552b8c0a1fdc 100644 +index 5675bc2a92cf..3e40bd45c90f 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 8110a6e39320..552b8c0a1fdc 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 a7692584487c..ef3f73b0ccf8 100644 +index 53231bfdf7e2..f950c557d5f8 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, @@ -1400,7 +1400,7 @@ index a7692584487c..ef3f73b0ccf8 100644 int vic; connector = drm_atomic_get_new_connector_for_encoder(state, bridge->encoder); -@@ -215,9 +215,18 @@ static void meson_encoder_hdmi_atomic_enable(struct drm_bridge *bridge, +@@ -215,7 +215,14 @@ static void meson_encoder_hdmi_atomic_enable(struct drm_bridge *bridge, dev_dbg(priv->dev, "\"%s\" vic %d\n", mode->name, vic); @@ -1415,12 +1415,8 @@ index a7692584487c..ef3f73b0ccf8 100644 + } else if (encoder_hdmi->output_bus_fmt == MEDIA_BUS_FMT_UYYVYY8_0_5X24) { ycrcb_map = VPU_HDMI_OUTPUT_CRYCB; yuv420_mode = true; -+ } else { -+ ycrcb_map = VPU_HDMI_OUTPUT_CBYCR; - } - - /* VENC + VENC-DVI Mode setup */ -@@ -226,13 +235,18 @@ static void meson_encoder_hdmi_atomic_enable(struct drm_bridge *bridge, + } else if (encoder_hdmi->output_bus_fmt == MEDIA_BUS_FMT_UYVY8_1X16) +@@ -227,17 +234,22 @@ static void meson_encoder_hdmi_atomic_enable(struct drm_bridge *bridge, /* VCLK Set clock */ meson_encoder_hdmi_set_vclk(encoder_hdmi, mode); @@ -1428,6 +1424,10 @@ index a7692584487c..ef3f73b0ccf8 100644 - /* Setup YUV420 to HDMI-TX, no 10bit diphering */ - writel_relaxed(2 | (2 << 2), - priv->io_base + _REG(VPU_HDMI_FMT_CTRL)); +- else if (encoder_hdmi->output_bus_fmt == MEDIA_BUS_FMT_UYVY8_1X16) +- /* Setup YUV422 to HDMI-TX, no 10bit diphering */ +- writel_relaxed(1 | (2 << 2), +- priv->io_base + _REG(VPU_HDMI_FMT_CTRL)); - else - /* Setup YUV444 to HDMI-TX, no 10bit diphering */ - writel_relaxed(0, priv->io_base + _REG(VPU_HDMI_FMT_CTRL)); @@ -1438,6 +1438,10 @@ index a7692584487c..ef3f73b0ccf8 100644 + /* Setup YUV420 to HDMI-TX, no 10bit diphering */ + writel_relaxed(2 | (2 << 2), + priv->io_base + _REG(VPU_HDMI_FMT_CTRL)); ++ else if (encoder_hdmi->output_bus_fmt == MEDIA_BUS_FMT_UYVY8_1X16) ++ /* Setup YUV422 to HDMI-TX, no 10bit diphering */ ++ writel_relaxed(1 | (2 << 2), ++ priv->io_base + _REG(VPU_HDMI_FMT_CTRL)); + else + /* Setup YUV444 to HDMI-TX, no 10bit diphering */ + writel_relaxed(0, @@ -1446,7 +1450,7 @@ index a7692584487c..ef3f73b0ccf8 100644 dev_dbg(priv->dev, "%s\n", priv->venc.hdmi_use_enci ? "VENCI" : "VENCP"); -@@ -255,7 +269,11 @@ static void meson_encoder_hdmi_atomic_disable(struct drm_bridge *bridge, +@@ -260,7 +272,11 @@ static void meson_encoder_hdmi_atomic_disable(struct drm_bridge *bridge, writel_relaxed(0, priv->io_base + _REG(ENCP_VIDEO_EN)); } @@ -1457,9 +1461,9 @@ index a7692584487c..ef3f73b0ccf8 100644 + +static const u32 meson_gx_encoder_hdmi_out_bus_fmts[] = { MEDIA_BUS_FMT_YUV8_1X24, + MEDIA_BUS_FMT_UYVY8_1X16, MEDIA_BUS_FMT_UYYVYY8_0_5X24, - }; -@@ -268,13 +286,27 @@ meson_encoder_hdmi_get_inp_bus_fmts(struct drm_bridge *bridge, +@@ -274,13 +290,27 @@ meson_encoder_hdmi_get_inp_bus_fmts(struct drm_bridge *bridge, u32 output_fmt, unsigned int *num_input_fmts) { @@ -1489,7 +1493,7 @@ index a7692584487c..ef3f73b0ccf8 100644 *num_input_fmts = 1; input_fmts = kcalloc(*num_input_fmts, sizeof(*input_fmts), -@@ -426,8 +458,11 @@ int meson_encoder_hdmi_init(struct meson_drm *priv) +@@ -432,8 +462,11 @@ int meson_encoder_hdmi_init(struct meson_drm *priv) drm_connector_attach_max_bpc_property(meson_encoder_hdmi->connector, 8, 8); @@ -1504,10 +1508,10 @@ index a7692584487c..ef3f73b0ccf8 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 44aa52629443..bd0052897b96 100644 +index 03acc68abf2c..0e373f5b01c0 100644 --- a/drivers/gpu/drm/meson/meson_plane.c +++ b/drivers/gpu/drm/meson/meson_plane.c -@@ -199,8 +199,11 @@ static void meson_plane_atomic_update(struct drm_plane *plane, +@@ -201,8 +201,11 @@ static void meson_plane_atomic_update(struct drm_plane *plane, priv->viu.osd1_ctrl_stat2 &= ~OSD_DPATH_MALI_AFBCD; } @@ -1521,7 +1525,7 @@ index 44aa52629443..bd0052897b96 100644 priv->viu.osd1_blk0_cfg[0] |= OSD_OUTPUT_COLOR_RGB; if (priv->viu.osd1_afbcd && -@@ -470,7 +473,20 @@ static const struct drm_plane_funcs meson_plane_funcs = { +@@ -472,7 +475,20 @@ static const struct drm_plane_funcs meson_plane_funcs = { .format_mod_supported = meson_plane_format_mod_supported, }; @@ -1543,7 +1547,7 @@ index 44aa52629443..bd0052897b96 100644 DRM_FORMAT_ARGB8888, DRM_FORMAT_ABGR8888, DRM_FORMAT_XRGB8888, -@@ -532,6 +548,8 @@ int meson_plane_create(struct meson_drm *priv) +@@ -534,6 +550,8 @@ int meson_plane_create(struct meson_drm *priv) { struct meson_plane *meson_plane; struct drm_plane *plane; @@ -1552,7 +1556,7 @@ index 44aa52629443..bd0052897b96 100644 const uint64_t *format_modifiers = format_modifiers_default; meson_plane = devm_kzalloc(priv->drm->dev, sizeof(*meson_plane), -@@ -547,10 +565,19 @@ int meson_plane_create(struct meson_drm *priv) +@@ -549,10 +567,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; @@ -4011,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 486ca23aba32..53ea95336fc8 100644 +index ce7ba3eb2a8e..671435b605f2 100644 --- a/drivers/phy/amlogic/Kconfig +++ b/drivers/phy/amlogic/Kconfig @@ -25,6 +25,16 @@ config PHY_MESON8B_USB2 @@ -4032,7 +4036,7 @@ index 486ca23aba32..53ea95336fc8 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 c0886c850bb0..f5e1145e983b 100644 +index 91e3b9790c03..f6c38f7386a6 100644 --- a/drivers/phy/amlogic/Makefile +++ b/drivers/phy/amlogic/Makefile @@ -1,6 +1,7 @@ diff --git a/patch/kernel/archive/meson-5.19/0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch b/patch/kernel/archive/meson-6.0/0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch similarity index 83% rename from patch/kernel/archive/meson-5.19/0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch rename to patch/kernel/archive/meson-6.0/0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch index 65c463898d..3dee32a8b8 100644 --- a/patch/kernel/archive/meson-5.19/0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch +++ b/patch/kernel/archive/meson-6.0/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 bd0052897b96..e45e408fc837 100644 +index 0e373f5b01c0..9c0db63e17e3 100644 --- a/drivers/gpu/drm/meson/meson_plane.c +++ b/drivers/gpu/drm/meson/meson_plane.c -@@ -482,6 +482,8 @@ static const struct drm_plane_funcs meson_plane_funcs = { +@@ -484,6 +484,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-5.19/Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch b/patch/kernel/archive/meson-6.0/Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch similarity index 100% rename from patch/kernel/archive/meson-5.19/Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch rename to patch/kernel/archive/meson-6.0/Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch diff --git a/patch/kernel/archive/meson-5.19/board_odroidc1/dts-Enable-HDMI.patch b/patch/kernel/archive/meson-6.0/board_odroidc1/dts-Enable-HDMI.patch similarity index 100% rename from patch/kernel/archive/meson-5.19/board_odroidc1/dts-Enable-HDMI.patch rename to patch/kernel/archive/meson-6.0/board_odroidc1/dts-Enable-HDMI.patch diff --git a/patch/kernel/archive/meson-5.19/board_onecloud/0001-add-dts.patch b/patch/kernel/archive/meson-6.0/board_onecloud/0001-add-dts.patch similarity index 98% rename from patch/kernel/archive/meson-5.19/board_onecloud/0001-add-dts.patch rename to patch/kernel/archive/meson-6.0/board_onecloud/0001-add-dts.patch index f172a56f30..7a383d9ea5 100644 --- a/patch/kernel/archive/meson-5.19/board_onecloud/0001-add-dts.patch +++ b/patch/kernel/archive/meson-6.0/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 27eec8e670ec..0f2cd33eeb72 100644 +index 05d8aef6e5d2..5bd78919d1cd 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -392,6 +392,7 @@ dtb-$(CONFIG_MACH_MESON8) += \ +@@ -400,6 +400,7 @@ dtb-$(CONFIG_MACH_MESON8) += \ meson8b-ec100.dtb \ meson8b-mxq.dtb \ meson8b-odroidc1.dtb \ diff --git a/patch/kernel/archive/meson-5.19/board_onecloud/0002-dts-Support-HDMI.patch b/patch/kernel/archive/meson-6.0/board_onecloud/0002-dts-Support-HDMI.patch similarity index 100% rename from patch/kernel/archive/meson-5.19/board_onecloud/0002-dts-Support-HDMI.patch rename to patch/kernel/archive/meson-6.0/board_onecloud/0002-dts-Support-HDMI.patch diff --git a/patch/kernel/archive/meson-5.19/board_onecloud/usb-disable-ACA-check.patch b/patch/kernel/archive/meson-6.0/board_onecloud/usb-disable-ACA-check.patch similarity index 100% rename from patch/kernel/archive/meson-5.19/board_onecloud/usb-disable-ACA-check.patch rename to patch/kernel/archive/meson-6.0/board_onecloud/usb-disable-ACA-check.patch diff --git a/patch/kernel/archive/meson-5.19/generate-uImage-instand-of-zImage.patch b/patch/kernel/archive/meson-6.0/generate-uImage-instand-of-zImage.patch similarity index 100% rename from patch/kernel/archive/meson-5.19/generate-uImage-instand-of-zImage.patch rename to patch/kernel/archive/meson-6.0/generate-uImage-instand-of-zImage.patch diff --git a/patch/kernel/meson-edge b/patch/kernel/meson-edge index c5abf4c09b..125a749fb2 120000 --- a/patch/kernel/meson-edge +++ b/patch/kernel/meson-edge @@ -1 +1 @@ -archive/meson-5.19 \ No newline at end of file +archive/meson-6.0 \ No newline at end of file