.gitlab-ci.yml

@@ -57,7 +57,6 @@ shellcheck:
   <<: *only-default
   image: alpine:edge
   before_script:
-    - apk -q upgrade
     - apk -q add shellcheck
   script:
     - .gitlab-ci/shellcheck.sh

.gitlab-ci/apkbuild-linting.py

@@ -13,20 +13,16 @@ if __name__ == "__main__":
         print("No APKBUILDs to lint")
         sys.exit(0)
 
-    issues = []
+    packages = []
     for apkbuild in apkbuilds:
         if apkbuild.startswith("temp/") or apkbuild.startswith("cross/"):
             print(f"NOTE: Skipping linting of {apkbuild}")
             continue
+        packages.append(os.path.basename(os.path.dirname(apkbuild)))
 
-        package = os.path.basename(os.path.dirname(apkbuild))
-        result = common.run_pmbootstrap(["-q", "lint", package], output_return=True)
-        if len(result) > 0:
-            issues.append([apkbuild, result])
+    result = common.run_pmbootstrap(["-q", "lint"] + packages, output_return=True)
 
-    if len(issues) > 0:
+    if len(result) > 0:
         print("Linting issues found:")
-        for issue in issues:
-            print(issue[0] + ": " + issue[1])
-
+        print(result)
         sys.exit(1)

cross/busybox-static-aarch64/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-aarch64
 pkgver=1.34.0
-pkgrel=2
+pkgrel=3
 
 _arch="aarch64"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-92d5d0d8065419189834ddadcc85a87093755fc4efd6cbb721d5803190aa500ab3fae25bcbef77fa0e1a4faf42603cdeec2e85df24941be41e976f9a3bb4d6bb  busybox-static-1.34.0-r2-aarch64-edge.apk
+5a81767b149a6bd277344b4d18d55a813bf269c2cfd42981b1c9ab6f448e9a5d546a24ecd6cef2896f3e0b1dab75845a4c4402cef578d7e06af73ae4b58962f5  busybox-static-1.34.0-r3-aarch64-edge.apk
 "

cross/busybox-static-armhf/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-armhf
 pkgver=1.34.0
-pkgrel=2
+pkgrel=3
 
 _arch="armhf"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-24f24985ff2d6ad4afb9cd2c5e3099035f407d67ac397befb2e3bc3340a7bb0d63f8b0b56c09be5da612e761970f53d607c3ce4f43f1351f8095001fb4a2b09e  busybox-static-1.34.0-r2-armhf-edge.apk
+8dc38249289e49d3f54e99a4a2805cc54e29d0fd45743837b10c1aa246bc0adef96d8e317516f0c11a23b2499c2f9bdb2e483043fedaab97a32ed8de27374723  busybox-static-1.34.0-r3-armhf-edge.apk
 "

cross/busybox-static-armv7/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=busybox-static-armv7
 pkgver=1.34.0
-pkgrel=2
+pkgrel=3
 
 _arch="armv7"
 _mirror="http://dl-4.alpinelinux.org/alpine/"
@@ -32,5 +32,5 @@ package() {
 }
 
 sha512sums="
-f1fd30ca449941f9c2dc60a0d3d85b6c03043059ebe2f6c4d162f6b72bd45e01afc5a14b3b90652e550db22eaf5119b253ade7f3123fa5cabe3af925b16a33e0  busybox-static-1.34.0-r2-armv7-edge.apk
+a071363160e0a1abe935d94ea531c78c1227b167fd4798a59a4af40658a02ab65ae2273fd8469c9f300f6c95e0f4f93da3a14d8099ca43a2138dc6ffb8a9664d  busybox-static-1.34.0-r3-armv7-edge.apk
 "

cross/musl-aarch64/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=musl-aarch64
 pkgver=1.2.2
-pkgrel=5
+pkgrel=6
 arch="x86_64"
 subpackages="musl-dev-aarch64:package_dev"
 
@@ -56,6 +56,6 @@ package_dev() {
 }
 
 sha512sums="
-11ea98d38fa1ac4c666c1c4ebde7e394253a67c4c48e75d5943fad61fae9cb9091f9293a5bcbbfbce7206533918cc4f893a738220c6c621f8b855dbaf41f7d77  musl-1.2.2-r5-aarch64-edge.apk
-545fa920c1987fb26373c02dfd4fd68f163c634ea4b2c52909e381ca1f6b01fe5414d3a33f7e2fa99302e0cdc2939ec404d179a2b90a5c82380615af60c486ad  musl-dev-1.2.2-r5-aarch64-edge.apk
+f2cca5b11ea899bb96c97aced6374b97560457d7804e54e9411a233d51cb48eaa687bc6492b3f516c6a83c6cccee30eb0d811505c194d8b587bed396b173d176  musl-1.2.2-r6-aarch64-edge.apk
+34bc212a56f3a5a57083b686a3d58b90a2be275f572a49a8bed4ac6f76e3c532dac7cbc31c8924d6cf5d222820a99d4c32c18a694e22334ff56aedcc360d348b  musl-dev-1.2.2-r6-aarch64-edge.apk
 "

cross/musl-armhf/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=musl-armhf
 pkgver=1.2.2
-pkgrel=5
+pkgrel=6
 arch="x86_64"
 subpackages="musl-dev-armhf:package_dev"
 
@@ -56,6 +56,6 @@ package_dev() {
 }
 
 sha512sums="
-235b92ef9b9b5048b4b72bdf51c9037cdfc14b6fc67f3e1c6fed6b7485c33eb7037926890e1eb401dc54ba9abaafb6dc89fdf8c734aea55b792b3671a3b69b86  musl-1.2.2-r5-armhf-edge.apk
-94ff07c1a5a6878a4608c9c921640c42c68edd616349440fcba2b8165d3918192a67dddd22053155121c805333d7e0d55344d1844ece4664c660a5b30c4da718  musl-dev-1.2.2-r5-armhf-edge.apk
+599176c077154163c6565a7d2d1a2a61da613055b9627907526504cee438f4e5b26cfdce3feeb0ab6bf16ada1ea9c0e40bd96784afd86248906516c15e94886c  musl-1.2.2-r6-armhf-edge.apk
+206ac60d6a7cc4467f192a5cbc4c98a21450fe989930e7c54c57627edec31bc3db38b18d67aac362e6d53489c9f0dbba96d455e2ed2f7ba46b49b57e287b17bc  musl-dev-1.2.2-r6-armhf-edge.apk
 "

cross/musl-armv7/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=musl-armv7
 pkgver=1.2.2
-pkgrel=5
+pkgrel=6
 arch="x86_64"
 subpackages="musl-dev-armv7:package_dev"
 
@@ -56,6 +56,6 @@ package_dev() {
 }
 
 sha512sums="
-92b7575d371ba8843b38cd36c015d24ec5436e4297eb440cc15d013430f62597ff58d29076c248bd2bbe7b8d7c40c5beeffea0f02eeae24f3ac286e4c2faf48b  musl-1.2.2-r5-armv7-edge.apk
-e3aa3b8b68f04415daebd9bb981e9a1065cbae6b7461dd451a44ba2c923460cadb1064879843546798cca91ec79215a8fcade12ff856b979f6da8fb035a322f4  musl-dev-1.2.2-r5-armv7-edge.apk
+2076af973ed71f4978e97c6cb527780bc43fc1292320adc5e19e544e925f9ff630f4deb95f9cc891aeef1b45ce729d4e48a0fe7ef195a804c7a5193597d4c0b8  musl-1.2.2-r6-armv7-edge.apk
+db32681169f44b0b8383e10f2d405e3468c4532a37a74ed2a3bd9a1270a91f8b6f94a580d425f539a8336c424d19bae4c6e6871f1ee79e49a7fa3c6c263edd7a  musl-dev-1.2.2-r6-armv7-edge.apk
 "

device/testing/device-odroid-hc2/APKBUILD → device/community/device-odroid-hc2/APKBUILD

@@ -10,7 +10,6 @@ license="MIT"
 arch="armv7"
 options="!check !archcheck"
 depends="linux-odroid-hc2
-	 networkmanager
 	 postmarketos-base
 	 u-boot-odroid
 	 u-boot-tools
@@ -18,7 +17,6 @@ depends="linux-odroid-hc2
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-tools"
 _commit="42ac93dcfbbb8a08c2bdc02e19f96eb35a81891a"
-install="$pkgname.post-install $pkgname.post-upgrade"
 source="deviceinfo uboot-script.cmd install-rootfs-hdd.sh"
 
 build() {

device/main/device-pine64-pinephone/APKBUILD

@@ -6,7 +6,7 @@
 # Co-Maintainer: Dylan Van Assche <me@dylanvanassche.be>
 pkgname=device-pine64-pinephone
 pkgver=0.35
-pkgrel=1
+pkgrel=2
 pkgdesc="PINE64 PinePhone"
 url="https://postmarketos.org"
 license="MIT"

device/main/device-pine64-pinephone/device-pine64-pinephone.pre-upgrade

@@ -4,5 +4,7 @@
 # packaging so remove them here to prevent a failed upgrade if /boot is too
 # full
 # see: https://gitlab.com/postmarketOS/pmaports/-/merge_requests/2449
-rm /boot/uImage-postmarketos-allwinner 2>/dev/null 1>&2
-rm /boot/uInitrd-postmarketos-allwinner 2>/dev/null 1>&2
+rm -f /boot/uImage-postmarketos-allwinner
+rm -f /boot/uInitrd-postmarketos-allwinner
+
+exit 0

device/testing/device-odroid-hc2/device-odroid-hc2.post-install

-#!/bin/sh
-
-rc-update add networkmanager default
-
-exit 0

device/testing/device-odroid-hc2/device-odroid-hc2.post-upgrade

-device-odroid-hc2.post-install
\ No newline at end of file

main/linux-postmarketos-allwinner/0015-add-kb151-support.patch

+From d1d849cae12db71aa81ceedaedc1b17a34790367 Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+Date: Sat, 19 Jun 2021 18:36:05 -0500
+Subject: [PATCH] Input: kb151 - Add a driver for the KB151 keyboard
+
+This keyboard is found in the official Pine64 PinePhone keyboard case.
+It is connected over I2C and runs a libre firmware.
+
+Signed-off-by: Samuel Holland <samuel@sholland.org>
+---
+ .../dts/allwinner/sun50i-a64-pinephone.dtsi   |  64 +++++
+ drivers/input/keyboard/Kconfig                |  10 +
+ drivers/input/keyboard/Makefile               |   1 +
+ drivers/input/keyboard/kb151.c                | 246 ++++++++++++++++++
+ 4 files changed, 321 insertions(+)
+ create mode 100644 drivers/input/keyboard/kb151.c
+
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
+index 4ede9fe66020c9..0bdc6eceec6099 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
++++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
+@@ -551,6 +551,70 @@
+ /* Connected to pogo pins (external spring based pinheader for user addons) */
+ &i2c2 {
+ 	status = "okay";
++
++	keyboard@15 {
++		compatible = "pine64,kb151";
++		reg = <0x15>;
++		interrupt-parent = <&r_pio>;
++		interrupts = <0 12 IRQ_TYPE_EDGE_FALLING>; /* PL12 */
++		keypad,num-rows = <6>;
++		keypad,num-columns = <12>;
++		linux,keymap = <MATRIX_KEY(0,  0, KEY_ESC)
++				MATRIX_KEY(0,  1, KEY_1)
++				MATRIX_KEY(0,  2, KEY_2)
++				MATRIX_KEY(0,  3, KEY_3)
++				MATRIX_KEY(0,  4, KEY_4)
++				MATRIX_KEY(0,  5, KEY_5)
++				MATRIX_KEY(0,  6, KEY_6)
++				MATRIX_KEY(0,  7, KEY_7)
++				MATRIX_KEY(0,  8, KEY_8)
++				MATRIX_KEY(0,  9, KEY_9)
++				MATRIX_KEY(0, 10, KEY_0)
++				MATRIX_KEY(0, 11, KEY_BACKSPACE)
++				MATRIX_KEY(1,  0, KEY_TAB)
++				MATRIX_KEY(1,  1, KEY_Q)
++				MATRIX_KEY(1,  2, KEY_W)
++				MATRIX_KEY(1,  3, KEY_E)
++				MATRIX_KEY(1,  4, KEY_R)
++				MATRIX_KEY(1,  5, KEY_T)
++				MATRIX_KEY(1,  6, KEY_Y)
++				MATRIX_KEY(1,  7, KEY_U)
++				MATRIX_KEY(1,  8, KEY_I)
++				MATRIX_KEY(1,  9, KEY_O)
++				MATRIX_KEY(1, 10, KEY_P)
++				MATRIX_KEY(1, 11, KEY_ENTER)
++				MATRIX_KEY(2,  0, KEY_LEFTMETA)
++				MATRIX_KEY(2,  1, KEY_A)
++				MATRIX_KEY(2,  2, KEY_S)
++				MATRIX_KEY(2,  3, KEY_D)
++				MATRIX_KEY(2,  4, KEY_F)
++				MATRIX_KEY(2,  5, KEY_G)
++				MATRIX_KEY(2,  6, KEY_H)
++				MATRIX_KEY(2,  7, KEY_J)
++				MATRIX_KEY(2,  8, KEY_K)
++				MATRIX_KEY(2,  9, KEY_L)
++				MATRIX_KEY(2, 10, KEY_SEMICOLON)
++				MATRIX_KEY(3,  0, KEY_LEFTSHIFT)
++				MATRIX_KEY(3,  1, KEY_Z)
++				MATRIX_KEY(3,  2, KEY_X)
++				MATRIX_KEY(3,  3, KEY_C)
++				MATRIX_KEY(3,  4, KEY_V)
++				MATRIX_KEY(3,  5, KEY_B)
++				MATRIX_KEY(3,  6, KEY_N)
++				MATRIX_KEY(3,  7, KEY_M)
++				MATRIX_KEY(3,  8, KEY_COMMA)
++				MATRIX_KEY(3,  9, KEY_DOT)
++				MATRIX_KEY(3, 10, KEY_SLASH)
++				MATRIX_KEY(4,  1, KEY_LEFTCTRL)
++				MATRIX_KEY(4,  4, KEY_SPACE)
++				MATRIX_KEY(4,  6, KEY_APOSTROPHE)
++				MATRIX_KEY(4,  8, KEY_RIGHTBRACE)
++				MATRIX_KEY(4,  9, KEY_LEFTBRACE)
++				MATRIX_KEY(5,  2, KEY_FN)
++				MATRIX_KEY(5,  3, KEY_LEFTALT)
++				MATRIX_KEY(5,  5, KEY_RIGHTALT)>;
++		wakeup-source;
++	};
+ };
+ 
+ &i2s2 {
+diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
+index 40a070a2e7f5b7..0259e9133f4692 100644
+--- a/drivers/input/keyboard/Kconfig
++++ b/drivers/input/keyboard/Kconfig
+@@ -353,6 +353,16 @@ config KEYBOARD_HP7XX
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called jornada720_kbd.
+ 
++config KEYBOARD_KB151
++	tristate "Pine64 KB151 Keyboard"
++	depends on I2C
++	select CRC8
++	select INPUT_MATRIXKMAP
++	help
++	  Say Y here to enable support for the KB151 keyboard used in the
++	  Pine64 PinePhone keyboard case. This driver supports the FLOSS
++	  firmware available at https://megous.com/git/pinephone-keyboard/
++
+ config KEYBOARD_LM8323
+ 	tristate "LM8323 keypad chip"
+ 	depends on I2C
+diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile
+index 1d689fdd5c00f9..87fda7b961913a 100644
+--- a/drivers/input/keyboard/Makefile
++++ b/drivers/input/keyboard/Makefile
+@@ -33,6 +33,7 @@ obj-$(CONFIG_KEYBOARD_IMX)		+= imx_keypad.o
+ obj-$(CONFIG_KEYBOARD_IMX_SC_KEY)	+= imx_sc_key.o
+ obj-$(CONFIG_KEYBOARD_HP6XX)		+= jornada680_kbd.o
+ obj-$(CONFIG_KEYBOARD_HP7XX)		+= jornada720_kbd.o
++obj-$(CONFIG_KEYBOARD_KB151)		+= kb151.o
+ obj-$(CONFIG_KEYBOARD_LKKBD)		+= lkkbd.o
+ obj-$(CONFIG_KEYBOARD_LM8323)		+= lm8323.o
+ obj-$(CONFIG_KEYBOARD_LM8333)		+= lm8333.o
+diff --git a/drivers/input/keyboard/kb151.c b/drivers/input/keyboard/kb151.c
+new file mode 100644
+index 00000000000000..595275d4f9d96f
+--- /dev/null
++++ b/drivers/input/keyboard/kb151.c
+@@ -0,0 +1,246 @@
++// SPDX-License-Identifier: GPL-2.0-only
++//
++// Copyright (C) 2021 Samuel Holland <samuel@sholland.org>
++
++#include <linux/crc8.h>
++#include <linux/i2c.h>
++#include <linux/input/matrix_keypad.h>
++#include <linux/interrupt.h>
++#include <linux/module.h>
++#include <linux/pm_wakeirq.h>
++
++#define KB151_CRC8_POLYNOMIAL		0x07
++
++#define KB151_DEVICE_ID_HI		0x00
++#define KB151_DEVICE_ID_HI_VALUE		0x4b
++#define KB151_DEVICE_ID_LO		0x01
++#define KB151_DEVICE_ID_LO_VALUE		0x42
++#define KB151_FW_REVISION		0x02
++#define KB151_FW_FEATURES		0x03
++#define KB151_MATRIX_SIZE		0x06
++#define KB151_SCAN_CRC			0x07
++#define KB151_SCAN_DATA			0x08
++#define KB151_SYS_CONFIG		0x20
++#define KB151_SYS_CONFIG_DISABLE_SCAN		BIT(0)
++
++struct kb151 {
++	struct input_dev *input;
++	u8 crc_table[CRC8_TABLE_SIZE];
++	u8 row_shift;
++	u8 rows;
++	u8 cols;
++	u8 buf_swap;
++	u8 buf[];
++};
++
++static void kb151_update(struct i2c_client *client)
++{
++	struct kb151 *kb151 = i2c_get_clientdata(client);
++	unsigned short *keymap = kb151->input->keycode;
++	struct device *dev = &client->dev;
++	size_t buf_len = kb151->cols + 1;
++	u8 *old_buf = kb151->buf;
++	u8 *new_buf = kb151->buf;
++	int col, crc, ret, row;
++
++	if (kb151->buf_swap)
++		old_buf += buf_len;
++	else
++		new_buf += buf_len;
++
++	ret = i2c_smbus_read_i2c_block_data(client, KB151_SCAN_CRC,
++					    buf_len, new_buf);
++	if (ret != buf_len) {
++		dev_err(dev, "Failed to read scan data: %d\n", ret);
++		return;
++	}
++
++	dev_info(dev, "%02x | %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
++		new_buf[0], new_buf[1], new_buf[2], new_buf[3], new_buf[4], new_buf[5],
++		new_buf[6], new_buf[7], new_buf[8], new_buf[9], new_buf[10], new_buf[11],
++		new_buf[12]);
++	crc = crc8(kb151->crc_table, new_buf + 1, kb151->cols, CRC8_INIT_VALUE);
++	if (crc != new_buf[0]) {
++		dev_err(dev, "Bad scan data (%02x != %02x)\n",
++			crc, new_buf[0]);
++		return;
++	}
++	dev_info(dev, "Good scan data (%02x == %02x)\n",
++		crc, new_buf[0]);
++
++	for (col = 0; col < kb151->cols; ++col) {
++		u8 old = *(++old_buf);
++		u8 new = *(++new_buf);
++		u8 changed = old ^ new;
++
++		for (row = 0; row < kb151->rows; ++row) {
++			int code = MATRIX_SCAN_CODE(row, col, kb151->row_shift);
++			u8 pressed = new & BIT(row);
++
++			if (!(changed & BIT(row)))
++				continue;
++
++			dev_dbg(&client->dev, "row %u col %u %sed\n",
++				row, col, pressed ? "press" : "releas");
++			input_report_key(kb151->input, keymap[code], pressed);
++		}
++	}
++	input_sync(kb151->input);
++
++	kb151->buf_swap = !kb151->buf_swap;
++}
++
++static int kb151_open(struct input_dev *input)
++{
++	struct i2c_client *client = input_get_drvdata(input);
++	struct device *dev = &client->dev;
++	int ret, val;
++
++	ret = i2c_smbus_read_byte_data(client, KB151_SYS_CONFIG);
++	if (ret < 0) {
++		dev_err(dev, "Failed to read config: %d\n", ret);
++		return ret;
++	}
++
++	val = ret & ~KB151_SYS_CONFIG_DISABLE_SCAN;
++	ret = i2c_smbus_write_byte_data(client, KB151_SYS_CONFIG, val);
++	if (ret) {
++		dev_err(dev, "Failed to write config: %d\n", ret);
++		return ret;
++	}
++
++	kb151_update(client);
++
++	enable_irq(client->irq);
++
++	return 0;
++}
++
++static void kb151_close(struct input_dev *input)
++{
++	struct i2c_client *client = input_get_drvdata(input);
++	struct device *dev = &client->dev;
++	int ret, val;
++
++	disable_irq(client->irq);
++
++	ret = i2c_smbus_read_byte_data(client, KB151_SYS_CONFIG);
++	if (ret < 0) {
++		dev_err(dev, "Failed to read config: %d\n", ret);
++		return;
++	}
++
++	val = ret | KB151_SYS_CONFIG_DISABLE_SCAN;
++	ret = i2c_smbus_write_byte_data(client, KB151_SYS_CONFIG, val);
++	if (ret) {
++		dev_err(dev, "Failed to write config: %d\n", ret);
++	}
++}
++
++static irqreturn_t kb151_irq_thread(int irq, void *data)
++{
++	struct i2c_client *client = data;
++
++	kb151_update(client);
++
++	return IRQ_HANDLED;
++}
++
++static int kb151_probe(struct i2c_client *client)
++{
++	struct device *dev = &client->dev;
++	u8 info[KB151_MATRIX_SIZE + 1];
++	unsigned int kb_rows, kb_cols;
++	unsigned int rows, cols;
++	struct kb151 *kb151;
++	int ret;
++
++	ret = i2c_smbus_read_i2c_block_data(client, 0, sizeof(info), info);
++	if (ret != sizeof(info))
++		return ret;
++
++	if (info[KB151_DEVICE_ID_HI] != KB151_DEVICE_ID_HI_VALUE ||
++	    info[KB151_DEVICE_ID_LO] != KB151_DEVICE_ID_LO_VALUE)
++		return -ENODEV;
++
++	dev_info(dev, "Found KB151 with firmware %d.%d (features=%#x)\n",
++		 info[KB151_FW_REVISION] >> 4,
++		 info[KB151_FW_REVISION] & 0xf,
++		 info[KB151_FW_FEATURES]);
++
++	ret = matrix_keypad_parse_properties(dev, &rows, &cols);
++	if (ret)
++		return ret;
++
++	kb_rows = info[KB151_MATRIX_SIZE] & 0xf;
++	kb_cols = info[KB151_MATRIX_SIZE] >> 4;
++	if (rows > kb_rows || cols != kb_cols) {
++		dev_err(dev, "Keyboard matrix is %ux%u, but key map is %ux%u\n",
++			kb_rows, kb_cols, rows, cols);
++		return -EINVAL;
++	}
++
++	/* Allocate two buffers, and include space for the CRC. */
++	kb151 = devm_kzalloc(dev, struct_size(kb151, buf, 2 * (cols + 1)), GFP_KERNEL);
++	if (!kb151)
++		return -ENOMEM;
++
++	i2c_set_clientdata(client, kb151);
++
++	crc8_populate_msb(kb151->crc_table, KB151_CRC8_POLYNOMIAL);
++
++	kb151->row_shift = get_count_order(cols);
++	kb151->rows = rows;
++	kb151->cols = cols;
++
++	kb151->input = devm_input_allocate_device(dev);
++	if (!kb151->input)
++		return -ENOMEM;
++
++	input_set_drvdata(kb151->input, client);
++
++	kb151->input->name = client->name;
++	kb151->input->phys = "kb151/input0";
++	kb151->input->id.bustype = BUS_I2C;
++	kb151->input->open = kb151_open;
++	kb151->input->close = kb151_close;
++
++	__set_bit(EV_REP, kb151->input->evbit);
++
++	ret = matrix_keypad_build_keymap(NULL, NULL, rows, cols,
++					 NULL, kb151->input);
++	if (ret)
++		return dev_err_probe(dev, ret, "Failed to build keymap\n");
++
++	ret = devm_request_threaded_irq(dev, client->irq,
++					NULL, kb151_irq_thread,
++					IRQF_ONESHOT | IRQF_NO_AUTOEN,
++					client->name, client);
++	if (ret)
++		return dev_err_probe(dev, ret, "Failed to request IRQ\n");
++
++	ret = input_register_device(kb151->input);
++	if (ret)
++		return dev_err_probe(dev, ret, "Failed to register input\n");
++
++	return 0;
++}
++
++static const struct of_device_id kb151_of_match[] = {
++	{ .compatible = "pine64,kb151" },
++	{ }
++};
++MODULE_DEVICE_TABLE(of, kb151_of_match);
++
++static struct i2c_driver kb151_driver = {
++	.probe_new	= kb151_probe,
++	.driver		= {
++		.name		= "kb151",
++		.of_match_table = kb151_of_match,
++	},
++};
++module_i2c_driver(kb151_driver);
++
++MODULE_AUTHOR("Samuel Holland <samuel@sholland.org>");
++MODULE_DESCRIPTION("Pine64 KB151 keyboard driver");
++MODULE_LICENSE("GPL");

main/linux-postmarketos-allwinner/APKBUILD

@@ -6,9 +6,9 @@
 _flavor=postmarketos-allwinner
 _config="config-$_flavor.$CARCH"
 pkgname=linux-$_flavor
-pkgver=5.14.0_git2021830
+pkgver=5.14.1_git20210908
 pkgrel=0
-_tag="orange-pi-5.14-20210830-0334"
+_tag="orange-pi-5.14-20210908-1256"
 pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)"
 arch="aarch64 armv7"
 url="https://megous.com/git/linux/"
@@ -50,6 +50,7 @@ source="$pkgname-$_tag.tar.gz::https://github.com/megous/linux/archive/$_tag.tar
 	0012-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
 	0013-sunxi-mmc-h6-fix.patch
 	0014-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch
+	0015-add-kb151-support.patch
 	"
 subpackages="$pkgname-dev"
 builddir="$srcdir/linux-$_tag"
@@ -97,9 +98,9 @@ dev() {
 }
 
 sha512sums="
-1babfb2ca3aa7e55574773ac9faf6136b0de00b2c7690188cb1f7556277b33e9ccf7fc2560e846ba334f0d6327dc4eb03be577f30a936871b653604174295618  linux-postmarketos-allwinner-orange-pi-5.14-20210830-0334.tar.gz
-303646138d8b8e9d41ea9db8c56c010c7380e76e8b1b296cb93ade684dcebc43e3b99222c343466c8b76c036bdfcca1c833745867c975eb1ef1f1bdeed3fc75b  config-postmarketos-allwinner.aarch64
-1b69490e2d8a366972a85a65a849d441f0fcaf269f86ac5a17e52660663f923a6eb269a45095aab5adbaef1e04cd2526189744033831466c3bb8fa32691f7a4a  config-postmarketos-allwinner.armv7
+bbe5abea87c5678ef39a8570a934afa74d16bd1475428e625dcf2d8ba338d2743b69e217c0613e0eb40c843fcf1c7f48a2c4772d7ab350a4c1397fdbc5514c37  linux-postmarketos-allwinner-orange-pi-5.14-20210908-1256.tar.gz
+0d0c776848ab205e53cba28f7ac4d322a842e6fd9ee28c7713469d534a8d2adbadf0cdd09f55b577318c7631333b0d919bde0b775ff9311da6feea6e7cfb31dd  config-postmarketos-allwinner.aarch64
+a2163baabf58a9cb4318a13c6c99f77866ac96d26c1941e64434d5c0787f5d77093f56179211ecde1c32c6bca565fc693606a87bbc6d870a15fcacb144c105f3  config-postmarketos-allwinner.armv7
 126e0a65e04f22f14eac1281a69000d9d5b107ed8fd1b52f37e812751f55e6c45b0240ceac61c9d95ae7f0543aaf9d96b85a8532baf59283c077b9945e615367  0001-dts-add-dontbeevil-pinephone-devkit.patch
 1dc710f5abacdd5698169d5e985efeca8114986c774c3d65e89812d08ceb3db5ebdc6dd64dd76a262c761f3bfc3ffb6bc237fd5236bd1f89c5975d12e42eda04  0002-dts-add-pinetab-dev-old-display-panel.patch
 96849f40f6defc4ad7646256814bea5ac353c4e0479fd069365ff27456d63da801541ec616f6db736d60f3134384321a9eeb5bfbd555363bf1259c8de63d17fa  0003-dts-pinetab-add-missing-bma223-ohci1.patch
@@ -114,4 +115,5 @@ c61d4f86eddecca99df1ea1323f988e575f9c49130b64a0c50d61028ff96e24aaa3131fb3731e62e
 902708a5a8dd8a815d3d1793933d307c551e3c10368d1805431b70691ee5d4438b7146c466549f457468e365f94073a35ae3304928af7581e5dc91ba5c8fa682  0012-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
 2feeab0a6c3db46e514d45c9708f351c6d7dfb0bf951a5cb6f2dc01b4bdc8d4c46931000758a819a6d7317b16cb1933bb3946e6a78cbf448cc77f57a56c503bf  0013-sunxi-mmc-h6-fix.patch
 22af33264090dac027ee054b4345a07f0b2ee077e2ae1620e83960bfeea096169aec710973fdd50531ed4f1db6cfd59b5796cd235316cb3512aee034f741a694  0014-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch
+20efcc7169620ee3114e3b1a11c92cacafe87ffd4bf248a6ba3b36916e4b89cf37d3099535e811769de8b735c2730b2eb313f2bb17d4bd7fd7979dc5f7750d06  0015-add-kb151-support.patch
 "