From 5943517ffe159ab35c48bb3d3dff86b4246b9c7b Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Tue, 16 Feb 2021 14:18:24 -0800 Subject: [PATCH] device-purism-librem5: upgrade to 1.13 (MR 1960) Main change is librem5-base v35, upstream changelog: https://source.puri.sm/Librem5/librem5-base/-/commit/89c9c55defcd26353fa63de67a10d4695f6bdf3b Removed a dtb in the deviceinfo that is no longer generated on newer kernels --- .../community/device-purism-librem5/APKBUILD | 10 +- .../device-purism-librem5/deviceinfo | 2 +- .../librem5-base-ucm2.patch | 219 ------------------ 3 files changed, 5 insertions(+), 226 deletions(-) delete mode 100644 device/community/device-purism-librem5/librem5-base-ucm2.patch diff --git a/device/community/device-purism-librem5/APKBUILD b/device/community/device-purism-librem5/APKBUILD index e5f4b9f53..0da6d8fe7 100644 --- a/device/community/device-purism-librem5/APKBUILD +++ b/device/community/device-purism-librem5/APKBUILD @@ -2,8 +2,9 @@ # Maintainer: Clayton Craft pkgname=device-purism-librem5 pkgdesc="Purism Librem 5 Phone" -pkgver=1.12 +pkgver=1.13 pkgrel=0 +_confver=35 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -20,7 +21,6 @@ depends=" uboot-tools " makedepends="devicepkg-dev" -_confver=33 builddir=$srcdir/librem5-base-pureos-$_confver source=" https://source.puri.sm/Librem5/librem5-base/-/archive/pureos/$_confver/librem5-base-pureos-$_confver.tar.gz @@ -29,7 +29,6 @@ source=" 77-mm-broadmobi-port-types.rules deviceinfo flash_script.lst - librem5-base-ucm2.patch librem5-shipmode.initd modprobe.d_rsi.conf modules-load.d_librem5.conf @@ -100,13 +99,12 @@ package() { devicepkg_package $startdir $pkgname } -sha512sums="e89e75480bda1150e11579faba78058b15824adaaa67e199909583c67d3e519916fed783743f0e510abe3fd571610c7a3f26a9bd2008e85f1eafb114e9ffe652 librem5-base-pureos-33.tar.gz +sha512sums="1c1b5074982f622cdfc22ead07dfdccb2cadf0eaa9700947161d779c7d05e9caa7e4016e4324345d4062e2de66673321cf909314f9ca841ada87cb0cdaec2997 librem5-base-pureos-35.tar.gz 5e0536a53ba5a33af6ddff3a5f5d866c09ae54dd6754e6b17e61fde0b141b3165379a598de562c89568a1de9ae9ae03a4f876c53002b87f09d7b56013345ab27 00-mesa.sh 8b6fa7b12c15f439c561901f3ffe24a1ef2a0c343401c0a79281060854ab29e08a1fb5e7adae8684b12aa9f535ed99e2dad993dce9724822cb0fbf2497dd86e5 70-wifi-pm.rules 00355d9ad085a77e157f3c62eb4f1bcac2823d3b341e34d1128edbfb1444fba83e8eacd263ea61da9f6d853f1328ab7fbe5ea63bd08c8a1bc9b8eaf44ae1f1c6 77-mm-broadmobi-port-types.rules -db7708ea7d34fc877aacdd249403ea5468d652bdf65ffa41f2f0471f3c4dcc9db9af743dfd792f3a21db721ecc040152f7ea8b76912556088a22a99e2bfd370f deviceinfo +73bc79b6ed1db6a8f581d18ae529f3ebfa2bd86f6b24ec1a9e12f8ddd657480eabfe554996636ef68a31477b8bfdfb2378bf8c03f1293196496683c195f78598 deviceinfo d033df2b9125622c946af67dad83070473c86937b5825f57ad272c9145b594071dd6913949127803c45af4ea3226526551718d40739f9f1ee4bfe6446e62c856 flash_script.lst -35e7a1ca1e1924878fcb377d22508d8fbd5fc81398c117259e40c0ba4b86d76b019f352d73e7d201dfb9ceb304fe1e2e3d2f7fc4a3cd06ddd6cd6e2c3f848057 librem5-base-ucm2.patch 76b06cc1ac82c3fc0e298c9d7d5c9139624b1269bf846fe3bc07b9af877d882362b60ba90028ad3182cb1d6426aacdb560fe060b026778a56e7f038d495eadd4 librem5-shipmode.initd 9dc018f0de523cbfe5a49cbe831aa30e975a8dd34635197bb52582f072ac356ef2c02223fc794d970380091a69a83a74c3fbe34520190c8536e77f9ea98c7659 modprobe.d_rsi.conf a0740e405781ec6ef765fdc9f5700c95adbb241c45c97b9384ba68cdece662cb216ca5918640042f6e65a5d1b1a9099936382c99b49a44303f7b6d77a075a471 modules-load.d_librem5.conf diff --git a/device/community/device-purism-librem5/deviceinfo b/device/community/device-purism-librem5/deviceinfo index 95b0863f6..f211f78d3 100644 --- a/device/community/device-purism-librem5/deviceinfo +++ b/device/community/device-purism-librem5/deviceinfo @@ -6,7 +6,7 @@ deviceinfo_name="Purism Librem 5 Phone" deviceinfo_manufacturer="Purism" deviceinfo_codename="purism-librem5" deviceinfo_year="2019" -deviceinfo_dtb="freescale/imx8mq-librem5 freescale/imx8mq-librem5-r2 freescale/imx8mq-librem5-r3 freescale/imx8mq-librem5-r4" +deviceinfo_dtb="freescale/imx8mq-librem5-r2 freescale/imx8mq-librem5-r3 freescale/imx8mq-librem5-r4" deviceinfo_append_dtb="false" deviceinfo_modules_initfs="phy_fsl_imx8mq_usb dwc3 udc_core xhci_hcd xhci_plat_hcd tps6598x libcomposite goodix edt-ft5x06 led_bl pwm_vibra gpio_vibra" deviceinfo_arch="aarch64" diff --git a/device/community/device-purism-librem5/librem5-base-ucm2.patch b/device/community/device-purism-librem5/librem5-base-ucm2.patch deleted file mode 100644 index 78b96b39d..000000000 --- a/device/community/device-purism-librem5/librem5-base-ucm2.patch +++ /dev/null @@ -1,219 +0,0 @@ -diff --git a/debian/librem5-base-defaults.install b/debian/librem5-base-defaults.install -index 067ba03..ce68610 100644 ---- a/debian/librem5-base-defaults.install -+++ b/debian/librem5-base-defaults.install -@@ -5,7 +5,7 @@ default/adwaita-phone.jpg usr/share/librem5/default-theme/ - # Audio configuration - default/audio/pulse etc/ - default/audio/profile-sets usr/share/pulseaudio/alsa-mixer/ --default/audio/ucm usr/share/alsa/ -+default/audio/ucm2 usr/share/alsa/ - - - default/sm.puri.OSK0.desktop usr/share/applications/ -diff --git a/default/audio/pulse/librem5.pa b/default/audio/pulse/librem5.pa -index e96de9a..f87d8f5 100644 ---- a/default/audio/pulse/librem5.pa -+++ b/default/audio/pulse/librem5.pa -@@ -14,9 +14,9 @@ load-module module-alsa-card device_id="MODEM" name="platform-sound-wwan" card_p - - .ifexists /sys/devices/platform/sound/308b0000.sai-wm8962 - set-card-profile alsa_card.platform-sound HiFi --set-default-sink alsa_output.platform-sound.HiFi__hw_CARD_wm8962__sink --set-default-source alsa_input.platform-sound.HiFi__hw_CARD_wm8962__source --update-source-proplist alsa_input.platform-sound.HiFi__hw_CARD_wm8962__source filter.apply.echo-cancel.parameters="aec_args=\"analog_gain_control=0\" use_master_format=yes channels=1" -+set-default-sink alsa_output.platform-sound.HiFi__hw_wm8962_0__sink -+set-default-source alsa_output.platform-sound.HiFi__hw_wm8962_0__source -+update-source-proplist alsa_input.platform-sound.HiFi__hw_wm8962_0__source filter.apply.echo-cancel.parameters="aec_args=\"analog_gain_control=0\" use_master_format=yes channels=1" - .endif - - # cork/mute audio streams when on a phone call -diff --git a/default/audio/ucm/wm8962/HiFi.conf b/default/audio/ucm2/wm8962/HiFi.conf -similarity index 81% -rename from default/audio/ucm/wm8962/HiFi.conf -rename to default/audio/ucm2/wm8962/HiFi.conf -index 122484b..d88fa99 100644 ---- a/default/audio/ucm/wm8962/HiFi.conf -+++ b/default/audio/ucm2/wm8962/HiFi.conf -@@ -1,6 +1,5 @@ - SectionVerb { - EnableSequence [ -- cdev "hw:wm8962" - cset "name='Digital Playback Volume' 100,100" - cset "name='MIXINL IN2L Switch' off" - cset "name='MIXINL IN3L Switch' off" -@@ -16,11 +15,13 @@ SectionVerb { - cset "name='INPGAL IN4L Switch' off" - cset "name='Input Mixer Switch' off,on" - cset "name='SPKOUTL PGA' Mixer" -+ cset "name='Speaker Volume', on" -+ cset "name='Headphone Volume', off" -+ cset "name='Digital Capture Volume', off" - cset "name='SPKOUTR PGA' Mixer" - ] - - DisableSequence [ -- cdev "hw:wm8962" - cset "name='Digital Playback Volume' 0,0" - ] - -@@ -29,7 +30,7 @@ SectionVerb { - } - } - --SectionDevice."Handset".0 { -+SectionDevice."Handset" { - Comment "Handset" - - ConflictingDevice [ -@@ -38,7 +39,6 @@ SectionDevice."Handset".0 { - ] - - EnableSequence [ -- cdev "hw:wm8962" - cset "name='Speaker Switch' off,on" - cset "name='DAC L/R Swap Switch' on" - cset "name='DAC Monomix Switch' on" -@@ -48,7 +48,6 @@ SectionDevice."Handset".0 { - ] - - DisableSequence [ -- cdev "hw:wm8962" - cset "name='Speaker Switch' off,off" - cset "name='DAC L/R Swap Switch' off" - cset "name='DAC Monomix Switch' off" -@@ -58,13 +57,12 @@ SectionDevice."Handset".0 { - Value { - PlaybackChannels "2" - PlaybackPriority "100" -- PlaybackVolume "name='Speaker Volume'" - PlaybackSwitch "name='Speaker Switch'" -- PlaybackPCM "hw:CARD=wm8962" -+ PlaybackPCM "hw:${CardId},0" - } - } - --SectionDevice."Speaker".0 { -+SectionDevice."Speaker" { - Comment "Speaker" - - ConflictingDevice [ -@@ -73,7 +71,6 @@ SectionDevice."Speaker".0 { - ] - - EnableSequence [ -- cdev "hw:wm8962" - cset "name='Speaker Switch' on,off" - cset "name='DAC Monomix Switch' on" - cset "name='SPKOUTL PGA' DAC" -@@ -82,7 +79,6 @@ SectionDevice."Speaker".0 { - ] - - DisableSequence [ -- cdev "hw:wm8962" - cset "name='Speaker Switch' off,off" - cset "name='DAC Monomix Switch' off" - cset "name='SPKOUTL PGA' Mixer" -@@ -91,13 +87,32 @@ SectionDevice."Speaker".0 { - Value { - PlaybackChannels "2" - PlaybackPriority "500" -- PlaybackVolume "name='Speaker Volume'" - PlaybackSwitch "name='Speaker Switch'" -- PlaybackPCM "hw:CARD=wm8962" -+ PlaybackPCM "hw:${CardId},0" - } - } - --SectionDevice."Headphones".0 { -+SectionDevice."Mic" { -+ Comment "Internal Microphone" -+ -+ EnableSequence [ -+ cset "name='Digital Capture Volume' 116,116" -+ cset "name='ADC L/R Swap Switch' on" -+ ] -+ -+ DisableSequence [ -+ cset "name='Digital Capture Volume' 0,0" -+ cset "name='ADC L/R Swap Switch' off" -+ ] -+ -+ Value { -+ CapturePriority "500" -+ CaptureChannels "2" -+ CapturePCM "hw:${CardId},0" -+ } -+} -+ -+SectionDevice."Headphones" { - Comment "Headphones" - - ConflictingDevice [ -@@ -106,7 +121,6 @@ SectionDevice."Headphones".0 { - ] - - EnableSequence [ -- cdev "hw:wm8962" - cset "name='Headphone Switch' on,on" - cset "name='HPOUTL PGA' 0 unmute" - cset "name='HPOUTR PGA' 0 unmute" -@@ -115,7 +129,6 @@ SectionDevice."Headphones".0 { - ] - - DisableSequence [ -- cdev "hw:wm8962" - cset "name='Headphone Switch' off off" - cset "name='HPOUTL PGA' 0 mute" - cset "name='HPOUTR PGA' 0 mute" -@@ -124,36 +137,8 @@ SectionDevice."Headphones".0 { - Value { - PlaybackPriority "1000" - PlaybackChannels "2" -- PlaybackVolume "name='Headphone Volume'" - PlaybackSwitch "name='Headphone Switch'" -- PlaybackPCM "hw:CARD=wm8962" -+ PlaybackPCM "hw:${CardId},0" - JackControl "Headphones Jack" - } - } -- --SectionDevice."Mic".0 { -- Comment "Internal Microphone" -- -- ConflictingDevice [ -- "Headset" -- ] -- -- EnableSequence [ -- cdev "hw:wm8962" -- cset "name='Digital Capture Volume' 116,116" -- cset "name='ADC L/R Swap Switch' on" -- ] -- -- DisableSequence [ -- cdev "hw:wm8962" -- cset "name='Digital Capture Volume' 0,0" -- cset "name='ADC L/R Swap Switch' off" -- ] -- -- Value { -- CapturePriority "500" -- CaptureChannels "2" -- CaptureVolume "name='Digital Capture Volume'" -- CapturePCM "hw:CARD=wm8962" -- } --} -diff --git a/default/audio/ucm/wm8962/wm8962.conf b/default/audio/ucm2/wm8962/wm8962.conf -similarity index 91% -rename from default/audio/ucm/wm8962/wm8962.conf -rename to default/audio/ucm2/wm8962/wm8962.conf -index ebdc11f..d4b95d8 100644 ---- a/default/audio/ucm/wm8962/wm8962.conf -+++ b/default/audio/ucm2/wm8962/wm8962.conf -@@ -1,3 +1,5 @@ -+Syntax 2 -+ - Comment "WM8962 Codec for Librem 5 Phone" - - SectionUseCase."HiFi" {