cross/musl-aarch64/APKBUILD

@@ -3,7 +3,7 @@
 
 pkgname="musl-aarch64"
 pkgver="1.1.24"
-pkgrel=3
+pkgrel=4
 arch="armhf armv7 x86_64 x86"
 subpackages="musl-dev-aarch64:package_dev"
 
@@ -50,5 +50,5 @@ package_dev() {
     done
 }
 
-sha512sums="aaa4e4e5c2cd1332a3452a97e72bdfde02fba6fa14ae300860b032b673d9ba8e172f2f7fe03fcc4b3847a2f2926459581637d3a1bd9d18551874e6bf1ee22bdc  musl-1.1.24-r3-aarch64.apk
-a5255fd83245ea4e1252efee715a2630ea695c9d6e3c0b2a618c613384a2176ac3ae63c3156150b161eb35c4a08dadd72273afedca5a4a1d01d01d1484ef0963  musl-dev-1.1.24-r3-aarch64.apk"
+sha512sums="a00f98bab2859d1e42f05ec5aa62459e109dd460cbe6f6e7841e843ecf27893b72c4f0c0765cd502ec123332f62e3bdb193646ef0cbbf86bde81a168696ac150  musl-1.1.24-r4-aarch64.apk
+080933d8df0e3ab88d609b9a6716bed02394a377a03942b70bbd1eaff0043db753741cab6e358c33619ce6ed16d2b4ab39ba2051df62956a11c6dac982137015  musl-dev-1.1.24-r4-aarch64.apk"

cross/musl-armhf/APKBUILD

@@ -3,7 +3,7 @@
 
 pkgname="musl-armhf"
 pkgver="1.1.24"
-pkgrel=3
+pkgrel=4
 arch="armv7 aarch64 x86_64 x86"
 subpackages="musl-dev-armhf:package_dev"
 
@@ -50,5 +50,5 @@ package_dev() {
     done
 }
 
-sha512sums="ad875edba1fab32cba1ada4dae1d1101fda252d194b05bdb4d49ea580a73a66cf90b27f1f0b9d8cfbe682d786b137b9018029e1ed09f499690da344c52fc4944  musl-1.1.24-r3-armhf.apk
-3a03db521d8129bc0a443ffbf182a363a8917d92ecf739cf0abcef8d33ec716eb3f6baa8c656f34a0bd87069f9a680e7659d4086e3a301fce4b35229ce38d73c  musl-dev-1.1.24-r3-armhf.apk"
+sha512sums="4e3a54292e15f0f4aacabedc52581f468dbfa31a0552e74e3c8f132d595b1805ce7ace21ee61bda62ffba7bd6e509c5aa31430ab16ebe363badedaa3a653b99b  musl-1.1.24-r4-armhf.apk
+c45c3632a767ed69ca8f3146b3fe3254e6005b52491beb8dcf9490f61945c726a072ffd8f20207217c8275077895030d8c7f1724453a181361a8529d44f00c04  musl-dev-1.1.24-r4-armhf.apk"

cross/musl-armv7/APKBUILD

@@ -3,7 +3,7 @@
 
 pkgname="musl-armv7"
 pkgver="1.1.24"
-pkgrel=3
+pkgrel=4
 arch="armhf aarch64 x86_64 x86"
 subpackages="musl-dev-armv7:package_dev"
 
@@ -50,5 +50,5 @@ package_dev() {
     done
 }
 
-sha512sums="9162fb161355b30cac2d65bc3d0231d44fc9013bb756eb4cd90c121bbc54646e423b02c4ca31174d183f3af8da52ed9362cdd0c5e346ae3c38efb71aec95ec3d  musl-1.1.24-r3-armv7.apk
-dca54ef48cdac2e20f596ceb308a347a7393aa9085566589fb35f4ed66e4fdb8ef151d024d30f6a84410ed71715248657e4e282e333fdfbc73437c75cfd0ecff  musl-dev-1.1.24-r3-armv7.apk"
+sha512sums="ca40b8b3132a49edec46bb9c73b19275402bdd1064b1809ba4a1560f62458e7144748ab9dc5c70755073a7121bd73e6c45e8083e52e7f9bbc987c2547a4819c3  musl-1.1.24-r4-armv7.apk
+8107211e103eb782659bc5079bf7a0334838d8b7bd2be3f06559939b5db8d5a63797c5cee328497e41cfc3d502c8f4c13e0b7f4bccddbab1fd55243ea0f04b69  musl-dev-1.1.24-r4-armv7.apk"

device/testing/device-pine64-pinephone/APKBUILD

@@ -3,7 +3,7 @@
 pkgname="device-pine64-pinephone"
 pkgdesc="PINE64 PinePhone"
 pkgver=0.2
-pkgrel=5
+pkgrel=6
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -78,7 +78,7 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 sha512sums="89516a6fd13ae8fd9bfab7fabc5320a7fafdb8ca9b8c2a3dec173d3ef781c5f9d64cca4333f79503d6bdc8154569fe1b8b48d2acd195bade574d035a9b8edef8  deviceinfo
-35a5ce7c18747e4363c6b310a1c33143f333a9dd2031d619dee10773d499329487a5ed76749e182d56829d03511266a54890cfa706ba21565e9ba8ffdb88f872  uboot-script.cmd
+35d760c53dfc16a1b54d40a686ae4b5494245dd69a3c668e30499bf3b0bd6d06144a02ba8caf3a35bebb319bd24baa4fadfdd8f846e393bbe7ca8bb048f737b0  uboot-script.cmd
 f4b5509fd6a8b23f3667f5e7262b3a19c607a37cb9eaf7d0e93eb826d45c26ec12df4810879bacb8e4042bb83cc80b2b436224c8d47b6d67361369a724bbf7ee  sysrq.conf
 c4c57d1627dd451213e1ef20d89de9266cd4edcc2d33a69aa9a1f13e16d9f9742036b69dc149fd910d7213f7525c41eb79576d4457bc85cc96eba0d986382d27  weston.ini
 3dd6d612c381cb0002049d1974d8fb5aa5a53a1eb4d6bcbf62eb2ad52cfdc45f0f6ad24a699716d3513b0371aa1316f25dc72afc10d7176cc3b99d0965c3f030  hwtest.ini

device/testing/device-pine64-pinephone/uboot-script.cmd

+gpio set 98
 gpio set 114
 
 if test ${mmc_bootdev} -eq 0 ; then
@@ -29,4 +30,5 @@ fdt resize
 
 echo Booting kernel
 gpio set 116
+gpio clear 98
 booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}

device/testing/device-purism-librem5/APKBUILD

 # Reference: <https://postmarketos.org/devicepkg>
-pkgname="device-purism-librem5"
+# Contributor: Clayton Craft <clayton@craftyguy.net>
+# Maintainer:  Clayton Craft <clayton@craftyguy.net>
+pkgname=device-purism-librem5
 pkgdesc="Purism Librem 5 Phone"
-pkgver=1.0
-pkgrel=1
+pkgver=1.1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base
-	linux-purism-librem5
-	uboot-tools
-	u-boot-librem5
+depends="
 	gpsd
+	linux-purism-librem5
 	mesa-git-dri-gallium
-	ofono
+	postmarketos-base
+	u-boot-librem5
+	uboot-tools
 "
 makedepends="devicepkg-dev"
+_confver=16
+_confdir=$srcdir/librem5-base-v$_confver
 source="
+	https://source.puri.sm/Librem5/librem5-base/-/archive/v$_confver/librem5-base-v$_confver.tar.gz
 	deviceinfo
 	uboot-script.cmd
 	modprobe.d_rsi.conf
@@ -24,7 +29,11 @@ source="
 	00-kwin.sh
 	flash_script.lst
 "
-subpackages="$pkgname-plasma"
+subpackages="
+	$pkgname-plasma
+	$pkgname-phosh
+	$pkgname-pulseaudio
+"
 install="$pkgname.post-install"
 
 build() {
@@ -33,20 +42,48 @@ build() {
 }
 
 plasma() {
+	pkgdesc="Plasma Mobile support for the Librem 5"
 	install_if="$pkgname kwin"
-	install -D -m644 "$srcdir/00-kwin.sh" "$subpkgdir/etc/profile.d/00-kwin.sh"
+	install -D -m644 "$srcdir"/00-kwin.sh "$subpkgdir"/etc/profile.d/00-kwin.sh
+}
+
+phosh() {
+	pkgdesc="Phosh support for the Librem 5"
+	install_if="$pkgname phosh"
+	depends="
+		wys
+	"
+	install -D -m644 "$_confdir"/default/org.freedesktop.ModemManager1.pkla \
+		"$subpkgdir"/var/lib/polkit-1/localauthority/10-vendor.d/org.freedesktop.ModemManager1.pkla
+}
+
+pulseaudio() {
+	pkgdesc="Pulseaudio support for the Librem 5"
+	install_if="$pkgname pulseaudio"
+	# install config files from upstream Purism
+	mkdir -p "$subpkgdir"/etc/pulse/
+	cp -r "$_confdir"/default/audio/pulse/daemon.conf.d "$subpkgdir"/etc/pulse/
+	install -D -m644 "$_confdir"/default/audio/pulse/librem5.pa "$subpkgdir"/etc/pulse/librem5.pa
+	mkdir -p "$subpkgdir"/usr/share/pulseaudio/alsa-mixer
+	cp -r "$_confdir"/default/audio/profile-sets "$subpkgdir"/usr/share/pulseaudio/alsa-mixer/
+	mkdir -p "$subpkgdir"/usr/share/alsa/ucm
+	cp -r "$_confdir"/default/audio/ucm "$subpkgdir"/usr/share/alsa/
 }
 
 package() {
 	install -D -m644 "$srcdir"/boot.scr \
 		"$pkgdir"/boot/boot.scr
-	install -D -m644 "$srcdir/modprobe.d_rsi.conf" "$pkgdir/etc/modprobe.d/rsi.conf"
-	install -D -m644 "$srcdir/00-mesa.sh" "$pkgdir/etc/profile.d/00-mesa.sh"
-	install -D -m644 "$srcdir/flash_script.lst" "$pkgdir/usr/share/uuu/flash_script.lst"
+	install -D -m644 "$srcdir"/modprobe.d_rsi.conf "$pkgdir"/etc/modprobe.d/rsi.conf
+	install -D -m644 "$srcdir"/00-mesa.sh "$pkgdir"/etc/profile.d/00-mesa.sh
+	install -D -m644 "$srcdir"/flash_script.lst "$pkgdir"/usr/share/uuu/flash_script.lst
+	install -D -m644 "$_confdir"/default/hwdb/80-librem5.hwdb "pkgdir"/lib/udev/hwdb.d/80-librem5.hwdb
+	install -D -m644 "$_confdir"/debian/librem5-base-defaults.librem5-pm.udev  \
+		"pkgdir"/usr/lib/udev/rules.d/librem5-base-defaults.librem5-pm.udev
+
 	devicepkg_package $startdir $pkgname
 }
-
-sha512sums="299fc7f4eb98a15adf6d7dbee4e8612110b5d6b3048848a759c06c9a76806a4316df138b86e9c6c66d73eba88417dfba82bef2ae5a5c37ff562871f8b52b48e5  deviceinfo
+sha512sums="d93aded121b830b5b7006166d3f8cd2efadc2fa454540d653e3f1cb8f009ffb7973a4037a62a47062f6f95f8bbbe546d8e72600a5dcded4eb7be78a7e6d35d02  librem5-base-v16.tar.gz
+299fc7f4eb98a15adf6d7dbee4e8612110b5d6b3048848a759c06c9a76806a4316df138b86e9c6c66d73eba88417dfba82bef2ae5a5c37ff562871f8b52b48e5  deviceinfo
 3bc45540000e438e525501b2e816282d778fca10d426e42c9a80c0e752618ce50deb12c3edd9f3edc52edd8eb229d16afae7d407fe2c4ba0dbfefbcb4214780c  uboot-script.cmd
 9dc018f0de523cbfe5a49cbe831aa30e975a8dd34635197bb52582f072ac356ef2c02223fc794d970380091a69a83a74c3fbe34520190c8536e77f9ea98c7659  modprobe.d_rsi.conf
 5fdf45859f2bb154bcfe7c7341de4d5b239ef43d3f865e30456af073a8ee9d6682515c7e1dd52ddbe3969669d60689ba93c08ead32aadcfb164ff72a02b2e1a4  00-mesa.sh

device/testing/device-purism-librem5/device-purism-librem5.post-install

@@ -4,5 +4,3 @@
 rc-update add gpsd default
 sed -i 's/DEVICE=\"\"/DEVICE=\"\/dev\/ttymxc2\"/' /etc/conf.d/gpsd
 sed -i 's/BAUDRATE=\"4800\"/BAUDRATE=\"9600\"/' /etc/conf.d/gpsd
-
-rc-update add ofono default

device/testing/device-purism-librem5dev/APKBUILD

 # Reference: <https://postmarketos.org/devicepkg>
 # Contributor: Clayton Craft <clayton@craftyguy.net>
-pkgname="device-purism-librem5dev"
+# Maintainer:  Clayton Craft <clayton@craftyguy.net>
+pkgname=device-purism-librem5dev
 pkgdesc="Purism Librem 5 Devkit"
-pkgver=1.0
-pkgrel=1
+pkgver=1.1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -14,10 +15,12 @@ depends="postmarketos-base
 	u-boot-librem5
 	gpsd
 	mesa-git-dri-gallium
-	ofono
 "
 makedepends="devicepkg-dev"
+_confver=16
+_confdir=$srcdir/librem5-base-v$_confver
 source="
+	https://source.puri.sm/Librem5/librem5-base/-/archive/v$_confver/librem5-base-v$_confver.tar.gz
 	deviceinfo
 	uboot-script.cmd
 	modprobe.d_rsi.conf
@@ -25,7 +28,11 @@ source="
 	00-kwin.sh
 	flash_script.lst
 "
-subpackages="$pkgname-plasma"
+subpackages="
+	$pkgname-plasma
+	$pkgname-phosh
+	$pkgname-pulseaudio
+"
 install="$pkgname.post-install"
 
 build() {
@@ -34,20 +41,47 @@ build() {
 }
 
 plasma() {
+	pkgdesc="Plasma Mobile support for the Librem 5"
 	install_if="$pkgname kwin"
 	install -D -m644 "$srcdir"/00-kwin.sh "$subpkgdir"/etc/profile.d/00-kwin.sh
 }
 
+phosh() {
+	pkgdesc="Phosh support for the Librem 5"
+	install_if="$pkgname phosh"
+	install -D -m644 "$_confdir"/default/org.freedesktop.ModemManager1.pkla \
+		"$subpkgdir"/var/lib/polkit-1/localauthority/10-vendor.d/org.freedesktop.ModemManager1.pkla
+}
+
+pulseaudio() {
+	pkgdesc="Pulseaudio support for the Librem 5"
+	install_if="$pkgname pulseaudio"
+	# install config files from upstream Purism
+	mkdir -p "$subpkgdir"/etc/pulse/
+	cp -r "$_confdir"/default/audio/pulse/daemon.conf.d "$subpkgdir"/etc/pulse/
+	install -D -m644 "$_confdir"/default/audio/pulse/librem5.pa "$subpkgdir"/etc/pulse/librem5.pa
+	mkdir -p "$subpkgdir"/usr/share/pulseaudio/alsa-mixer
+	cp -r "$_confdir"/default/audio/profile-sets "$subpkgdir"/usr/share/pulseaudio/alsa-mixer/
+	mkdir -p "$subpkgdir"/usr/share/alsa/ucm
+	cp -r "$_confdir"/default/audio/ucm "$subpkgdir"/usr/share/alsa/
+}
+
 package() {
 	install -D -m644 "$srcdir"/boot.scr \
 		"$pkgdir"/boot/boot.scr
 	install -D -m644 "$srcdir"/modprobe.d_rsi.conf "$pkgdir"/etc/modprobe.d/rsi.conf
 	install -D -m644 "$srcdir"/00-mesa.sh "$pkgdir"/etc/profile.d/00-mesa.sh
 	install -D -m644 "$srcdir"/flash_script.lst "$pkgdir"/usr/share/uuu/flash_script.lst
+	install -D -m644 "$_confdir"/default/hwdb/80-librem5.hwdb "pkgdir"/lib/udev/hwdb.d/80-librem5.hwdb
+	install -D -m644 "$_confdir"/debian/librem5-base-defaults.librem5-devkit-sgtl5000.udev \
+		"pkgdir"/usr/lib/udev/rules.d/librem5-base-defaults.librem5-devkit-sgtl5000.udev
+	install -D -m644 "$_confdir"/debian/librem5-base-defaults.librem5-pm.udev  \
+		"pkgdir"/usr/lib/udev/rules.d/librem5-base-defaults.librem5-pm.udev
+
 	devicepkg_package $startdir $pkgname
 }
-
-sha512sums="6350ff989fc1d2a0bbf98c2f0e78f7372500e0ac9f50386fcdad81a9763d9040e6a6ebc25b5539ece8536f2f0646d9ff85f7d38ca0d5b7d6847284941efbcafa  deviceinfo
+sha512sums="d93aded121b830b5b7006166d3f8cd2efadc2fa454540d653e3f1cb8f009ffb7973a4037a62a47062f6f95f8bbbe546d8e72600a5dcded4eb7be78a7e6d35d02  librem5-base-v16.tar.gz
+6350ff989fc1d2a0bbf98c2f0e78f7372500e0ac9f50386fcdad81a9763d9040e6a6ebc25b5539ece8536f2f0646d9ff85f7d38ca0d5b7d6847284941efbcafa  deviceinfo
 e4bb06e337d3f23abb0328a8e564e905ef571cdbeeefe442cbbd7e715f5a5b656d00679c48161736b3254bcba1ab39a6c99402f67bbde9838c881b1adeb360ed  uboot-script.cmd
 9dc018f0de523cbfe5a49cbe831aa30e975a8dd34635197bb52582f072ac356ef2c02223fc794d970380091a69a83a74c3fbe34520190c8536e77f9ea98c7659  modprobe.d_rsi.conf
 5fdf45859f2bb154bcfe7c7341de4d5b239ef43d3f865e30456af073a8ee9d6682515c7e1dd52ddbe3969669d60689ba93c08ead32aadcfb164ff72a02b2e1a4  00-mesa.sh

device/testing/device-purism-librem5dev/device-purism-librem5dev.post-install

@@ -4,5 +4,3 @@
 rc-update add gpsd default
 sed -i 's/DEVICE=\"\"/DEVICE=\"\/dev\/ttymxc2\"/' /etc/conf.d/gpsd
 sed -i 's/BAUDRATE=\"4800\"/BAUDRATE=\"9600\"/' /etc/conf.d/gpsd
-
-rc-update add ofono default

device/testing/device-xiaomi-whyred/APKBUILD

+# Contributor: Nikita Utkin <shockck84@gmail.com>
+# Maintainer: Nikita Utkin <shockck84@gmail.com>
+# Reference: <https://postmarketos.org/devicepkg>
+pkgname="device-xiaomi-whyred"
+pkgdesc="Xiaomi Redmi Note 5"
+pkgver=1.0
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+options="!check !archcheck"
+depends="postmarketos-base linux-xiaomi-whyred mkbootimg mesa-dri-swrast mdss-fb-init-hack"
+makedepends="devicepkg-dev"
+source="deviceinfo"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+
+sha512sums="b76241a7e5ec46b736e53e0a375b6b4bb3e342590b604512e11e760bf1bd9d3c7988ab3d35b6e5de244dc419d32952ff3b8e20c94cf07f3038a35c769b6520fa  deviceinfo"

device/testing/device-xiaomi-whyred/deviceinfo

+# Reference: <https://postmarketos.org/deviceinfo>
+# Please use double quotes only. You can source this file in shell scripts.
+
+deviceinfo_format_version="0"
+deviceinfo_name="Xiaomi Redmi Note 5"
+deviceinfo_manufacturer="Xiaomi"
+deviceinfo_codename="xiaomi-whyred"
+deviceinfo_year="2018"
+deviceinfo_dtb=""
+deviceinfo_modules_initfs=""
+deviceinfo_usb_rndis_function="rndis_bam.rndis"
+deviceinfo_arch="aarch64"
+
+# Device related
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="1080"
+deviceinfo_screen_height="2160"
+deviceinfo_dev_touchscreen=""
+deviceinfo_dev_touchscreen_calibration=""
+
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="console=ttyMSM0,115200,n8 androidboot.console=ttyMSM0 earlycon=msm_serial_dm,0xc170000 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3 lpm_levels.sleep_disabled=1 sched_enable_hmp=1 sched_enable_power_aware=1 service_locator.enable=1 swiotlb=1 androidboot.configfs=true androidboot.usbcontroller=a800000.dwc3 androidboot.selinux=permissive buildvariant=eng loglevel=8"
+deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="false"
+deviceinfo_bootimg_dtb_second="false"
+deviceinfo_flash_offset_base="0x00000000"
+deviceinfo_flash_offset_kernel="0x00008000"
+deviceinfo_flash_offset_ramdisk="0x01000000"
+deviceinfo_flash_offset_second="0x00f00000"
+deviceinfo_flash_offset_tags="0x00000100"
+deviceinfo_flash_pagesize="4096"
+

device/testing/linux-purism-librem5/APKBUILD

 # Reference: <https://postmarketos.org/vendorkernel>
 # Kernel config based on: arch/arm64/configs/librem5-devkit_defconfig
 pkgname="linux-purism-librem5"
-pkgver=5.3
-pkgrel=2
+# <kernel ver>.<purism kernel release>
+pkgver=5.6.0
+_purismver=$pkgver-rc5+librem5.1
+pkgrel=0
 pkgdesc="Purism Librem 5 phone kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -16,15 +18,13 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev
 # Source
 _repository="linux-next"
 # imx8-current-librem5 branch:
-_commit="1309cc0a813e70af9b3d8c29d513e78715475de5"
 # kconfig generated with: ARCH=arm64 make defconfig KBUILD_DEFCONFIG=librem5_defconfig
 _config="config-$_flavor.$arch"
 source="
-	$pkgname-$_commit.tar.gz::https://source.puri.sm/Librem5/$_repository/-/archive/$_commit.tar.gz
-	0001-force-host-mode-for-usb.patch
+	$pkgname-$_purismver.tar.gz::https://source.puri.sm/Librem5/$_repository/-/archive/pureos/$_purismver/$_repository-pureos-$_purismver.tar.gz
 	$_config
 "
-builddir="$srcdir/$_repository-$_commit"
+builddir="$srcdir/$_repository-pureos-$_purismver"
 
 prepare() {
 	default_prepare
@@ -53,6 +53,5 @@ package() {
 		INSTALL_DTBS_PATH="$pkgdir/usr/share/dtb"
 
 }
-sha512sums="85cf8671c4d9481477edbb994423b3745cac684e7a056db889a97a18eb8e26778a900b7151865e8bc79f4394f0bb86c360ecf9eee01cbed6e7d4cbe2862b9e0c  linux-purism-librem5-1309cc0a813e70af9b3d8c29d513e78715475de5.tar.gz
-914a28ab4117ac1b349c6daae3538158f2346745e2f85f03667601eb6410db91f0f9805011f14ff2168da9c62821c921737ddfaf3d9babffbb2d9b84a6e83ac1  0001-force-host-mode-for-usb.patch
-79046403a26384518ccdb849abc9cfdfe6873986286e4ce97af3e8f633fdb6c8f55b18c954b36edffed3f42f08cbc68f3311e1157f573ee8759fa3da800ad91e  config-purism-librem5.aarch64"
+sha512sums="c270ea69bb77fb627cfba3ee553f2164119fffcd2b8a60b5d981c943a4bd22a23e08b7346845b82345d225b8d43c96624ce76888cd39b2d5734e7ec069875adc  linux-purism-librem5-5.6.0-rc5+librem5.1.tar.gz
+63499d9f99a90f5c2500ef3b7af51172eaf3d5b59193c62fb5467361b04bcba2e9f1b254eb2f7b2388cdd5c095b81b2c43d04264a01a21aa8f6a80ab336833f4  config-purism-librem5.aarch64"

device/testing/linux-xiaomi-whyred/03_fix_rndis_ipa_trace_header_not_found.patch

+diff --git a/drivers/net/ethernet/msm/rndis_ipa_trace.h b/drivers/net/ethernet/msm/rndis_ipa_trace.h
+index c0fc573..c18046b 100644
+--- a/drivers/net/ethernet/msm/rndis_ipa_trace.h
++++ b/drivers/net/ethernet/msm/rndis_ipa_trace.h
+@@ -77,5 +77,5 @@ TRACE_EVENT(
+
+ /* This part must be outside protection */
+ #undef TRACE_INCLUDE_PATH
+-#define TRACE_INCLUDE_PATH .
++#define TRACE_INCLUDE_PATH ../../drivers/net/ethernet/msm/
+ #include <trace/define_trace.h>
+diff --git a/drivers/platform/msm/ipa/ipa_v2/ipa_trace.h b/drivers/platform/msm/ipa/ipa_v2/ipa_trace.h
+index d70abdf..7f7e452 100644
+--- a/drivers/platform/msm/ipa/ipa_v2/ipa_trace.h
++++ b/drivers/platform/msm/ipa/ipa_v2/ipa_trace.h
+@@ -131,5 +131,5 @@ TRACE_EVENT(
+
+ /* This part must be outside protection */
+ #undef TRACE_INCLUDE_PATH
+-#define TRACE_INCLUDE_PATH .
++#define TRACE_INCLUDE_PATH ../../drivers/platform/msm/ipa/ipa_v2/
+ #include <trace/define_trace.h>

device/testing/linux-xiaomi-whyred/APKBUILD

+# Contributor: Nikita Utkin <shockck84@gmail.com>
+# Maintainer: Nikita Utkin <shockck84@gmail.com>
+# Reference: <https://postmarketos.org/vendorkernel>
+# Kernel config based on: arch/arm64/configs/whyred-perf_defconfig
+
+pkgname="linux-xiaomi-whyred"
+pkgver=4.4.78
+pkgrel=0
+pkgdesc="Xiaomi Redmi Note 5 kernel fork"
+arch="aarch64"
+_carch="arm64"
+_flavor="xiaomi-whyred"
+url="https://kernel.org"
+license="GPL-2.0-only"
+options="!strip !check !tracedeps"
+# Compiling with latest gcc causes kernel panic, so here we use gcc6
+makedepends="bash bc bison devicepkg-dev flex openssl-dev perl gcc6"
+
+if [ "${CC:0:5}" != "gcc6-" ]; then
+	CC="gcc6-$CC"
+	HOSTCC="gcc6-gcc"
+	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
+fi
+
+# Source
+_repository="Xiaomi_Kernel_OpenSource"
+_commit="efbbb9cce47475c49f28d227b2a52eca6f0d02a7"
+_config="config-$_flavor.$arch"
+source="
+	$pkgname-$_commit.zip::https://github.com/MiCode/$_repository/archive/$_commit.zip
+	$_config
+	gcc8-fix-put-user.patch
+	fix-includes.patch
+	fix-trace-includes.patch
+	fix-vl53l0-includes.patch
+	03_fix_rndis_ipa_trace_header_not_found.patch
+	fix-usb-redundant-module-funcs.patch
+	export-usb-gadget-funcs.patch
+	exclude-unrelated-device-trees.patch
+"
+# exclude-unrelated-device-trees.patch removes device trees for Wayne (Redmi 6X)
+# and Tulip (Redmi Note 6 Pro), leaving only Whyred's.
+# This patch is neccessary to point the kernel to the correct device tree,
+# as it was using Wayne's device trees otherwise for some reason.
+# TODO: Find better way to force to use the correct device tree.
+builddir="$srcdir/$_repository-$_commit"
+
+prepare() {
+	default_prepare
+	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+}
+
+build() {
+	unset LDFLAGS
+	make ARCH="$_carch" CC=$CC CROSS_COMPILE=$CROSS_COMPILE HOSTCC=$HOSTCC \
+		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
+}
+
+package() {
+	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor"
+
+	# Modules
+	unset LDFLAGS
+	make ARCH="$_carch" CC="${CC:-gcc}" \
+		INSTALL_MOD_PATH="$pkgdir" INSTALL_MOD_STRIP=1 \
+		KBUILD_BUILD_VERSION="$((pkgrel + 1))-postmarketOS" \
+		modules_install
+}
+
+sha512sums="a4da46628917ed4b486a4c12ba8e75fde8db8a23f9311ef1a907f7a664d5c4f7266a9174b131a62cfd0c00f0498d05388fc9c20a68bf3ab4dd9565d3bd033393  linux-xiaomi-whyred-efbbb9cce47475c49f28d227b2a52eca6f0d02a7.zip
+6fd145779ded26af00f5bff82072771a6e79ff6e1c81aa4896f053ed799297c3416a9a28438ef6f3f0ab40dc8d3947476a5bdccb33889b9d23861f6b7976d612  config-xiaomi-whyred.aarch64
+197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967  gcc8-fix-put-user.patch
+2d72e13a68c67c6af07b0e7e709f3feb57187964adef79d3c1cc7d73f75f5acccfcaa0d733d8d8746deadc220cb71d0bbd67ed11861bf9ee8dd07005f5d643eb  fix-includes.patch
+a7885d5ea79026f88723bab685b86f2e3d7d14dbc29c1220ec6fa007a6ed5f5c6a1773b0f57c9ec413bca069deff16ca8cb2126bf428aff2e0957a9c1a0339a8  fix-trace-includes.patch
+f8ca292ebc8bffac59f31fca191f9a95cdbd405c0382299779a5dfcfadde5116dec3d868f9d5ea4e2b3965f6fb9822241121bc6121264af796c59bc2cd6da29e  fix-vl53l0-includes.patch
+9c549714f03c7a7666e8aa7508a48cfdccab7cf3e97fb59c4df8fa97f75492365926f82c4a677c50780d68d4905504dcccbdd6de6344bd8d4b88b2331933ed46  03_fix_rndis_ipa_trace_header_not_found.patch
+85086f455f7ba08db2421862151b838cfefbd5131990bfa391863e0296cbb716f500cece07ad71a229274ae097bcebc81a2c99521c1b4e7ebdd65fa925a9ddf8  fix-usb-redundant-module-funcs.patch
+6bb86b54c7002e056a8eb21b159d4beb001ca6745645faf86d9208106390816aa07674dc6a11152a8b3fafae5ba93e0352de0813d1a9235b745150253be84e72  export-usb-gadget-funcs.patch
+4eff7d21cb15f769ee9667eb0a7d42f3439e12fc76046b409baea232fbbf935a2e960ef782361d712008ada0d57cff7cf5e8cecf6484a3037e73647f5dc58a51  exclude-unrelated-device-trees.patch"

device/testing/linux-xiaomi-whyred/exclude-unrelated-device-trees.patch

+diff --git a/arch/arm/boot/dts/qcom/Makefile b/arch/arm/boot/dts/qcom/Makefile
+index 2bad863d..ff75503e 100644
+--- a/arch/arm/boot/dts/qcom/Makefile
++++ b/arch/arm/boot/dts/qcom/Makefile
+@@ -179,13 +179,13 @@ endif
+ 
+ dtb-$(CONFIG_ARCH_MSMHAMSTER) += msmhamster-rumi.dtb
+ 
+-dtb-$(CONFIG_ARCH_SDM660) += sdm660-mtp_whyred.dtb  \
+-	sdm636-mtp_whyred.dtb \
+-	sdm636-mtp_wayne.dtb \
+-	sdm660-mtp_wayne_a1.dtb \
+-	sdm660-mtp_wayne.dtb \
+-	sdm660-mtp_tulip.dtb  \
+-	sdm636-mtp_tulip.dtb
++dtb-$(CONFIG_ARCH_SDM660) += sdm660-mtp_whyred.dtb # \
++	#sdm636-mtp_whyred.dtb \
++	#sdm636-mtp_wayne.dtb \
++	#sdm660-mtp_wayne_a1.dtb \
++	#sdm660-mtp_wayne.dtb \
++	#sdm660-mtp_tulip.dtb  \
++	#sdm636-mtp_tulip.dtb
+ 
+ dtb-$(CONFIG_ARCH_SDM630) += sdm630-rumi.dtb \
+ 	sdm630-pm660a-rumi.dtb \

device/testing/linux-xiaomi-whyred/export-debugfs-debug-funcs.patch

+diff --git a/drivers/usb/gadget/debug.c b/drivers/usb/gadget/debug.c
+index 32a53299..fa5ff4ff 100644
+--- a/drivers/usb/gadget/debug.c
++++ b/drivers/usb/gadget/debug.c
+@@ -126,8 +126,12 @@ err0:
+ 	return ret;
+ }
+ 
++EXPORT_SYMBOL(debug_debugfs_init);
++
+ void debug_debugfs_exit(void)
+ {
+ 	debugfs_remove_recursive(dbg_buffer.root);
+ 	dbg_buffer.root = NULL;
+ }
++
++EXPORT_SYMBOL(debug_debugfs_exit);

device/testing/linux-xiaomi-whyred/export-usb-gadget-funcs.patch

+diff --git a/drivers/platform/msm/usb_bam.c b/drivers/platform/msm/usb_bam.c
+index a9bcabfd..02a96f1e 100644
+--- a/drivers/platform/msm/usb_bam.c
++++ b/drivers/platform/msm/usb_bam.c
+@@ -470,6 +470,8 @@ int usb_bam_alloc_fifos(enum usb_ctrl cur_bam, u8 idx)
+ 	return 0;
+ }
+ 
++EXPORT_SYMBOL(usb_bam_alloc_fifos);
++
+ int usb_bam_free_fifos(enum usb_ctrl cur_bam, u8 idx)
+ {
+ 	struct usb_bam_ctx_type *ctx = &msm_usb_bam[cur_bam];
+@@ -531,6 +533,8 @@ int usb_bam_free_fifos(enum usb_ctrl cur_bam, u8 idx)
+ 	return 0;
+ }
+ 
++EXPORT_SYMBOL(usb_bam_free_fifos);
++
+ static int connect_pipe(enum usb_ctrl cur_bam, u8 idx, u32 *usb_pipe_idx)
+ {
+ 	int ret;
+@@ -1130,6 +1134,8 @@ int usb_bam_connect(enum usb_ctrl cur_bam, int idx, u32 *bam_pipe_idx)
+ 	return 0;
+ }
+ 
++EXPORT_SYMBOL(usb_bam_connect);
++
+ static int __sps_reset_pipe(enum usb_ctrl bam_type,
+ 			    struct sps_pipe *pipe, u32 idx)
+ {
+@@ -1820,6 +1826,8 @@ void usb_bam_suspend(enum usb_ctrl cur_bam,
+ 	usb_bam_start_suspend(&info[cur_bam]);
+ }
+ 
++EXPORT_SYMBOL(usb_bam_suspend);
++
+ static void usb_bam_start_suspend(struct usb_bam_ipa_handshake_info *info_ptr)
+ {
+ 	struct usb_bam_pipe_connect *pipe_connect;
+@@ -2017,6 +2025,8 @@ void usb_bam_resume(enum usb_ctrl cur_bam,
+ 	queue_work(ctx->usb_bam_wq, &info[cur_bam].resume_work);
+ }
+ 
++EXPORT_SYMBOL(usb_bam_resume);
++
+ static void _msm_bam_wait_for_host_prod_granted(enum usb_ctrl bam_type)
+ {
+ 	struct usb_bam_ctx_type *ctx = &msm_usb_bam[bam_type];
+@@ -2598,6 +2608,8 @@ int usb_bam_register_wake_cb(enum usb_ctrl bam_type, u8 idx,
+ 	return __usb_bam_register_wake_cb(bam_type, idx, callback, param, true);
+ }
+ 
++EXPORT_SYMBOL(usb_bam_register_wake_cb);
++
+ int usb_bam_register_start_stop_cbs(enum usb_ctrl bam_type, u8 dst_idx,
+ 	void (*start)(void *, enum usb_bam_pipe_dir),
+ 	void (*stop)(void *, enum usb_bam_pipe_dir), void *param)
+@@ -2614,6 +2626,8 @@ int usb_bam_register_start_stop_cbs(enum usb_ctrl bam_type, u8 dst_idx,
+ 	return 0;
+ }
+ 
++EXPORT_SYMBOL(usb_bam_register_start_stop_cbs);
++
+ int usb_bam_disconnect_pipe(enum usb_ctrl bam_type, u8 idx)
+ {
+ 	struct usb_bam_ctx_type *ctx = &msm_usb_bam[bam_type];
+@@ -2675,6 +2689,8 @@ int usb_bam_disconnect_pipe(enum usb_ctrl bam_type, u8 idx)
+ 	return 0;
+ }
+ 
++EXPORT_SYMBOL(usb_bam_disconnect_pipe);
++
+ /**
+  * is_ipa_hanlde_valid: Check if ipa_handle is valid or not
+  * @ipa_handle: IPA Handle for producer or consumer
+diff --git a/drivers/usb/dwc3/dwc3-msm.c b/drivers/usb/dwc3/dwc3-msm.c
+index b933a702..358a721b 100644
+--- a/drivers/usb/dwc3/dwc3-msm.c
++++ b/drivers/usb/dwc3/dwc3-msm.c
+@@ -437,6 +437,7 @@ int msm_data_fifo_config(struct usb_ep *ep, phys_addr_t addr,
+ 						dst_pipe_idx);
+ }
+ 
++EXPORT_SYMBOL(msm_data_fifo_config);
+ 
+ /**
+ * Cleanups for msm endpoint on request complete.
+diff --git a/drivers/usb/gadget/debug.c b/drivers/usb/gadget/debug.c
+index 32a53299..fa5ff4ff 100644
+--- a/drivers/usb/gadget/debug.c
++++ b/drivers/usb/gadget/debug.c
+@@ -126,8 +126,12 @@ err0:
+ 	return ret;
+ }
+ 
++EXPORT_SYMBOL(debug_debugfs_init);
++
+ void debug_debugfs_exit(void)
+ {
+ 	debugfs_remove_recursive(dbg_buffer.root);
+ 	dbg_buffer.root = NULL;
+ }
++
++EXPORT_SYMBOL(debug_debugfs_exit);
+diff --git a/drivers/usb/gadget/function/u_ctrl_qti.c b/drivers/usb/gadget/function/u_ctrl_qti.c
+index 013c54da..c7e18705 100644
+--- a/drivers/usb/gadget/function/u_ctrl_qti.c
++++ b/drivers/usb/gadget/function/u_ctrl_qti.c
+@@ -320,6 +320,7 @@ void gqti_ctrl_update_ipa_pipes(void *gr, enum qti_port_type qport,
+ 
+ }
+ 
++EXPORT_SYMBOL(gqti_ctrl_update_ipa_pipes);
+ 
+ static int qti_ctrl_open(struct inode *ip, struct file *fp)
+ {
+diff --git a/drivers/usb/gadget/function/u_data_ipa.c b/drivers/usb/gadget/function/u_data_ipa.c
+index d9a0b0e0..6f14c2fd 100644
+--- a/drivers/usb/gadget/function/u_data_ipa.c
++++ b/drivers/usb/gadget/function/u_data_ipa.c
+@@ -367,6 +367,8 @@ void ipa_data_disconnect(struct gadget_ipa_port *gp, enum ipa_func_type func)
+ 	queue_work(ipa_data_wq, &port->disconnect_w);
+ }
+ 
++EXPORT_SYMBOL(ipa_data_disconnect);
++
+ /**
+  * configure_fifo() - Configure USB BAM Pipe's data FIFO
+  * @idx: USB BAM Pipe index
+@@ -863,6 +865,8 @@ err:
+ 	return ret;
+ }
+ 
++EXPORT_SYMBOL(ipa_data_connect);
++
+ /**
+  * ipa_data_start() - Restart USB endless transfer
+  * @param: IPA data channel information
+@@ -989,6 +993,9 @@ void ipa_data_suspend(struct gadget_ipa_port *gp, enum ipa_func_type func,
+ 	queue_work(ipa_data_wq, &port->suspend_w);
+ 	spin_unlock_irqrestore(&port->port_lock, flags);
+ }
++
++EXPORT_SYMBOL(ipa_data_suspend);
++
+ static void bam2bam_data_suspend_work(struct work_struct *w)
+ {
+ 	struct ipa_data_ch_info *port = container_of(w, struct ipa_data_ch_info,
+@@ -1119,6 +1126,8 @@ void ipa_data_resume(struct gadget_ipa_port *gp, enum ipa_func_type func,
+ 	spin_unlock_irqrestore(&port->port_lock, flags);
+ }
+ 
++EXPORT_SYMBOL(ipa_data_resume);
++
+ static void bam2bam_data_resume_work(struct work_struct *w)
+ {
+ 	struct ipa_data_ch_info *port = container_of(w, struct ipa_data_ch_info,
+@@ -1231,7 +1240,9 @@ void ipa_data_port_select(enum ipa_func_type func)
+ 	port->ipa_params.src_client = IPA_CLIENT_USB_PROD;
+ 	port->ipa_params.dst_client = IPA_CLIENT_USB_CONS;
+ 	port->func_type = func;
+-};
++}
++
++EXPORT_SYMBOL(ipa_data_port_select);
+ 
+ void ipa_data_free(enum ipa_func_type func)
+ {
+@@ -1247,6 +1258,8 @@ void ipa_data_free(enum ipa_func_type func)
+ 	}
+ }
+ 
++EXPORT_SYMBOL(ipa_data_free);
++
+ /**
+  * ipa_data_setup() - setup BAM2BAM IPA port
+  *
+@@ -1306,6 +1319,8 @@ free_ipa_ports:
+ 	return ret;
+ }
+ 
++EXPORT_SYMBOL(ipa_data_setup);
++
+ void ipa_data_set_ul_max_xfer_size(u32 max_transfer_size)
+ {
+ 	if (!max_transfer_size) {

device/testing/linux-xiaomi-whyred/fix-includes.patch

+diff -ur a/drivers/bluetooth/btfm_slim.c b/drivers/bluetooth/btfm_slim.c
+--- a/drivers/bluetooth/btfm_slim.c	2020-01-20 16:35:42.770014356 -0800
++++ b/drivers/bluetooth/btfm_slim.c	2020-01-20 16:36:48.808884668 -0800
+@@ -23,8 +23,8 @@
+ #include <sound/soc.h>
+ #include <sound/soc-dapm.h>
+ #include <sound/tlv.h>
+-#include <btfm_slim.h>
+-#include <btfm_slim_wcn3990.h>
++#include "btfm_slim.h"
++#include "btfm_slim_wcn3990.h"
+ #include <linux/bluetooth-power.h>
+ 
+ int btfm_slim_write(struct btfmslim *btfmslim,
+diff -ur a/drivers/bluetooth/btfm_slim_codec.c b/drivers/bluetooth/btfm_slim_codec.c
+--- a/drivers/bluetooth/btfm_slim_codec.c	2020-01-20 16:35:42.770014356 -0800
++++ b/drivers/bluetooth/btfm_slim_codec.c	2020-01-20 16:36:48.812884599 -0800
+@@ -24,7 +24,7 @@
+ #include <sound/soc.h>
+ #include <sound/soc-dapm.h>
+ #include <sound/tlv.h>
+-#include <btfm_slim.h>
++#include "btfm_slim.h"
+ 
+ static int bt_soc_enable_status;
+ 
+diff -ur a/drivers/bluetooth/btfm_slim_wcn3990.c b/drivers/bluetooth/btfm_slim_wcn3990.c
+--- a/drivers/bluetooth/btfm_slim_wcn3990.c	2020-01-20 16:35:42.770014356 -0800
++++ b/drivers/bluetooth/btfm_slim_wcn3990.c	2020-01-20 16:36:48.812884599 -0800
+@@ -10,8 +10,8 @@
+  * GNU General Public License for more details.
+  */
+ #include <linux/slimbus/slimbus.h>
+-#include <btfm_slim.h>
+-#include <btfm_slim_wcn3990.h>
++#include "btfm_slim.h"
++#include "btfm_slim_wcn3990.h"
+ 
+ /* WCN3990 Port assignment */
+ struct btfmslim_ch wcn3990_rxport[] = {
+diff -ur a/drivers/bluetooth/btfm_slim_wcn3990.h b/drivers/bluetooth/btfm_slim_wcn3990.h
+--- a/drivers/bluetooth/btfm_slim_wcn3990.h	2020-01-20 16:35:42.770014356 -0800
++++ b/drivers/bluetooth/btfm_slim_wcn3990.h	2020-01-20 16:36:48.812884599 -0800
+@@ -12,7 +12,7 @@
+ #ifndef BTFM_SLIM_WCN3990_H
+ #define BTFM_SLIM_WCN3990_H
+ #ifdef CONFIG_BTFM_SLIM_WCN3990
+-#include <btfm_slim.h>
++#include "btfm_slim.h"
+ 
+ /* Registers Address */
+ #define CHRK_SB_COMP_TEST			0x00000000
+Only in b/drivers/bluetooth: btfm_slim_wcn3990.h.orig
+diff -ur a/drivers/gpu/msm/kgsl_events.c b/drivers/gpu/msm/kgsl_events.c
+--- a/drivers/gpu/msm/kgsl_events.c	2020-01-20 16:35:42.882012436 -0800
++++ b/drivers/gpu/msm/kgsl_events.c	2020-01-20 16:36:48.816884531 -0800
+@@ -15,7 +15,7 @@
+ #include <linux/list.h>
+ #include <linux/workqueue.h>
+ #include <linux/debugfs.h>
+-#include <kgsl_device.h>
++#include "kgsl_device.h"
+ 
+ #include "kgsl_debugfs.h"
+ #include "kgsl_trace.h"
+diff -ur a/drivers/media/platform/msm/camera_v2/common/cam_smmu_api.c b/drivers/media/platform/msm/camera_v2/common/cam_smmu_api.c
+--- a/drivers/media/platform/msm/camera_v2/common/cam_smmu_api.c	2020-01-20 16:35:42.958011133 -0800
++++ b/drivers/media/platform/msm/camera_v2/common/cam_smmu_api.c	2020-01-20 16:36:48.812884599 -0800
+@@ -27,7 +27,7 @@
+ #include <linux/sizes.h>
+ #include <soc/qcom/scm.h>
+ #include <soc/qcom/secure_buffer.h>
+-#include <msm_camera_tz_util.h>
++#include "msm_camera_tz_util.h"
+ #include "cam_smmu_api.h"
+ 
+ #define SCRATCH_ALLOC_START SZ_128K
+diff -ur a/drivers/media/platform/msm/camera_v2/sensor/msm_sensor.h b/drivers/media/platform/msm/camera_v2/sensor/msm_sensor.h
+--- a/drivers/media/platform/msm/camera_v2/sensor/msm_sensor.h	2020-01-20 16:35:42.958011133 -0800
++++ b/drivers/media/platform/msm/camera_v2/sensor/msm_sensor.h	2020-01-20 16:36:48.824884395 -0800
+@@ -31,9 +31,10 @@
+ #include <media/msm_cam_sensor.h>
+ #include <media/v4l2-subdev.h>
+ #include <media/v4l2-ioctl.h>
+-#include "msm_camera_i2c.h"
+-#include "msm_camera_dt_util.h"
+-#include "msm_sd.h"
++
++#include "io/msm_camera_i2c.h"
++#include "io/msm_camera_dt_util.h"
++#include "../msm_sd.h"
+ 
+ #define DEFINE_MSM_MUTEX(mutexname) \
+ 	static struct mutex mutexname = __MUTEX_INITIALIZER(mutexname)
+diff -ur a/drivers/platform/msm/mhi/mhi_ssr.c b/drivers/platform/msm/mhi/mhi_ssr.c
+--- a/drivers/platform/msm/mhi/mhi_ssr.c	2020-01-20 16:35:43.110008525 -0800
++++ b/drivers/platform/msm/mhi/mhi_ssr.c	2020-01-20 16:36:48.820884463 -0800
+@@ -11,8 +11,8 @@
+  */
+ 
+ #include <linux/pm_runtime.h>
+-#include <mhi_sys.h>
+-#include <mhi.h>
++#include "mhi_sys.h"
++#include "mhi.h"
+ #include <soc/qcom/subsystem_restart.h>
+ #include <soc/qcom/subsystem_notif.h>
+ #include <linux/esoc_client.h>
+diff -ur a/include/trace/events/msm_cam.h b/include/trace/events/msm_cam.h
+--- a/include/trace/events/msm_cam.h	2020-01-20 16:35:43.717998100 -0800
++++ b/include/trace/events/msm_cam.h	2020-01-20 16:36:48.824884395 -0800
+@@ -16,7 +16,7 @@
+ #if !defined(_TRACE_MSM_VFE_H) || defined(TRACE_HEADER_MULTI_READ)
+ #define _TRACE_MSM_VFE_H
+ 
+-#include "msm_isp.h"
++#include "../../../drivers/media/platform/msm/camera_v2/isp/msm_isp.h"
+ #include <linux/types.h>
+ #include <linux/tracepoint.h>
+ 
+diff -ur a/sound/soc/msm/apq8096-auto.c b/sound/soc/msm/apq8096-auto.c
+--- a/sound/soc/msm/apq8096-auto.c	2020-01-20 16:35:43.829996179 -0800
++++ b/sound/soc/msm/apq8096-auto.c	2020-01-20 16:36:48.832884258 -0800
+@@ -33,7 +33,7 @@
+ #include <sound/q6core.h>
+ #include <sound/pcm_params.h>
+ #include <sound/info.h>
+-#include <device_event.h>
++#include "device_event.h"
+ #include "qdsp6v2/msm-pcm-routing-v2.h"
+ 
+ 
+diff -ur a/sound/soc/msm/msm8996.c b/sound/soc/msm/msm8996.c
+--- a/sound/soc/msm/msm8996.c	2020-01-20 16:35:43.829996179 -0800
++++ b/sound/soc/msm/msm8996.c	2020-01-20 16:36:48.828884327 -0800
+@@ -31,7 +31,7 @@
+ #include <sound/q6core.h>
+ #include <sound/pcm_params.h>
+ #include <sound/info.h>
+-#include <device_event.h>
++#include "device_event.h"
+ #include "qdsp6v2/msm-pcm-routing-v2.h"
+ #include "../codecs/wcd9xxx-common.h"
+ #include "../codecs/wcd9330.h"
+
+
+diff --git a/sound/soc/msm/msm8998.c b/sound/soc/msm/msm8998.c
+index 9159ea64..b99e9d1b 100644
+--- a/sound/soc/msm/msm8998.c
++++ b/sound/soc/msm/msm8998.c
+@@ -33,7 +33,7 @@
+ #include <sound/q6core.h>
+ #include <sound/pcm_params.h>
+ #include <sound/info.h>
+-#include <device_event.h>
++#include "device_event.h"
+ #include <linux/qdsp6v2/audio_notifier.h>
+ #include "qdsp6v2/msm-pcm-routing-v2.h"
+ #include "../codecs/wcd9335.h"