Merge branch 'MotoE4' of gitlab.com:lastramses/pmaports into MotoE4

device/testing/device-motorola-perry/APKBUILD

+# Contributor: Firstname Lastname <---@---.com>
+# Maintainer: Firstname Lastname <---@---.com>
+# Reference: <https://postmarketos.org/devicepkg>
+pkgname="device-motorola-perry"
+pkgdesc="Motorola Moto E4"
+pkgver=0.1
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="aarch64"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+options="!check !archcheck"
+depends="postmarketos-base linux-motorola-perry mkbootimg mesa-dri-swrast msm-fb-refresher mdss-fb-init-hack"
+makedepends="devicepkg-dev"
+source="deviceinfo initfs-hook.sh"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+nonfree_firmware() {
+	pkgdesc="Wifi firmware"
+	depends="firmware-motorola-perry-wcnss wcnss-wlan"
+	mkdir "$subpkgdir"
+}
+
+
+sha512sums="0346e419b46c64a3de8ef5ed6eaad254312c1fea7a1bf3fc52ed37ce59004a39d9ca7a7d2c21bdefcd4268e016a39fda48935f37ea5543299939baec549c0099  deviceinfo
+f33e8f7287659bcf738397f8f09bb51666820362dffd2c1dbb9afd28640ba22cc5e8f714ffbb1e0913d913fffdc95191cef38f933cfa77b15466ac633ab92d95  initfs-hook.sh"

device/testing/device-motorola-perry/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="motorola Moto E4"
+deviceinfo_manufacturer="motorola"
+deviceinfo_codename="motorola-perry"
+deviceinfo_year="2017"
+deviceinfo_dtb=""
+deviceinfo_modules_initfs=""
+deviceinfo_arch="aarch64"
+
+# Device related
+deviceinfo_keyboard="false"
+deviceinfo_external_storage="true"
+deviceinfo_screen_width="720"
+deviceinfo_screen_height="1280"
+
+# Bootloader related
+deviceinfo_flash_method="fastboot"
+deviceinfo_kernel_cmdline="console=ttyHSL0,115200,n8 androidboot.console=ttyHSL0 androidboot.hardware=qcom user_debug=30 msm_rtb.filter=0x237 ehci-hcd.park=3 androidboot.bootdevice=7824900.sdhci lpm_levels.sleep_disabled=1 earlycon=msm_hsl_uart,0x78B0000 vmalloc=400M buildvariant=user"
+deviceinfo_generate_bootimg="true"
+deviceinfo_bootimg_qcdt="true"
+#deviceinfo_bootimg_dtb_second="false"
+deviceinfo_flash_offset_base="0x80000000"
+deviceinfo_flash_offset_kernel="0x00008000"
+deviceinfo_flash_offset_ramdisk="0x01000000"
+deviceinfo_flash_offset_second="0x00f00000"
+deviceinfo_flash_offset_tags="0x00000100"
+deviceinfo_flash_pagesize="2048"
+

device/testing/device-motorola-perry/initfs-hook.sh

+#!/bin/sh
+
+# enable touchscreen
+sleep 5 # a little delay before activating touchscreen
+echo 1 > /sys/devices/soc/78b7000.i2c/i2c-3/3-0020/drv_irq
+

device/testing/linux-motorola-perry/APKBUILD

+# Contributor: last ramses <no-reply@yahoo.com>
+# Maintainer: last ramses <no-reply@yahoo.com>
+# Reference: <https://postmarketos.org/vendorkernel>
+# Kernel config based on: arch/arm64/configs/perry_defconfig
+
+pkgname="linux-motorola-perry"
+pkgver=3.18.140
+pkgrel=0
+pkgdesc="Motorola Moto E4 kernel fork"
+arch="aarch64"
+_carch="arm64"
+_flavor="motorola-perry"
+url="https://kernel.org"
+license="GPL-2.0-only"
+options="!strip !check !tracedeps"
+makedepends="bash bc bison devicepkg-dev flex openssl-dev perl dtbtool"
+
+# Source
+_repository="android_kernel_motorola_msm8937"
+_commit="a9ea192c260302b52c2c58f3a8514e09232e62ef"
+_config="config-$_flavor.$arch"
+source="
+	$pkgname-$_commit.tar.gz::https://github.com/lastramses/$_repository/archive/$_commit/$pkgname-$_commit.tar.gz
+	$_config
+	arm-smmu.patch
+"
+builddir="$srcdir/$_repository-$_commit"
+
+prepare() {
+	default_prepare
+	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+}
+
+build() {
+	unset LDFLAGS
+	echo "--[ Build kernel ]--"
+	make ARCH="$_carch" CC="${CC:-gcc}" \
+		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
+
+	echo "--[ Build dtb ]--"
+	dtbTool -s 2048 -p "scripts/dtc/" -o "arch/arm/boot/dt.img" "arch/arm/boot/"
+}
+
+package() {
+	KERNEL_IMAGE_NAME="Image.gz" downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor"
+
+	install -Dm644 "$builddir/arch/arm/boot/dt.img" "$pkgdir/boot/dt.img"
+}
+
+sha512sums="70da170bdd8ed591078e25c17380aef4d23199fc9dc53af5ff7949f3d1e2158c4ed567454641e9694fc379a1c6af7af7194ee7ed9804b62dffc8a9c514e1c705  linux-motorola-perry-a9ea192c260302b52c2c58f3a8514e09232e62ef.tar.gz
+3c19a320872b76e47dcbec547bc472521dcfacdf1d96a6059511d3a5fcc1ed06889440af9172bcc13e49395894b58dc4e227c522c44d8b922c91083c11d1c84d  config-motorola-perry.aarch64
+2686b40578dd555113dd5f7b70fe908bea6e7f7df52dc532f5561ceaefd6f91c927748e59b65814554908226d02a67f1b0044a869ae32ad2096088be09e87ec4  arm-smmu.patch"

device/testing/linux-motorola-perry/arm-smmu.patch

+--- msm8937/drivers/iommu/arm-smmu.c	2020-03-20 21:37:03.859877919 -0400
++++ msm8937/drivers/iommu/arm-smmu.c	2020-03-20 21:39:30.947875693 -0400
+@@ -2824,7 +2824,7 @@
+ 		}
+ 
+ 		cfg->num_streamids = 1;
+-		ret = msm_pcie_configure_sid(dev, &sid, &tmp);
++		ret = 1; //msm_pcie_configure_sid(dev, &sid, &tmp);
+ 		if (ret) {
+ 			dev_err(dev,
+ 				"Couldn't configure SID through PCI-e driver: %d\n",

firmware/firmware-motorola-perry/APKBUILD

+pkgname=firmware-motorola-perry
+pkgver=1
+pkgrel=0
+pkgdesc="Firmware for Motorola Perry E4"
+url="https://github.com/lastramses/firmware-motorola-perry"
+subpackages="$pkgname-wcnss"
+arch="aarch64"
+license="proprietary"
+options="!check !strip !archcheck"
+_commit="813155d3bbce0f8a83cace3fd8c3cceedc184a46"
+source="https://github.com/lastramses/firmware-motorola-perry/archive/$_commit/firmware-motorola-perry-$_commit.tar.gz"
+builddir="$srcdir/$pkgname-$_commit"
+
+_fwdir="/lib/firmware/postmarketos"
+
+package() {
+	# parent package is empty
+	mkdir -p "$pkgdir"
+}
+
+wcnss() {
+	pkgdesc="Motorola Moto E4 WiFi firmware"
+	install -Dm644 "$builddir"/wcnss.* -t "$subpkgdir/$_fwdir"
+	install -Dm644 "$builddir"/wlan/prima/WCNSS_* -t "$subpkgdir/$_fwdir"/wlan/prima
+}
+
+sha512sums="de37ff72ab99f2cc8da29091cda0c11eda7a08c3c0c5d91827ea4356f62e55adf5546dc2377d584a501394941bb4364529781841ed808cd64bd587b2ddd4589f  firmware-motorola-perry-813155d3bbce0f8a83cace3fd8c3cceedc184a46.tar.gz"