device/community/linux-samsung-espresso3g/03-Add-clk32kg-to-twl6030-and-fix-wifi-reboot-issue.patch

+Patch picked from https://raw.githubusercontent.com/hansemro/kc1-linux/v5.16.x/patches/0006-Add-clk32kg-to-twl6030.patch
+
+
+From 6418e8fe6b80d906ac5a1d3570dd92ab0e7ec3e8 Mon Sep 17 00:00:00 2001
+From: Hansem Ro <hansemro@outlook.com>
+Date: Wed, 12 May 2021 18:26:38 -0700
+Subject: [PATCH] Add clk32kg to twl6030
+
+Needed for wl1271/wlcore driver bringup on Kindle Fire.
+
+Patch from Robert Nelson:
+https://github.com/RobertCNelson/armv7-multiplatform/commit/27fd28715ecf47dee1f36e70faecc1243125b06d
+
+
+
+This patch also fixes a WiFi reboot issue on Samsung Galaxy Tab 2 7.0 tablet,
+see https://gitlab.com/postmarketOS/pmaports/-/issues/1211
+
+---
+ arch/arm/boot/dts/twl6030.dtsi        |  5 +++++
+ drivers/regulator/twl6030-regulator.c | 23 +++++++++++++++++++++++
+ 2 files changed, 28 insertions(+)
+
+diff --git a/arch/arm/boot/dts/twl6030.dtsi b/arch/arm/boot/dts/twl6030.dtsi
+index 9d588cfaa5cb..4eee3133ce4e 100644
+--- a/arch/arm/boot/dts/twl6030.dtsi
++++ b/arch/arm/boot/dts/twl6030.dtsi
+@@ -97,6 +97,11 @@ twl_pwmled: pwmled {
+ 		#pwm-cells = <2>;
+ 	};
+ 
++	clk32kg: regulator-clk32kg {
++		compatible = "ti,twl6030-clk32kg";
++		regulator-always-on;
++	};
++
+ 	gpadc {
+ 		compatible = "ti,twl6030-gpadc";
+ 		interrupts = <3>;
+diff --git a/drivers/regulator/twl6030-regulator.c b/drivers/regulator/twl6030-regulator.c
+index 430265c404d6..8ee55a0e3d2f 100644
+--- a/drivers/regulator/twl6030-regulator.c
++++ b/drivers/regulator/twl6030-regulator.c
+@@ -299,6 +299,13 @@ static const struct regulator_ops twl6030fixed_ops = {
+ 	.get_status	= twl6030reg_get_status,
+ };
+ 
++static struct regulator_ops twl6030_fixed_resource = {
++	.enable	= twl6030reg_enable,
++	.disable	= twl6030reg_disable,
++	.is_enabled	= twl6030reg_is_enabled,
++	.get_status	= twl6030reg_get_status,
++};
++
+ /*
+  * SMPS status and control
+  */
+@@ -572,6 +579,19 @@ static const struct twlreg_info TWLSMPS_INFO_##label = { \
+ 		}, \
+ 	}
+ 
++#define TWL6030_FIXED_RESOURCE(label, offset, turnon_delay) \
++static struct twlreg_info TWLRES_INFO_##label = { \
++	.base = offset, \
++	.desc = { \
++		.name = #label, \
++		.id = TWL6030_REG_##label, \
++		.ops = &twl6030_fixed_resource, \
++		.type = REGULATOR_VOLTAGE, \
++		.owner = THIS_MODULE, \
++		.enable_time = turnon_delay, \
++		}, \
++	}
++
+ /* VUSBCP is managed *only* by the USB subchip */
+ /* 6030 REG with base as PMC Slave Misc : 0x0030 */
+ /* Turnon-delay and remap configuration values for 6030 are not
+@@ -601,6 +621,7 @@ TWL6030_FIXED_LDO(VDAC, 0x64, 1800, 0);
+ TWL6030_FIXED_LDO(VUSB, 0x70, 3300, 0);
+ TWL6030_FIXED_LDO(V1V8, 0x16, 1800, 0);
+ TWL6030_FIXED_LDO(V2V1, 0x1c, 2100, 0);
++TWL6030_FIXED_RESOURCE(CLK32KG, 0x8C, 0);
+ TWL6032_ADJUSTABLE_SMPS(SMPS3, 0x34);
+ TWL6032_ADJUSTABLE_SMPS(SMPS4, 0x10);
+ TWL6032_ADJUSTABLE_SMPS(VIO, 0x16);
+@@ -632,6 +653,7 @@ static u8 twl_get_smps_mult(void)
+ #define TWL6030_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWL6030, label)
+ #define TWL6032_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWL6032, label)
+ #define TWLFIXED_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWLFIXED, label)
++#define TWLRES_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWLRES, label)
+ #define TWLSMPS_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWLSMPS, label)
+ 
+ static const struct of_device_id twl_of_match[] = {
+@@ -659,6 +681,7 @@ static const struct of_device_id twl_of_match[] = {
+ 	TWLFIXED_OF_MATCH("ti,twl6030-vusb", VUSB),
+ 	TWLFIXED_OF_MATCH("ti,twl6030-v1v8", V1V8),
+ 	TWLFIXED_OF_MATCH("ti,twl6030-v2v1", V2V1),
++	TWLRES_OF_MATCH("ti,twl6030-clk32kg", CLK32KG),
+ 	TWLSMPS_OF_MATCH("ti,twl6032-smps3", SMPS3),
+ 	TWLSMPS_OF_MATCH("ti,twl6032-smps4", SMPS4),
+ 	TWLSMPS_OF_MATCH("ti,twl6032-vio", VIO),
+-- 
+2.31.1
+

device/community/linux-samsung-espresso3g/APKBUILD

@@ -2,7 +2,7 @@
 # Co-Maintainer: Antoni Aloy <aaloytorrens@gmail.com>
 pkgname=linux-samsung-espresso3g
 pkgver=5.17.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Samsung Galaxy Tab 2 (7.0 inch) mainline kernel"
 arch="armv7"
 _carch="arm"
@@ -27,6 +27,7 @@ source="
 	00-Add-espresso-dts.patch
 	01-Add-TWL6030-power-driver-with-minimal-support-for-power-off.patch
 	02-Add-TWL6030-power-button-support-to-twl-pwrbutton.patch
+	03-Add-clk32kg-to-twl6030-and-fix-wifi-reboot-issue.patch
 	$_config
 "
 builddir="$srcdir/linux-$_kernver"
@@ -60,5 +61,6 @@ sha512sums="
 01d2e04afba261c42ba3c9e9aea4f8f023d86e58f17e2e17dec2f46347665843678dd56ad8875ab00b69074c3389dd471a47a9f252e2c8002c89dc730691cfd8  00-Add-espresso-dts.patch
 a483b1a322f3fe47c7bb6514f34cca69ad1b806487596ffab69078acb6e83e99ed39ffb4d5b4ecd17035d118a75ce5bac6761b9e42d01608f1e6a53d59b27806  01-Add-TWL6030-power-driver-with-minimal-support-for-power-off.patch
 b3d6114c5c60fc2820856c89ea6f09c369d857ae79a79f0eeb0f83f5401dc2253e11f7dac6869eb1095d3e0b3a68126246762e2f406ffae5b5ef0a60d5563bac  02-Add-TWL6030-power-button-support-to-twl-pwrbutton.patch
+c98479208876387a0e9b3aabe9e496ed41af348b459d9180ce48d08b556578e3e607727e14e2fc9569d7fd86dce539f97f6341a4b010e59fd7fc1da4600c2b88  03-Add-clk32kg-to-twl6030-and-fix-wifi-reboot-issue.patch
 3bf676ddaf2201088c223b5f67933041d47b0cb20aefb678af271887107658f334fb6f3a778470a824b1c1a1a256ac68e17bded27c6d661f7b0a92eb15326fa3  config-samsung-espresso3g.armv7
 "

main/postmarketos-tweaks/APKBUILD

 # Maintainer: Martijn Braam <martijn@brixit.nl>
 pkgname=postmarketos-tweaks
-pkgver=0.11.0
+pkgver=0.12.0
 pkgrel=0
 pkgdesc="Tweak tool for phone UIs"
 url="https://gitlab.com/postmarketOS/postmarketos-tweaks"
 arch="noarch"
 license="GPL-3.0-or-later"
-subpackages="$pkgname-phosh:phosh $pkgname-pinephone:pinephone"
+subpackages="$pkgname-phosh:phosh $pkgname-pinephone:pinephone $pkgname-sxmo-x11:sxmo"
 depends="python3 py3-gobject3 py3-yaml gtk+3.0 libhandy1"
 makedepends="py3-setuptools glib-dev libhandy1-dev meson"
 install="$pkgname.post-install $pkgname.post-upgrade"
@@ -34,6 +34,12 @@ pinephone() {
 	amove usr/share/postmarketos-tweaks/pinephone.yml
 }
 
+sxmo() {
+	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-sxmo-de-dwm"
+
+	amove usr/share/postmarketos-tweaks/sxmo-x11.yml
+}
+
 sha512sums="
-a94c5301207504a0d36e214b2ea64918920438bc6c017503c1292c56cf5075ff01fc61e3377231d3e0e4dad73d1c6aa0d1f43ca380cbd99aa98856fc3c3c093b  postmarketos-tweaks-0.11.0.tar.gz
+5ca72c154c00bc96a6d2030d235587c1a07d58623217b2a08b67a57f0581126e92eb869b9fc94a304c69b42dc4f79caaadd896da62c47503b6a1b858119b145d  postmarketos-tweaks-0.12.0.tar.gz
 "

temp/gtk4.0/APKBUILD

+# Forked from Alpine to apply patch to fix PinePhone
+# Disabled docs and broadway backend
+pkgname=gtk4.0
+pkgver=9999
+_pkgver=4.6.3
+pkgrel=0
+pkgdesc="The GTK Toolkit (v4)"
+url="https://www.gtk.org/"
+install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
+arch="all !s390x !riscv64" # blocked by polkit -> colord
+options="!check" # Test suite is known to fail upstream
+license="LGPL-2.1-or-later"
+subpackages="$pkgname-demo $pkgname-dev $pkgname-lang $pkgname-dbg"
+depends="shared-mime-info gtk-update-icon-cache"
+
+depends_dev="
+	atk-dev
+	gdk-pixbuf-dev
+	glib-dev
+	libepoxy-dev
+	libxext-dev
+	libxi-dev
+	libxinerama-dev
+	wayland-protocols
+	wayland-libs-client
+	wayland-libs-cursor
+	libxkbcommon-dev
+	vulkan-headers
+	"
+makedepends="
+	$depends_dev
+	perl
+	cups-dev
+	expat-dev
+	gettext-dev
+	gnutls-dev
+	gobject-introspection-dev
+	libice-dev
+	tiff-dev
+	zlib-dev
+	at-spi2-atk-dev
+	cairo-dev
+	fontconfig-dev
+	pango-dev
+	wayland-dev
+	libx11-dev
+	libxcomposite-dev
+	libxcursor-dev
+	libxdamage-dev
+	libxfixes-dev
+	libxrandr-dev
+	meson
+	iso-codes-dev
+	vulkan-loader-dev
+	sassc
+	colord-dev
+	gstreamer-dev
+	gst-plugins-bad-dev
+	gtk-doc>=1.33
+	gi-docgen
+	py3-docutils
+	graphene-dev
+	"
+source="https://download.gnome.org/sources/gtk/${_pkgver%.*}/gtk-$_pkgver.tar.xz
+	gdk-hack-context-realize.patch
+	"
+
+builddir="$srcdir/gtk-$_pkgver"
+
+build() {
+	# We don't run tests and they currently fail to build
+	abuild-meson \
+		-Dgtk_doc=false \
+		-Dbroadway-backend=false \
+		-Dman-pages=false \
+		-Dbuild-tests=false \
+		. output
+	meson compile ${JOBS:+-j ${JOBS}} -C output
+}
+
+package() {
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
+
+	# use gtk-update-icon-cache from gtk+2.0 for now. The icon cache is forward
+	# compatible so this is fine.
+	# do the same for gtk4-update-icon-cache
+	rm -f "$pkgdir"/usr/bin/gtk-update-icon-cache
+	rm -f "$pkgdir"/usr/bin/gtk4-update-icon-cache
+	rm -f "$pkgdir"/usr/share/man/man1/gtk-update-icon-cache.1
+}
+
+demo() {
+	pkgdesc="$pkgdesc (demonstration application)"
+	amove \
+		usr/bin/gtk4-demo \
+		usr/bin/gtk4-demo-application \
+		usr/bin/gtk4-icon-browser \
+		usr/bin/gtk4-print-editor \
+		usr/bin/gtk4-widget-factory \
+		usr/share/applications/org.gtk.Demo4.desktop \
+		usr/share/applications/org.gtk.IconBrowser4.desktop \
+		usr/share/applications/org.gtk.PrintEditor4.desktop \
+		usr/share/applications/org.gtk.WidgetFactory4.desktop \
+		usr/share/glib-2.0/schemas/org.gtk.Demo4.gschema.xml \
+		usr/share/gtk-4.0/gtk4builder.rng \
+		usr/share/icons
+}
+
+dev() {
+	default_dev
+
+	amove \
+		usr/bin/gtk4-builder-tool \
+		usr/bin/gtk4-encode-symbolic-svg \
+		usr/bin/gtk4-query-settings \
+		usr/share/gtk-4.0/valgrind
+}
+
+lang() {
+	default_lang
+
+	# These are some localized emoji labels.
+	amove usr/share/gtk-4.0/emoji
+}
+
+sha512sums="
+0e96b39a8171ccefc24808d1af8af8e3cbcc9b403c1bdfd85778ed2e824c93e3687b7baa1237b05fa35181d300eacfd6cc9f79c7a6eef70b365991f0a2769f71  gtk-4.6.3.tar.xz
+e0ab58ad4ad1ce73ac6f038144a8de0326d41c764f91d4b91864efcfff548d7a1ba1318b9c4b276821e72d8612a0677533914fd5870a1a9f2db483a4b43bff5d  gdk-hack-context-realize.patch
+"

temp/gtk4.0/gdk-hack-context-realize.patch

+This is a hack to solve some crashes for GTK4 apps in the pinephone
+by dirty fixing an upstream bug[1]. The real fix will take longer and
+will not be trivial to backport[2]. In the meanwhile, we force a GLES
+context if it is allowed and the shared context is also using GLES,
+to avoid the creation of a GL context with wrong version. Hopefully,
+this should not have additional side-effects for other devices.
+
+[1] https://gitlab.gnome.org/GNOME/gtk/-/issues/4763
+[2] https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4687
+
+diff --git i/gdk/gdkglcontext.c w/gdk/gdkglcontext.c
+index 3869b14da0..57a3661492 100644
+--- i/gdk/gdkglcontext.c
++++ w/gdk/gdkglcontext.c
+@@ -280,6 +280,11 @@ gdk_gl_context_real_realize (GdkGLContext  *context,
+       G_GNUC_UNUSED gint64 start_time = GDK_PROFILER_CURRENT_TIME;
+
+       if (share != NULL)
+-        gdk_gl_context_get_required_version (share, &major, &minor);
++        {
++          gdk_gl_context_get_required_version (share, &major, &minor);
++          if (gdk_gl_context_get_use_es (share) &&
++              gdk_gl_context_is_api_allowed (context, GDK_GL_API_GLES, NULL))
++            gdk_gl_context_set_allowed_apis (context, GDK_GL_API_GLES);
++        }
+       else
+         gdk_gl_context_get_required_version (context, &major, &minor);

temp/gtk4.0/gtk4.0.post-deinstall

+#!/bin/sh
+
+rm -f etc/gtk-4.0/gdk-pixbuf.loaders

temp/gtk4.0/gtk4.0.post-install

+#!/bin/sh
+
+mkdir -p etc/gtk-4.0
+usr/bin/gdk-pixbuf-query-loaders > etc/gtk-4.0/gdk-pixbuf.loaders
+

temp/gtk4.0/gtk4.0.post-upgrade

+gtk4.0.post-install
\ No newline at end of file