From 3883291acddc0e6b2e824db311dc693b26e01dba Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Thu, 4 Nov 2021 20:45:51 -0700 Subject: [PATCH] linux-purism-librem5: upgrade to 5.13.19pureos3 (MR 2658) my patch to disable SS was merged in purism's tree, so it's dropped here. This kernel also enables the hantro video decoding stuff. [ci:skip-build] already built successfully in CI --- ...-disable-SuperSpeed-instances-in-par.patch | 30 ------------ device/main/linux-purism-librem5/APKBUILD | 12 ++--- .../config-purism-librem5.aarch64 | 46 ++++++++++++------- 3 files changed, 35 insertions(+), 53 deletions(-) delete mode 100644 device/main/linux-purism-librem5/0004-arm64-dts-imx8mq-disable-SuperSpeed-instances-in-par.patch diff --git a/device/main/linux-purism-librem5/0004-arm64-dts-imx8mq-disable-SuperSpeed-instances-in-par.patch b/device/main/linux-purism-librem5/0004-arm64-dts-imx8mq-disable-SuperSpeed-instances-in-par.patch deleted file mode 100644 index 6db685e8a..000000000 --- a/device/main/linux-purism-librem5/0004-arm64-dts-imx8mq-disable-SuperSpeed-instances-in-par.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 8675304fbfd15484c0ff9ecb7572596bf49449d2 Mon Sep 17 00:00:00 2001 -From: Clayton Craft -Date: Sun, 25 Apr 2021 18:57:45 -0700 -Subject: [PATCH] arm64: dts: imx8mq: disable SuperSpeed instances in park mode - -This seem to have solved the issue of the modem disappearing completely -during a usb reset (though doesn't seem to do anything for the resets -themselves). - -This change was suggested by Martin Kepplinger in -https://source.puri.sm/Librem5/linux-next/-/issues/197#note_114221 ---- - arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi b/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi -index 8b3d310f976d..8d346cfdfa07 100644 ---- a/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi -+++ b/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi -@@ -1706,6 +1706,7 @@ &usb_dwc3_1 { - status = "okay"; - #address-cells = <1>; - #size-cells = <0>; -+ snps,parkmode-disable-ss-quirk; - - /* Microchip USB2642 */ - hub@1 { --- -2.31.1 - diff --git a/device/main/linux-purism-librem5/APKBUILD b/device/main/linux-purism-librem5/APKBUILD index a4e7b8714..58511894b 100644 --- a/device/main/linux-purism-librem5/APKBUILD +++ b/device/main/linux-purism-librem5/APKBUILD @@ -2,9 +2,9 @@ # Maintainer: Clayton Craft # Co-Maintainer: Bhushan Shah pkgname=linux-purism-librem5 -pkgver=5.13.1 -pkgrel=1 -_purismrel=1 +pkgver=5.13.19 +pkgrel=0 +_purismrel=3 # . _purismver=${pkgver}pureos$_purismrel pkgdesc="Purism Librem 5 phone kernel fork" @@ -40,7 +40,6 @@ source=" 0001-bq25890_charger-enter-ship-mode-on-power-off.patch 0002-arm64-dts-imx8mq-librem5.dtsi-adjust-the-usdhc-bus-s.patch 0003-imx8mq-librem5-r3-Set-the-CPU-voltage-to-1.0V-when-r.patch - 0004-arm64-dts-imx8mq-disable-SuperSpeed-instances-in-par.patch $_config " builddir="$srcdir/$_repository-pureos-$_purismver" @@ -80,10 +79,9 @@ dev() { INSTALL_HDR_PATH="$subpkgdir"/usr } sha512sums=" -25d0f7e5b593d9091d75599ddc7d4d891f01a28747faf3d129f309d6378c34d5cf4b37eeb1a2c05f60eb01129067c0f66e459c7362c5275a94209cd5af7027b8 linux-purism-librem5-5.13.1pureos1.tar.gz +1d34bbf8bf7202dcf6bc2d90855785d2cc69f41e4d8f387663006ee13eb60f49ce7717ddf7807204cb0287cdb7220fa0bd2ff6561b8121136adb9e3b56d39a32 linux-purism-librem5-5.13.19pureos3.tar.gz 0e3caf6275247e31b874b94330dc4f991837a4b62f3c15a1f8ad39a7edd02ae499679bcd7ddc9463bb1c1a5073ea5980fa144a2ece804d72a6b2fc8c76c50766 0001-bq25890_charger-enter-ship-mode-on-power-off.patch 1dbf2adaf097bcce3ee179cd6b0f10d2ebefdc82191d34fffea8cb336c9dcbc66b717bf97a2e264b8068f178c0254f2b1281a09ae72d4825fd7b4a39916c0461 0002-arm64-dts-imx8mq-librem5.dtsi-adjust-the-usdhc-bus-s.patch c52f9e7e17f876697000a0c3b959a0d571ca506ba55ee5158e30ac00e148372097c88951a354190f669137a955405c87042a925c1bbe3cd91df40721650d45d3 0003-imx8mq-librem5-r3-Set-the-CPU-voltage-to-1.0V-when-r.patch -0c6c92bf99ab4e45f623bf06d6f49b047556c4431e5bc416e9f5055a0b4d1a073b8e4e4c1c68435cd502defb42e4f77184de4f22ea834b2cbeeb17d64295a971 0004-arm64-dts-imx8mq-disable-SuperSpeed-instances-in-par.patch -022b85f0fedd2b6d906b69335ed877d40758c8973a486e1af7dee8a7f7216caa39b00b5c5d883fb605d6aef6f402fa841bcc742c93dfd19b2821ee3eda57cd2e config-purism-librem5.aarch64 +efff8d52c3444a61a7b4de8083525b0b259fbd1caa2da82934f47120b4afc55d7f4dc78f05edb58c80bf572e387429331e44c31b0b6dfa3cea30a9b55b9ab03a config-purism-librem5.aarch64 " diff --git a/device/main/linux-purism-librem5/config-purism-librem5.aarch64 b/device/main/linux-purism-librem5/config-purism-librem5.aarch64 index 25dd34cc4..adbce23a5 100644 --- a/device/main/linux-purism-librem5/config-purism-librem5.aarch64 +++ b/device/main/linux-purism-librem5/config-purism-librem5.aarch64 @@ -1,15 +1,15 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.13.1 Kernel Configuration +# Linux/arm64 5.13.19 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 10.3.1_git20210625) 10.3.1 20210625" +CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.3.1_git20211027) 10.3.1 20211027" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=100301 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=23502 +CONFIG_AS_VERSION=23700 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=23502 +CONFIG_LD_VERSION=23700 CONFIG_LLD_VERSION=0 CONFIG_CC_HAS_ASM_GOTO=y CONFIG_CC_HAS_ASM_INLINE=y @@ -2292,7 +2292,11 @@ CONFIG_REDPINE_COEX_MODE=y # CONFIG_USB_NET_RNDIS_WLAN is not set # CONFIG_VIRT_WIFI is not set # CONFIG_WAN is not set +# +# Wireless WAN +# # CONFIG_WWAN is not set +# end of Wireless WAN # CONFIG_VMXNET3 is not set # CONFIG_NETDEVSIM is not set # CONFIG_NET_FAILOVER is not set @@ -2962,6 +2966,7 @@ CONFIG_CHARGER_BQ25890=m # CONFIG_CHARGER_SMB347 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set # CONFIG_BATTERY_GOLDFISH is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_CHARGER_RT9455 is not set # CONFIG_CHARGER_UCS1002 is not set # CONFIG_CHARGER_BD99954 is not set @@ -3408,6 +3413,7 @@ CONFIG_VIDEO_V4L2_I2C=y CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +CONFIG_V4L2_H264=m CONFIG_V4L2_MEM2MEM_DEV=m # CONFIG_V4L2_FLASH_LED_CLASS is not set CONFIG_V4L2_FWNODE=m @@ -3416,6 +3422,11 @@ CONFIG_V4L2_FWNODE=m # # Media controller options # +CONFIG_MEDIA_CONTROLLER_REQUEST_API=y + +# +# Please notice that the enabled Media controller Request API is EXPERIMENTAL +# # end of Media controller options # @@ -3613,7 +3624,7 @@ CONFIG_VIDEO_S5K3L6XX=m # # CONFIG_VIDEO_AD5820 is not set # CONFIG_VIDEO_AK7375 is not set -# CONFIG_VIDEO_DW9714 is not set +CONFIG_VIDEO_DW9714=m # CONFIG_VIDEO_DW9768 is not set # CONFIG_VIDEO_DW9807_VCM is not set # end of Lens drivers @@ -4397,8 +4408,8 @@ CONFIG_I2C_HID_CORE=m CONFIG_USB_OHCI_LITTLE_ENDIAN=y CONFIG_USB_SUPPORT=y -CONFIG_USB_COMMON=m -# CONFIG_USB_LED_TRIG is not set +CONFIG_USB_COMMON=y +CONFIG_USB_LED_TRIG=y CONFIG_USB_ULPI_BUS=m # CONFIG_USB_CONN_GPIO is not set CONFIG_USB_ARCH_HAS_HCD=y @@ -4434,7 +4445,7 @@ CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_TT_NEWSCHED=y CONFIG_USB_EHCI_PCI=m # CONFIG_USB_EHCI_FSL is not set -CONFIG_USB_EHCI_HCD_PLATFORM=m +# CONFIG_USB_EHCI_HCD_PLATFORM is not set # CONFIG_USB_OXU210HP_HCD is not set # CONFIG_USB_ISP116X_HCD is not set # CONFIG_USB_FOTG210_HCD is not set @@ -4482,8 +4493,8 @@ CONFIG_USB_UAS=m # # USB Imaging devices # -# CONFIG_USB_MDC800 is not set -# CONFIG_USB_MICROTEK is not set +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m CONFIG_USBIP_CORE=m CONFIG_USBIP_VHCI_HCD=m CONFIG_USBIP_VHCI_HC_PORTS=8 @@ -4645,6 +4656,7 @@ CONFIG_USB_F_ACM=m CONFIG_USB_F_SS_LB=m CONFIG_USB_U_SERIAL=m CONFIG_USB_U_ETHER=m +CONFIG_USB_U_AUDIO=m CONFIG_USB_F_SERIAL=m CONFIG_USB_F_OBEX=m CONFIG_USB_F_NCM=m @@ -4654,6 +4666,8 @@ CONFIG_USB_F_SUBSET=m CONFIG_USB_F_RNDIS=m CONFIG_USB_F_MASS_STORAGE=m CONFIG_USB_F_FS=m +CONFIG_USB_F_UAC1=m +CONFIG_USB_F_UAC2=m CONFIG_USB_F_UVC=m CONFIG_USB_F_MIDI=m CONFIG_USB_F_HID=m @@ -4670,9 +4684,9 @@ CONFIG_USB_CONFIGFS_EEM=y CONFIG_USB_CONFIGFS_MASS_STORAGE=y CONFIG_USB_CONFIGFS_F_LB_SS=y CONFIG_USB_CONFIGFS_F_FS=y -# CONFIG_USB_CONFIGFS_F_UAC1 is not set +CONFIG_USB_CONFIGFS_F_UAC1=y # CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set -# CONFIG_USB_CONFIGFS_F_UAC2 is not set +CONFIG_USB_CONFIGFS_F_UAC2=y CONFIG_USB_CONFIGFS_F_MIDI=y CONFIG_USB_CONFIGFS_F_HID=y CONFIG_USB_CONFIGFS_F_UVC=y @@ -5127,7 +5141,8 @@ CONFIG_STAGING=y # CONFIG_FB_SM750 is not set CONFIG_STAGING_MEDIA=y -# CONFIG_VIDEO_HANTRO is not set +CONFIG_VIDEO_HANTRO=m +CONFIG_VIDEO_HANTRO_IMX8M=y # CONFIG_VIDEO_IMX_MEDIA is not set # CONFIG_VIDEO_ZORAN is not set @@ -5141,6 +5156,7 @@ CONFIG_ASHMEM=y # CONFIG_LTE_GDM724X is not set # CONFIG_GS_FPGABOOT is not set # CONFIG_UNISYSSPAR is not set +# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set # CONFIG_FB_TFT is not set # CONFIG_KS7010 is not set # CONFIG_PI433 is not set @@ -5849,9 +5865,7 @@ CONFIG_IMX_INTMUX=y # CONFIG_IPACK_BUS is not set CONFIG_RESET_CONTROLLER=y -# CONFIG_RESET_BRCMSTB_RESCAL is not set CONFIG_RESET_IMX7=y -# CONFIG_RESET_INTEL_GW is not set # CONFIG_RESET_TI_SYSCON is not set # @@ -6274,7 +6288,7 @@ CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y # CONFIG_INTEGRITY is not set # CONFIG_DEFAULT_SECURITY_APPARMOR is not set CONFIG_DEFAULT_SECURITY_DAC=y -CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity,bpf" +CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity,bpf" # # Kernel hardening options