linux-postmarketos-allwinner: downgrade to 5.16.4_git20220131 (MR 3086)

Downgrade to avoid the suspend issues we've been seeing for the past three
weeks. This reverts commit 3d4d3558b7
("linux-postmarketos-allwinner: upgrade to 5.17.0_git20220313 (MR 3001)").

Related: pmaports issue 1478

device/main/linux-postmarketos-allwinner/0001-dts-add-dontbeevil-pinephone-devkit.patch

@@ -1,4 +1,4 @@
-From 7e0f3a31e1071b2c6e14cffd503e8d16a4d6d5d1 Mon Sep 17 00:00:00 2001
+From faf5874c12ec57232e5389691d12db1a945629bb Mon Sep 17 00:00:00 2001
 From: Martijn Braam <martijn@brixit.nl>
 Date: Sat, 20 Apr 2019 01:19:48 +0200
 Subject: [PATCH] dts: add dontbeevil (pinephone devkit)
@@ -17,7 +17,7 @@ Subject: [PATCH] dts: add dontbeevil (pinephone devkit)
  create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-dontbeevil.dts
 
 diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile
-index 8fa5c060a4fe..a4b389fc8f14 100644
+index 41ce680e5f8d..6740e6a97161 100644
 --- a/arch/arm64/boot/dts/allwinner/Makefile
 +++ b/arch/arm64/boot/dts/allwinner/Makefile
 @@ -1,6 +1,8 @@
@@ -532,5 +532,5 @@ index 000000000000..15a91f2d6202
 +	status = "disabled";
 +};
 -- 
-2.35.1
+2.31.1
 

device/main/linux-postmarketos-allwinner/0002-dts-add-pinetab-dev-old-display-panel.patch

@@ -1,4 +1,4 @@
-From 9f489e765e4fc442822f9504582bb63c4610edc3 Mon Sep 17 00:00:00 2001
+From c0e6e18c3d4acc79f34af16d76e8af39c275f5bb Mon Sep 17 00:00:00 2001
 From: Martijn Braam <martijn@brixit.nl>
 Date: Tue, 20 Oct 2020 14:42:01 +0200
 Subject: [PATCH] dts: add pinetab-dev (old display panel)
@@ -10,7 +10,7 @@ Subject: [PATCH] dts: add pinetab-dev (old display panel)
  create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab-dev.dts
 
 diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile
-index a4b389fc8f14..7990e59067ca 100644
+index 6740e6a97161..bd9d8fa9738f 100644
 --- a/arch/arm64/boot/dts/allwinner/Makefile
 +++ b/arch/arm64/boot/dts/allwinner/Makefile
 @@ -16,6 +16,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinephone-1.1.dtb
@@ -57,5 +57,5 @@ index 000000000000..1e287f2fb9f3
 +	};
 +};
 -- 
-2.35.1
+2.31.1
 

device/main/linux-postmarketos-allwinner/0003-dts-pinetab-add-missing-bma223-ohci1.patch

@@ -1,4 +1,4 @@
-From 10ade7effd6cc0462d59b1bc49258133324fb9c9 Mon Sep 17 00:00:00 2001
+From a76ae09d570406690bde1436aa910e76ae179716 Mon Sep 17 00:00:00 2001
 From: Oliver Smith <ollieparanoid@postmarketos.org>
 Date: Tue, 20 Oct 2020 11:11:48 +0200
 Subject: [PATCH] dts: pinetab: add missing bma223, ohci1
@@ -13,10 +13,10 @@ https://gitlab.com/pine64-org/linux/-/commit/69ae7087ec51b09bb6a0afb53dddb5eb030
  1 file changed, 13 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
-index 5d8081a093b6..26ca14a66462 100644
+index 91d27bc93a3e..c33c5690a87b 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
-@@ -237,7 +237,15 @@ &i2c0_pins {
+@@ -225,7 +225,15 @@ &i2c0_pins {
  &i2c1 {
  	status = "okay";
  
@@ -33,7 +33,7 @@ index 5d8081a093b6..26ca14a66462 100644
  };
  
  &lradc {
-@@ -303,6 +311,10 @@ &ohci0 {
+@@ -291,6 +299,10 @@ &ohci0 {
  	status = "okay";
  };
  
@@ -45,5 +45,5 @@ index 5d8081a093b6..26ca14a66462 100644
  	status = "okay";
  };
 -- 
-2.35.1
+2.31.1
 

device/main/linux-postmarketos-allwinner/0004-arm64-dts-allwinner-Add-bluetooth-node-to-the-PineTa.patch

@@ -1,4 +1,4 @@
-From a3921e9d5f47eeb3b355d9948a8beb3031eb41f9 Mon Sep 17 00:00:00 2001
+From bf487dec17b09c377e8661c18af8b1b746e02142 Mon Sep 17 00:00:00 2001
 From: Martijn Braam <martijn@brixit.nl>
 Date: Tue, 20 Oct 2020 16:12:08 +0200
 Subject: [PATCH] arm64: dts: allwinner: Add bluetooth node to the PineTab
@@ -8,10 +8,10 @@ Subject: [PATCH] arm64: dts: allwinner: Add bluetooth node to the PineTab
  1 file changed, 13 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
-index 26ca14a66462..ffb36f69f517 100644
+index c33c5690a87b..ac66fd12f59f 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
-@@ -514,6 +514,19 @@ &uart0 {
+@@ -487,6 +487,19 @@ &uart0 {
  	status = "okay";
  };
  
@@ -32,5 +32,5 @@ index 26ca14a66462..ffb36f69f517 100644
  	dr_mode = "otg";
  	status = "okay";
 -- 
-2.35.1
+2.31.1
 

device/main/linux-postmarketos-allwinner/0005-dts-pinetab-make-audio-routing-consistent-with-pinep.patch

@@ -1,4 +1,4 @@
-From 74932da126383a356db3eb7a864ca68e3e23e141 Mon Sep 17 00:00:00 2001
+From 77f6107336aa2171c4b3086f8a98af42b93f65f5 Mon Sep 17 00:00:00 2001
 From: Martijn Braam <martijn@brixit.nl>
 Date: Tue, 20 Oct 2020 14:44:51 +0200
 Subject: [PATCH] dts: pinetab: make audio routing consistent with pinephone
@@ -8,10 +8,10 @@ Subject: [PATCH] dts: pinetab: make audio routing consistent with pinephone
  1 file changed, 6 insertions(+), 5 deletions(-)
 
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
-index ffb36f69f517..faa0eb2e5718 100644
+index ac66fd12f59f..1923c6d0debe 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
-@@ -487,19 +487,20 @@ hdmi_out_con: endpoint {
+@@ -460,19 +460,20 @@ &reg_rtc_ldo {
  
  &sound {
  	status = "okay";
@@ -38,5 +38,5 @@ index ffb36f69f517..faa0eb2e5718 100644
  			"ADCR", "Right ADC",
  			"Internal Microphone Left", "MBIAS",
 -- 
-2.35.1
+2.31.1
 

device/main/linux-postmarketos-allwinner/0006-media-ov5640-Implement-autofocus.patch

@@ -0,0 +1,409 @@
+From 628f3a4895037660bc34c0d818b41b0712548af1 Mon Sep 17 00:00:00 2001
+From: Martijn Braam <martijn@brixit.nl>
+Date: Mon, 28 Sep 2020 14:26:11 +0200
+Subject: [PATCH] media: ov5640: Implement autofocus
+
+The autofocus functionality needs a firmware blob loaded into the
+internal microcontroller.
+
+V4L2 doesn't have an api to control all autofocus functionality, but
+this at least makes it possible to focus on the center of the sensor.
+
+Signed-off-by: Martijn Braam <martijn@brixit.nl>
+---
+ drivers/media/i2c/ov5640.c | 273 +++++++++++++++++++++++++++++++++++++
+ 1 file changed, 273 insertions(+)
+
+diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c
+index 7764e755bd05..65ab69f6b71a 100644
+--- a/drivers/media/i2c/ov5640.c
++++ b/drivers/media/i2c/ov5640.c
+@@ -9,6 +9,7 @@
+ #include <linux/clkdev.h>
+ #include <linux/ctype.h>
+ #include <linux/delay.h>
++#include <linux/firmware.h>
+ #include <linux/device.h>
+ #include <linux/gpio/consumer.h>
+ #include <linux/i2c.h>
+@@ -31,7 +32,11 @@
+ 
+ #define OV5640_DEFAULT_SLAVE_ID 0x3c
+ 
++#define OV5640_REG_SYS_RESET00		0x3000
++#define OV5640_REG_SYS_RESET01		0x3001
+ #define OV5640_REG_SYS_RESET02		0x3002
++#define OV5640_REG_SYS_CLOCK_ENABLE00	0x3004
++#define OV5640_REG_SYS_CLOCK_ENABLE01	0x3005
+ #define OV5640_REG_SYS_CLOCK_ENABLE02	0x3006
+ #define OV5640_REG_SYS_CTRL0		0x3008
+ #define OV5640_REG_SYS_CTRL0_SW_PWDN	0x42
+@@ -41,6 +46,14 @@
+ #define OV5640_REG_PAD_OUTPUT_ENABLE01	0x3017
+ #define OV5640_REG_PAD_OUTPUT_ENABLE02	0x3018
+ #define OV5640_REG_PAD_OUTPUT00		0x3019
++#define OV5640_REG_FW_CMD_MAIN		0x3022
++#define OV5640_REG_FW_CMD_ACK		0x3023
++#define OV5640_REG_FW_CMD_PARA0		0x3024
++#define OV5640_REG_FW_CMD_PARA1		0x3025
++#define OV5640_REG_FW_CMD_PARA2		0x3026
++#define OV5640_REG_FW_CMD_PARA3		0x3027
++#define OV5640_REG_FW_CMD_PARA4		0x3028
++#define OV5640_REG_FW_STATUS		0x3029
+ #define OV5640_REG_SYSTEM_CONTROL1	0x302e
+ #define OV5640_REG_SC_PLL_CTRL0		0x3034
+ #define OV5640_REG_SC_PLL_CTRL1		0x3035
+@@ -59,6 +72,7 @@
+ #define OV5640_REG_AEC_PK_MANUAL	0x3503
+ #define OV5640_REG_AEC_PK_REAL_GAIN	0x350a
+ #define OV5640_REG_AEC_PK_VTS		0x350c
++#define OV5640_REG_VCM_CONTROL4		0x3606
+ #define OV5640_REG_TIMING_DVPHO		0x3808
+ #define OV5640_REG_TIMING_DVPVO		0x380a
+ #define OV5640_REG_TIMING_HTS		0x380c
+@@ -96,6 +110,20 @@
+ #define OV5640_REG_SDE_CTRL4		0x5584
+ #define OV5640_REG_SDE_CTRL5		0x5585
+ #define OV5640_REG_AVG_READOUT		0x56a1
++#define OV5640_REG_FIRMWARE_BASE	0x8000
++
++#define OV5640_FW_STATUS_S_FIRMWARE	0x7f
++#define OV5640_FW_STATUS_S_STARTUP	0x7e
++#define OV5640_FW_STATUS_S_IDLE		0x70
++#define OV5640_FW_STATUS_S_FOCUSING	0x00
++#define OV5640_FW_STATUS_S_FOCUSED	0x10
++
++#define OV5640_FW_CMD_TRIGGER_FOCUS	0x03
++#define OV5640_FW_CMD_CONTINUOUS_FOCUS	0x04
++#define OV5640_FW_CMD_GET_FOCUS_RESULT	0x07
++#define OV5640_FW_CMD_RELEASE_FOCUS	0x08
++#define OV5640_FW_CMD_ZONE_CONFIG	0x12
++#define OV5640_FW_CMD_DEFAULT_ZONES	0x80
+ 
+ enum ov5640_mode_id {
+ 	OV5640_MODE_QQVGA_160_120 = 0,
+@@ -220,6 +248,12 @@ struct ov5640_ctrls {
+ 		struct v4l2_ctrl *auto_gain;
+ 		struct v4l2_ctrl *gain;
+ 	};
++	struct {
++		struct v4l2_ctrl *focus_auto;
++		struct v4l2_ctrl *af_start;
++		struct v4l2_ctrl *af_stop;
++		struct v4l2_ctrl *af_status;
++	};
+ 	struct v4l2_ctrl *brightness;
+ 	struct v4l2_ctrl *light_freq;
+ 	struct v4l2_ctrl *saturation;
+@@ -263,6 +297,8 @@ struct ov5640_dev {
+ 
+ 	bool pending_mode_change;
+ 	bool streaming;
++
++	bool af_initialized;
+ };
+ 
+ static inline struct ov5640_dev *to_ov5640_dev(struct v4l2_subdev *sd)
+@@ -1927,6 +1963,118 @@ static void ov5640_reset(struct ov5640_dev *sensor)
+ 	usleep_range(20000, 25000);
+ }
+ 
++static int ov5640_copy_fw_to_device(struct ov5640_dev *sensor,
++					const struct firmware *fw)
++{
++	struct i2c_client *client = sensor->i2c_client;
++	const u8 *data = (const u8 *)fw->data;
++	u8 fw_status;
++	int i;
++	int ret;
++
++	// Putting MCU in reset state
++	ret = ov5640_write_reg(sensor, OV5640_REG_SYS_RESET00, 0x20);
++	if (ret)
++		return ret;
++
++	// Write firmware
++	for (i = 0; i < fw->size / sizeof(u8); i++)
++		ov5640_write_reg(sensor,
++				OV5640_REG_FIRMWARE_BASE + i, 
++				data[i]);
++
++	// Reset MCU state
++	ov5640_write_reg(sensor, OV5640_REG_FW_CMD_MAIN, 0x00);
++	ov5640_write_reg(sensor, OV5640_REG_FW_CMD_ACK, 0x00);
++	ov5640_write_reg(sensor, OV5640_REG_FW_CMD_PARA0, 0x00);
++	ov5640_write_reg(sensor, OV5640_REG_FW_CMD_PARA1, 0x00);
++	ov5640_write_reg(sensor, OV5640_REG_FW_CMD_PARA2, 0x00);
++	ov5640_write_reg(sensor, OV5640_REG_FW_CMD_PARA3, 0x00);
++	ov5640_write_reg(sensor, OV5640_REG_FW_CMD_PARA4, 0x00);
++	ov5640_write_reg(sensor, OV5640_REG_FW_STATUS, 0x7f);
++
++	// Start AF MCU
++	ret = ov5640_write_reg(sensor, OV5640_REG_SYS_RESET00, 0x00);
++	if (ret)
++		return ret;
++
++	dev_info(&client->dev, "firmware upload success\n");
++
++	// Wait for firmware to be ready
++	for (i = 0; i < 5; i++) {
++		ret = ov5640_read_reg(sensor, OV5640_REG_FW_STATUS, &fw_status);
++		if (fw_status == OV5640_FW_STATUS_S_IDLE) {
++			dev_info(&client->dev, "fw started after %d ms\n", i * 50);
++			return ret;
++		}
++		msleep(50);
++	}
++	dev_err(&client->dev, "uploaded firmware didn't start, got to 0x%x, retrying...\n", fw_status);
++
++	// Putting MCU in reset state
++	ret = ov5640_write_reg(sensor, OV5640_REG_SYS_RESET00, 0x20);
++	if (ret)
++		return ret;
++	// Start AF MCU
++	ret = ov5640_write_reg(sensor, OV5640_REG_SYS_RESET00, 0x00);
++	if (ret)
++		return ret;
++	// Wait for firmware to be ready
++	for (i = 0; i < 5; i++) {
++		ret = ov5640_read_reg(sensor, OV5640_REG_FW_STATUS, &fw_status);
++		if (fw_status == OV5640_FW_STATUS_S_IDLE) {
++			dev_info(&client->dev, "fw started after %d ms\n", i * 50);
++			return ret;
++		}
++		msleep(50);
++	}
++	dev_err(&client->dev, "uploaded firmware didn't start, got to 0x%x\n", fw_status);
++	return -ETIMEDOUT;
++}
++
++static int ov5640_af_init(struct ov5640_dev *sensor)
++{
++	struct i2c_client *client = sensor->i2c_client;
++	const char* fwname = "ov5640_af.bin";
++	const struct firmware *fw;
++	int ret;
++
++	if (sensor->af_initialized) {
++		return 0;
++	}
++
++	if (firmware_request_nowarn(&fw, fwname, &client->dev) == 0) {
++		ret = ov5640_copy_fw_to_device(sensor, fw);
++		if (ret == 0)
++			sensor->af_initialized = 1;
++	} else {
++		dev_warn(&client->dev, "%s: no autofocus firmware available (%s)\n",
++			__func__, fwname);
++		ret = -1;
++	}
++	release_firmware(fw);
++
++	if (ret)
++		return ret;
++
++	// Enable AF systems
++	ret = ov5640_mod_reg(sensor, OV5640_REG_SYS_CLOCK_ENABLE00,
++			     (BIT(6) | BIT(5)), (BIT(6) | BIT(5)));
++	if (ret)
++		return ret;
++	ret = ov5640_mod_reg(sensor, OV5640_REG_SYS_CLOCK_ENABLE01,
++			     BIT(6), BIT(6));
++	if (ret)
++		return ret;
++
++	// Set lens focus driver on
++	ov5640_write_reg(sensor, OV5640_REG_VCM_CONTROL4, 0x3f);
++	if (ret)
++		return ret;
++
++	return ret;
++}
++
+ static int ov5640_set_power_on(struct ov5640_dev *sensor)
+ {
+ 	struct i2c_client *client = sensor->i2c_client;
+@@ -1948,6 +2096,8 @@ static int ov5640_set_power_on(struct ov5640_dev *sensor)
+ 		goto xclk_off;
+ 	}
+ 
++	sensor->af_initialized = 0;
++
+ 	ov5640_reset(sensor);
+ 	ov5640_power(sensor, true);
+ 
+@@ -2463,6 +2613,35 @@ static int ov5640_set_framefmt(struct ov5640_dev *sensor,
+ 			      is_jpeg ? (BIT(5) | BIT(3)) : 0);
+ }
+ 
++static int ov5640_fw_command(struct ov5640_dev *sensor, int command)
++{
++	u8 fw_ack;
++	int i;
++	int ret;
++
++	ret = ov5640_write_reg(sensor, OV5640_REG_FW_CMD_ACK, 0x01);
++	if(ret)
++		return ret;
++	
++	ret = ov5640_write_reg(sensor, OV5640_REG_FW_CMD_MAIN, command);
++	if(ret)
++		return ret;
++
++	for (i = 0; i < 100; i++) {
++		ret = ov5640_read_reg(sensor, OV5640_REG_FW_CMD_ACK, &fw_ack);
++		if (ret)
++			return ret;
++
++		if (fw_ack == 0){
++			return ret;
++		}
++
++		msleep(50);
++	}
++	return -ETIMEDOUT;
++}
++
++
+ /*
+  * Sensor Controls.
+  */
+@@ -2579,6 +2758,41 @@ static int ov5640_set_ctrl_exposure(struct ov5640_dev *sensor,
+ 	return ret;
+ }
+ 
++static int ov5640_set_ctrl_focus(struct ov5640_dev *sensor, int command)
++{
++	struct i2c_client *client = sensor->i2c_client;
++	int ret;
++
++	ret = ov5640_af_init(sensor);
++	if (ret) {
++		dev_err(&client->dev, "%s: no autofocus firmware loaded\n",
++			__func__);
++		return 0;
++	}
++
++	if (command == OV5640_FW_CMD_RELEASE_FOCUS) {
++		dev_dbg(&client->dev, "%s: Releasing autofocus\n",
++			__func__);
++		return ov5640_fw_command(sensor, OV5640_FW_CMD_RELEASE_FOCUS);
++	}
++	
++	// Restart zone config
++	ret = ov5640_fw_command(sensor, OV5640_FW_CMD_ZONE_CONFIG);
++	if (ret)
++		return ret;
++
++	// Set default focus zones
++	ret = ov5640_fw_command(sensor, OV5640_FW_CMD_DEFAULT_ZONES);
++	if (ret)
++		return ret;
++
++	dev_dbg(&client->dev, "%s: Triggering autofocus\n",
++		__func__);
++
++	// Start focussing
++	return ov5640_fw_command(sensor, command);
++}
++
+ static int ov5640_set_ctrl_gain(struct ov5640_dev *sensor, bool auto_gain)
+ {
+ 	struct ov5640_ctrls *ctrls = &sensor->ctrls;
+@@ -2685,6 +2899,32 @@ static int ov5640_set_ctrl_vflip(struct ov5640_dev *sensor, int value)
+ 			      (BIT(2) | BIT(1)) : 0);
+ }
+ 
++static int ov5640_get_af_status(struct ov5640_dev *sensor)
++{
++	u8 fw_status;
++	int ret;
++
++	ret = ov5640_read_reg(sensor, OV5640_REG_FW_STATUS, &fw_status);
++	if (ret)
++		return ret;
++
++	switch (fw_status) {
++		case OV5640_FW_STATUS_S_FIRMWARE:
++		case OV5640_FW_STATUS_S_STARTUP:
++			return V4L2_AUTO_FOCUS_STATUS_FAILED;
++			break;
++		case OV5640_FW_STATUS_S_IDLE:
++			return V4L2_AUTO_FOCUS_STATUS_IDLE;
++			break;
++		case OV5640_FW_STATUS_S_FOCUSED:
++			return V4L2_AUTO_FOCUS_STATUS_REACHED;
++			break;
++		default:
++			return V4L2_AUTO_FOCUS_STATUS_BUSY;
++			break;
++	}
++}
++
+ static int ov5640_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
+ {
+ 	struct v4l2_subdev *sd = ctrl_to_sd(ctrl);
+@@ -2706,6 +2946,12 @@ static int ov5640_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
+ 			return val;
+ 		sensor->ctrls.exposure->val = val;
+ 		break;
++	case V4L2_CID_FOCUS_AUTO:
++		val = ov5640_get_af_status(sensor);
++		if (val < 0)
++			return val;
++		sensor->ctrls.af_status->val = val;
++		break;
+ 	}
+ 
+ 	return 0;
+@@ -2737,6 +2983,18 @@ static int ov5640_s_ctrl(struct v4l2_ctrl *ctrl)
+ 	case V4L2_CID_AUTO_WHITE_BALANCE:
+ 		ret = ov5640_set_ctrl_white_balance(sensor, ctrl->val);
+ 		break;
++	case V4L2_CID_FOCUS_AUTO:
++		if (ctrl->val)
++			ret = ov5640_set_ctrl_focus(sensor, OV5640_FW_CMD_CONTINUOUS_FOCUS);
++		else
++			ret = ov5640_set_ctrl_focus(sensor, OV5640_FW_CMD_RELEASE_FOCUS);
++		break;
++	case V4L2_CID_AUTO_FOCUS_START:
++		ret = ov5640_set_ctrl_focus(sensor, OV5640_FW_CMD_TRIGGER_FOCUS);
++		break;
++	case V4L2_CID_AUTO_FOCUS_STOP:
++		ret = ov5640_set_ctrl_focus(sensor, OV5640_FW_CMD_RELEASE_FOCUS);
++		break;
+ 	case V4L2_CID_HUE:
+ 		ret = ov5640_set_ctrl_hue(sensor, ctrl->val);
+ 		break;
+@@ -2809,6 +3067,20 @@ static int ov5640_init_controls(struct ov5640_dev *sensor)
+ 	ctrls->gain = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_GAIN,
+ 					0, 1023, 1, 0);
+ 
++	/* Autofocus */
++	ctrls->focus_auto = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_FOCUS_AUTO,
++					    0, 1, 1, 0);
++	ctrls->af_start = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_AUTO_FOCUS_START,
++					    0, 1, 1, 0);
++	ctrls->af_stop = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_AUTO_FOCUS_STOP,
++					   0, 1, 1, 0);
++	ctrls->af_status = v4l2_ctrl_new_std(hdl, ops,
++					     V4L2_CID_AUTO_FOCUS_STATUS, 0,
++					     (V4L2_AUTO_FOCUS_STATUS_BUSY |
++					      V4L2_AUTO_FOCUS_STATUS_REACHED |
++					      V4L2_AUTO_FOCUS_STATUS_FAILED),
++					     0, V4L2_AUTO_FOCUS_STATUS_IDLE);
++
+ 	ctrls->saturation = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_SATURATION,
+ 					      0, 255, 1, 64);
+ 	ctrls->hue = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_HUE,
+@@ -2842,6 +3114,7 @@ static int ov5640_init_controls(struct ov5640_dev *sensor)
+ 	v4l2_ctrl_auto_cluster(3, &ctrls->auto_wb, 0, false);
+ 	v4l2_ctrl_auto_cluster(2, &ctrls->auto_gain, 0, true);
+ 	v4l2_ctrl_auto_cluster(2, &ctrls->auto_exp, 1, true);
++	v4l2_ctrl_cluster(4, &ctrls->focus_auto);
+ 
+ 	sensor->sd.ctrl_handler = hdl;
+ 	return 0;
+-- 
+2.31.1
+

device/main/linux-postmarketos-allwinner/0007-dts-pinephone-drop-modem-power-node.patch

@@ -1,4 +1,4 @@
-From 73ec00a74b44f860457e263afef8e983fb6220ed Mon Sep 17 00:00:00 2001
+From 1879de83c95ba0e133b2ed8c945fe1be3b46f8f1 Mon Sep 17 00:00:00 2001
 From: Clayton Craft <clayton@craftyguy.net>
 Date: Wed, 16 Dec 2020 20:16:14 -0800
 Subject: [PATCH] dts: pinephone: drop modem-power node
@@ -11,10 +11,10 @@ Subject: [PATCH] dts: pinephone: drop modem-power node
  4 files changed, 24 insertions(+), 68 deletions(-)
 
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
-index 864f887e1362..23223541dd03 100644
+index a21c6d78a0ef..7f0cfdafed15 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
-@@ -87,28 +87,6 @@ &reg_drivevbus {
+@@ -86,28 +86,6 @@ &reg_drivevbus {
  	status = "okay";
  };
  
@@ -43,7 +43,7 @@ index 864f887e1362..23223541dd03 100644
  &usbphy {
  	usb-role-switch;
  
-@@ -119,6 +97,10 @@ usb0_drd_sw: endpoint {
+@@ -118,6 +96,10 @@ usb0_drd_sw: endpoint {
  	};
  };
  
@@ -55,10 +55,10 @@ index 864f887e1362..23223541dd03 100644
  	enable-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
  	flash-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
-index 053e4add9973..853a8f55348e 100644
+index d67f31ef529e..e7b636299d15 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
-@@ -101,29 +101,6 @@ &sgm3140 {
+@@ -114,29 +114,6 @@ &sgm3140 {
  	flash-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
  };
  
@@ -88,22 +88,19 @@ index 053e4add9973..853a8f55348e 100644
  &usbphy {
  	usb-role-switch;
  
-@@ -134,6 +111,10 @@ usb0_drd_sw: endpoint {
+@@ -146,3 +123,7 @@ usb0_drd_sw: endpoint {
+ 		};
  	};
  };
- 
++
 +&ring_indicator {
 +	gpios = <&pio 1 2 GPIO_ACTIVE_LOW>; /* PB2 */
 +};
-+
- &hdmi {
- 	extcon = <&anx7688 0>;
- };
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts
-index ec4927dfe9dc..9ddd042b7799 100644
+index 9b33186c7e7d..44b3d6555ff7 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts
-@@ -93,29 +93,6 @@ &sgm3140 {
+@@ -107,29 +107,6 @@ &sgm3140 {
  	flash-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
  };
  
@@ -133,22 +130,19 @@ index ec4927dfe9dc..9ddd042b7799 100644
  &usbphy {
  	usb-role-switch;
  
-@@ -126,6 +103,10 @@ usb0_drd_sw: endpoint {
+@@ -139,3 +116,7 @@ usb0_drd_sw: endpoint {
+ 		};
  	};
  };
- 
++
 +&ring_indicator {
 +	gpios = <&r_pio 0 6 GPIO_ACTIVE_LOW>; /* PL6 */
 +};
-+
- &hdmi {
- 	extcon = <&anx7688 0>;
- };
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-index 4e88bcbcc968..c07e89d4a90b 100644
+index d3d4f1a53c8d..3cf2f3e6a41a 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-@@ -310,6 +310,17 @@ ec25_codec: ec25-codec {
+@@ -192,6 +192,17 @@ ec25_codec: ec25-codec {
  		sound-name-prefix = "Modem";
  	};
  
@@ -166,7 +160,7 @@ index 4e88bcbcc968..c07e89d4a90b 100644
  	i2c_csi: i2c-csi {
  		compatible = "i2c-gpio";
  		sda-gpios = <&pio 4 13 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; /* PE13 */
-@@ -382,6 +393,7 @@ reg_usb_5v: usb-5v {
+@@ -264,6 +275,7 @@ reg_usb_5v: usb-5v {
  	reg_vbat_bb: vbat-bb {
  		compatible = "regulator-fixed";
  		regulator-name = "vbat-bb";
@@ -175,5 +169,5 @@ index 4e88bcbcc968..c07e89d4a90b 100644
  		regulator-max-microvolt = <3500000>;
  		gpio = <&r_pio 0 7 GPIO_ACTIVE_HIGH>; /* PL7 */
 -- 
-2.35.1
+2.31.1
 

device/main/linux-postmarketos-allwinner/0008-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch

@@ -1,4 +1,4 @@
-From a709b4f0b89f8745e4fb097e4588f15c1dab67fa Mon Sep 17 00:00:00 2001
+From 49edde139be2fee279e4b1f3eeba67912d551601 Mon Sep 17 00:00:00 2001
 From: JuniorJPDJ <git@juniorjpdj.pl>
 Date: Tue, 23 Mar 2021 12:27:30 +0100
 Subject: [PATCH] drm: panel: simple: Add Hannstar TQTM070CB501
@@ -8,10 +8,10 @@ Subject: [PATCH] drm: panel: simple: Add Hannstar TQTM070CB501
  1 file changed, 27 insertions(+)
 
 diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
-index 3c08f9827acf..95ffc2a7c57e 100644
+index 4e2dad314c79..cd507bf895f5 100644
 --- a/drivers/gpu/drm/panel/panel-simple.c
 +++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -1928,6 +1928,30 @@ static const struct panel_desc hannstar_hsd100pxn1 = {
+@@ -2179,6 +2179,30 @@ static const struct panel_desc hannstar_hsd100pxn1 = {
  	.connector_type = DRM_MODE_CONNECTOR_LVDS,
  };
  
@@ -42,7 +42,7 @@ index 3c08f9827acf..95ffc2a7c57e 100644
  static const struct drm_display_mode hitachi_tx23d38vm0caa_mode = {
  	.clock = 33333,
  	.hdisplay = 800,
-@@ -3806,6 +3830,9 @@ static const struct of_device_id platform_of_match[] = {
+@@ -4265,6 +4289,9 @@ static const struct of_device_id platform_of_match[] = {
  	}, {
  		.compatible = "hit,tx23d38vm0caa",
  		.data = &hitachi_tx23d38vm0caa
@@ -53,5 +53,5 @@ index 3c08f9827acf..95ffc2a7c57e 100644
  		.compatible = "innolux,at043tn24",
  		.data = &innolux_at043tn24,
 -- 
-2.35.1
+2.31.1
 

device/main/linux-postmarketos-allwinner/0009-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch

@@ -1,4 +1,4 @@
-From 723b6344c456548b18920ad0acf08953933ffc3a Mon Sep 17 00:00:00 2001
+From cd06dec28f2c6a61cb3c2ef00c2a68efe4c26db6 Mon Sep 17 00:00:00 2001
 From: JuniorJPDJ <git@juniorjpdj.pl>
 Date: Tue, 23 Mar 2021 12:29:37 +0100
 Subject: [PATCH] ARM: dts: sun6i: Add GoClever Orion 70L tablet
@@ -10,10 +10,10 @@ Subject: [PATCH] ARM: dts: sun6i: Add GoClever Orion 70L tablet
  create mode 100644 arch/arm/boot/dts/sun6i-a31s-goclever-gcta741l.dts
 
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 3fc5032a18b4..4dc23b505f06 100644
+index 127a10cb590d..ba31b42f1e18 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -1218,6 +1218,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
+@@ -1136,6 +1136,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \
  	sun6i-a31-mele-a1000g-quad.dtb \
  	sun6i-a31s-colorfly-e708-q1.dtb \
  	sun6i-a31s-cs908.dtb \
@@ -131,5 +131,5 @@ index 000000000000..7fb95aef4c74
 +	status = "okay";
 +};
 -- 
-2.35.1
+2.31.1
 

device/main/linux-postmarketos-allwinner/0010-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch

@@ -1,4 +1,4 @@
-From dab9ccdbf81b008f091add185508f81bde46d4b3 Mon Sep 17 00:00:00 2001
+From 8e2f5f4d514b94cfac85f3dce3d39e042b3ade69 Mon Sep 17 00:00:00 2001
 From: JuniorJPDJ <git@juniorjpdj.pl>
 Date: Thu, 25 Mar 2021 19:11:22 +0100
 Subject: [PATCH] drm: panel: simple: Add Hannstar HSD070IDW1-A
@@ -8,10 +8,10 @@ Subject: [PATCH] drm: panel: simple: Add Hannstar HSD070IDW1-A
  1 file changed, 27 insertions(+)
 
 diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
-index 95ffc2a7c57e..1a1bdd343bfb 100644
+index cd507bf895f5..ac8cfb3ce163 100644
 --- a/drivers/gpu/drm/panel/panel-simple.c
 +++ b/drivers/gpu/drm/panel/panel-simple.c
-@@ -1873,6 +1873,30 @@ static const struct panel_desc giantplus_gpm940b0 = {
+@@ -2124,6 +2124,30 @@ static const struct panel_desc giantplus_gpm940b0 = {
  	.bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_SAMPLE_POSEDGE,
  };
  
@@ -42,7 +42,7 @@ index 95ffc2a7c57e..1a1bdd343bfb 100644
  static const struct display_timing hannstar_hsd070pww1_timing = {
  	.pixelclock = { 64300000, 71100000, 82000000 },
  	.hactive = { 1280, 1280, 1280 },
-@@ -3821,6 +3845,9 @@ static const struct of_device_id platform_of_match[] = {
+@@ -4280,6 +4304,9 @@ static const struct of_device_id platform_of_match[] = {
  	}, {
  		.compatible = "giantplus,gpm940b0",
  		.data = &giantplus_gpm940b0,
@@ -53,5 +53,5 @@ index 95ffc2a7c57e..1a1bdd343bfb 100644
  		.compatible = "hannstar,hsd070pww1",
  		.data = &hannstar_hsd070pww1,
 -- 
-2.35.1
+2.31.1
 

device/main/linux-postmarketos-allwinner/0011-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch

@@ -1,4 +1,4 @@
-From 6131f16f167be12ecda507d1ea24301346355e77 Mon Sep 17 00:00:00 2001
+From e9ac5ae02481dfe87335d9f2033785f0263c820d Mon Sep 17 00:00:00 2001
 From: JuniorJPDJ <git@juniorjpdj.pl>
 Date: Thu, 25 Mar 2021 19:18:58 +0100
 Subject: [PATCH] ARM: dts: sun6i: Add Lark FreeMe 70.2S tablet
@@ -10,10 +10,10 @@ Subject: [PATCH] ARM: dts: sun6i: Add Lark FreeMe 70.2S tablet
  create mode 100644 arch/arm/boot/dts/sun4i-a10-lark-freeme-70-2s.dts
 
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 4dc23b505f06..2a01d5e8c650 100644
+index ba31b42f1e18..f5df06c4d564 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -1179,6 +1179,7 @@ dtb-$(CONFIG_MACH_SUN4I) += \
+@@ -1098,6 +1098,7 @@ dtb-$(CONFIG_MACH_SUN4I) += \
  	sun4i-a10-inet9f-rev03.dtb \
  	sun4i-a10-itead-iteaduino-plus.dtb \
  	sun4i-a10-jesurun-q5.dtb \
@@ -274,5 +274,5 @@ index 000000000000..fcba874976fa
 +	status = "okay";
 +};
 -- 
-2.35.1
+2.31.1
 

device/main/linux-postmarketos-allwinner/0012-sunxi-mmc-h6-fix.patch

@@ -1,4 +1,4 @@
-From df584b45ea726f86b6d7696fc6cd0e0b4ef67301 Mon Sep 17 00:00:00 2001
+From 3453110622f9f5ab3a602bd5e126f4a598d9b7c4 Mon Sep 17 00:00:00 2001
 From: Jernej Skrabec <jernej.skrabec@siol.net>
 Date: Sat, 24 Aug 2019 01:36:44 +0200
 Subject: [PATCH] eMMC workaround
@@ -34,5 +34,5 @@ index 55ca34803a3f..962c948fef17 100644
  
  	ret = mmc_of_parse(mmc);
 -- 
-2.35.1
+2.33.0
 

device/main/linux-postmarketos-allwinner/0013-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch

@@ -1,4 +1,4 @@
-From e5afc97afebf2982c740dc691e801ed3b9e5e382 Mon Sep 17 00:00:00 2001
+From a337472571ea8d154e22325a2c06a8b982716fb0 Mon Sep 17 00:00:00 2001
 From: Maxim Karasev <begs@disroot.org>
 Date: Sat, 4 Sep 2021 14:56:01 +0300
 Subject: [PATCH] arm64: dts: allwinner: orangepi-3: fix ethernet
@@ -10,10 +10,10 @@ patch from LibreELEC tree.
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
-index 5780ae248964..14a0394a4823 100644
+index adf2134ec1a4..82740a8aef9b 100644
 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
 +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
-@@ -145,7 +145,7 @@ hdmi_out_con: endpoint {
+@@ -141,7 +141,7 @@ hdmi_out_con: endpoint {
  &emac {
  	pinctrl-names = "default";
  	pinctrl-0 = <&ext_rgmii_pins>;
@@ -22,7 +22,7 @@ index 5780ae248964..14a0394a4823 100644
  	phy-handle = <&ext_rgmii_phy>;
  	/*
  	 * The board uses 2.5V RGMII signalling. Power sequence to enable
-@@ -155,8 +155,8 @@ &emac {
+@@ -151,8 +151,8 @@ &emac {
  	 */
  	phy-supply = <&reg_aldo2>;
  	phy-io-supply = <&reg_gmac_2v5>;
@@ -34,5 +34,5 @@ index 5780ae248964..14a0394a4823 100644
  };
  
 -- 
-2.35.1
+2.33.0
 

device/main/linux-postmarketos-allwinner/APKBUILD

@@ -6,9 +6,9 @@
 _flavor=postmarketos-allwinner
 _config="config-$_flavor.$CARCH"
 pkgname=linux-$_flavor
-pkgver=5.17.0_git20220313
-pkgrel=0
-_tag="orange-pi-5.17-20220313-2345"
+pkgver=5.16.4_git20220131
+pkgrel=2
+_tag="orange-pi-5.16-20220131-0002"
 pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)"
 arch="aarch64 armv7"
 url="https://megous.com/git/linux/"
@@ -43,13 +43,14 @@ source="$pkgname-$_tag.tar.gz::https://github.com/megous/linux/archive/$_tag.tar
 	0003-dts-pinetab-add-missing-bma223-ohci1.patch
 	0004-arm64-dts-allwinner-Add-bluetooth-node-to-the-PineTa.patch
 	0005-dts-pinetab-make-audio-routing-consistent-with-pinep.patch
-	0006-dts-pinephone-drop-modem-power-node.patch
-	0007-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch
-	0008-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch
-	0009-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch
-	0010-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
-	0011-eMMC-workaround.patch
-	0012-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch
+	0006-media-ov5640-Implement-autofocus.patch
+	0007-dts-pinephone-drop-modem-power-node.patch
+	0008-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch
+	0009-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch
+	0010-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch
+	0011-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
+	0012-sunxi-mmc-h6-fix.patch
+	0013-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch
 	"
 subpackages="$pkgname-dev"
 builddir="$srcdir/linux-$_tag"
@@ -97,19 +98,20 @@ dev() {
 		INSTALL_HDR_PATH="$subpkgdir"/usr
 }
 sha512sums="
-b24b34e9a8ef66d37891c1d21eb71f9de83e0fde167ac08d776ac3e7b6262e9911908b453b598eb2e01658ec141d4d08337e4cc20f77af298e639ef9119edb61  linux-postmarketos-allwinner-orange-pi-5.17-20220313-2345.tar.gz
-c2473cbe6e94004ad7e285e6b8f374f857a0bc0ea8bab4b82a868796c5ad7dc612f2b80b32025803d93a7bd4148429ebb35ce7a238daf990f496331cd5f899af  config-postmarketos-allwinner.aarch64
+7ed825eb7311838cd14661192e80149c0a1cd24541eb50808c7261ecb866cf39028c3c7dda0410aeb913670aac63af23d764f98af9e563bf5165cac7f0e51026  linux-postmarketos-allwinner-orange-pi-5.16-20220131-0002.tar.gz
+73d1adb55c51bc96b411db7573da39b2f69f274982037b2eee05022664802bdc44fd5740377114fe0b735e723fe4eda20b3845c0118ac072e0bb7a0e66e5e1c7  config-postmarketos-allwinner.aarch64
 18738214275280f45375de9ccff83df7c9f37eb66dfd0834780e6b155d95a7d39c55f00fd66be4dde4a8b85accd285b6ef10285b41f75618ad7f44ddcdd0b9a9  config-postmarketos-allwinner.armv7
-244d2c1356f5de77a5d05ba16d10e0d19915f634b3b1b96259857b1a3d57a023027a94622ffb56d5c72aeaeb7a9a220d629d51cfbb24225a7eca0140eb1ba19b  0001-dts-add-dontbeevil-pinephone-devkit.patch
-31e2f5e0f590f017a355469609b5fd97fbc18d54c42a98bd44944a91a8e42eade0963def4704bc04d6cc5316a8adfe97b7854a2053fc33847ee797830218e029  0002-dts-add-pinetab-dev-old-display-panel.patch
-8b7f5b3fccc030d3278725131d1af4c13efbc6ba037f3d734ff8bd1bcd5d2f2a2f024d83b90f0f780e9ddbfbdc20c8f5f1541580c5da3fb3cefb7f391c285aaa  0003-dts-pinetab-add-missing-bma223-ohci1.patch
-f5c8e1acd9f3a25915d22d94e380c1e6cde1d7b056d0d7080ae4e012f0eeccbe5d4fb57847049564c7d8eb791e6622619004af25a8f62646403c171d4ed10c82  0004-arm64-dts-allwinner-Add-bluetooth-node-to-the-PineTa.patch
-f6ec1e0cc5b0a34e5b98535f9ff45dc0b1b6b5ec1f622ef6780cc9fac0db2ada455aae37d731e4ae7d7c51be773e400a8d6215bbcc97f9dd223ae4f2b0c8782e  0005-dts-pinetab-make-audio-routing-consistent-with-pinep.patch
-623a08ef4138b150917edaa76f5d2c1b099acae6dab01bd255f55824d967424537c731cb83fe85597ac46506361b7ed7a68b0d35feb537c25daa6e7e03641b6d  0006-dts-pinephone-drop-modem-power-node.patch
-139c78ffcd66d813f2bd729b7aa81550608f1fc97667dbcd0cb55d00807e69adcbe86e59b637a3dad5336afabbb8e8d7d045955506a4a382d63ddb5caf5f4f01  0007-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch
-e9897068210edd3295fb813390b263ccc146541f4bc89e66fea4a48ce9114ac0ac0b2ef584943fbc590d111cb6748247c3c3f6f2da122ba6b9bd20e9c3ea45f4  0008-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch
-7d6a1c7c916f817104f40615be410de9015a1356bd77f087ded5259c80a979d8c4e2baf5f35555eb648f6ab5d43c585c67a2f9a5db10156df4eeb6ea8e762147  0009-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch
-f1e4658bc699cfb3f0e0eba7833a7e09da266b8817c427de6312c270379d9d8c6cc55d4a270984c5b95cd04cf3be85c36f0d1127abe513698f874b8cde0b1a95  0010-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
-6235d08a6a90ca2234cee4d092a4314cb8efdbe7d68fb9c954abe9a6921c93e160db3f680a408210755ed71c429171919320592ea1f6769f74f55b70b7dbf22e  0011-eMMC-workaround.patch
-9ac8d531fe25365c6d1d1bf2903febc573746abde80b54852f31160a98bd31bb8ac29f6a0b7883706ef0bafbd4e0696a0a9f30bede5b211fae98cd93f453e8a3  0012-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch
+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
+925bd630f3694d118b24f2f5a838ba105e4ca9ed8dd4294b6632310d8d6b1f421cdd673e2013758f9de7159050aa54e0f76e04edcff65f755842b1c95b6637e7  0004-arm64-dts-allwinner-Add-bluetooth-node-to-the-PineTa.patch
+9bc6c2afadae8d367471f901b86a94be7fa70daf7a4bdde5bc6d4b1458b5ddd0e063a7765d962c68231c8f022d1c660d422124c31a2c899de768985d91d377ea  0005-dts-pinetab-make-audio-routing-consistent-with-pinep.patch
+5e0566074fcb18b95c8ea079178f5d6716eb1ea325a25176e67f80eff1e5b10f90e282c8059a0a3315606546c61f05bd9ebad06adb67086cd123f0276cccbdc8  0006-media-ov5640-Implement-autofocus.patch
+62809ac84db9d684b02d56dfc543451a1a13f319287466cfe913a847b945584ec60f7f556b1259ad3e26a44259a3fe587eeabeef6333f73a77204c3d3573f2ab  0007-dts-pinephone-drop-modem-power-node.patch
+c61d4f86eddecca99df1ea1323f988e575f9c49130b64a0c50d61028ff96e24aaa3131fb3731e62e9b07db67019104d98933e31457891a5ce1e6010e06232875  0008-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch
+7f57e4ebc0b0cebb624f340c568f22e93116f2753b634d9bc75eea1a1bc013b8f9375e1efd24a20bff79c3725166df210a3a30bb7643a4525e3d40b63b91c536  0009-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch
+71fad7ecff66a2cb692f3dd3d02301c4b419873f27693de81f50226b8ab93c229299e7dc663fdd07a7e8f03a6541527f3bb449626f865fcfde6a780ef1b91976  0010-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch
+902708a5a8dd8a815d3d1793933d307c551e3c10368d1805431b70691ee5d4438b7146c466549f457468e365f94073a35ae3304928af7581e5dc91ba5c8fa682  0011-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
+2feeab0a6c3db46e514d45c9708f351c6d7dfb0bf951a5cb6f2dc01b4bdc8d4c46931000758a819a6d7317b16cb1933bb3946e6a78cbf448cc77f57a56c503bf  0012-sunxi-mmc-h6-fix.patch
+22af33264090dac027ee054b4345a07f0b2ee077e2ae1620e83960bfeea096169aec710973fdd50531ed4f1db6cfd59b5796cd235316cb3512aee034f741a694  0013-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch
 "

device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64

@@ -1,15 +1,15 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.17.0-rc8 Kernel Configuration
+# Linux/arm64 5.16.4 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 11.2.1_git20220219) 11.2.1 20220219"
+CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 11.2.1_git20220117) 11.2.1 20220117"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=110201
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=23800
+CONFIG_AS_VERSION=23700
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=23800
+CONFIG_LD_VERSION=23700
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
@@ -214,6 +214,7 @@ CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_FUTEX_PI=y
+CONFIG_HAVE_FUTEX_CMPXCHG=y
 CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
@@ -349,8 +350,6 @@ CONFIG_ARM64_ERRATUM_1286807=y
 CONFIG_ARM64_ERRATUM_1463225=y
 CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_ARM64_ERRATUM_1508412=y
-CONFIG_ARM64_ERRATUM_2051678=y
-# CONFIG_ARM64_ERRATUM_2077057 is not set
 CONFIG_ARM64_WORKAROUND_TSB_FLUSH_FAILURE=y
 CONFIG_ARM64_ERRATUM_2054223=y
 CONFIG_ARM64_ERRATUM_2067961=y
@@ -393,6 +392,7 @@ CONFIG_HZ=250
 CONFIG_SCHED_HRTICK=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_HW_PERF_EVENTS=y
+CONFIG_ARCH_HAS_FILTER_PGPROT=y
 # CONFIG_PARAVIRT is not set
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 CONFIG_KEXEC=y
@@ -402,7 +402,6 @@ CONFIG_TRANS_TABLE=y
 # CONFIG_XEN is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_UNMAP_KERNEL_AT_EL0=y
-CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
@@ -424,8 +423,6 @@ CONFIG_ARM64_USE_LSE_ATOMICS=y
 #
 # ARMv8.2 architectural features
 #
-CONFIG_AS_HAS_ARMV8_2=y
-CONFIG_AS_HAS_SHA3=y
 # CONFIG_ARM64_PMEM is not set
 CONFIG_ARM64_RAS_EXTN=y
 CONFIG_ARM64_CNP=y
@@ -663,7 +660,6 @@ CONFIG_ARCH_MMAP_RND_BITS=18
 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
 CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
-CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
 CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
@@ -710,7 +706,6 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 CONFIG_MODULE_COMPRESS_XZ=y
 # CONFIG_MODULE_COMPRESS_ZSTD is not set
-# CONFIG_MODULE_DECOMPRESS is not set
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 CONFIG_MODPROBE_PATH="/sbin/modprobe"
 CONFIG_MODULES_TREE_LOOKUP=y
@@ -808,11 +803,12 @@ CONFIG_MEMORY_FAILURE=y
 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+# CONFIG_CLEANCACHE is not set
+# CONFIG_FRONTSWAP is not set
 CONFIG_CMA=y
 # CONFIG_CMA_DEBUGFS is not set
 # CONFIG_CMA_SYSFS is not set
 CONFIG_CMA_AREAS=7
-# CONFIG_ZSWAP is not set
 # CONFIG_ZPOOL is not set
 CONFIG_ZSMALLOC=y
 CONFIG_ZSMALLOC_STAT=y
@@ -829,7 +825,6 @@ CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
 # CONFIG_READ_ONLY_THP_FOR_FS is not set
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
 CONFIG_SECRETMEM=y
-# CONFIG_ANON_VMA_NAME is not set
 
 #
 # Data Access Monitoring
@@ -987,6 +982,7 @@ CONFIG_NF_TABLES_INET=y
 CONFIG_NF_TABLES_NETDEV=y
 CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
+CONFIG_NFT_COUNTER=m
 CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
@@ -1431,7 +1427,6 @@ CONFIG_UEVENT_HELPER=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_DEVTMPFS_SAFE is not set
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 
@@ -1712,8 +1707,6 @@ CONFIG_SUN4I_EMAC=y
 # CONFIG_NET_VENDOR_CAVIUM is not set
 # CONFIG_NET_VENDOR_CORTINA is not set
 # CONFIG_DNET is not set
-CONFIG_NET_VENDOR_ENGLEDER=y
-# CONFIG_TSNEP is not set
 # CONFIG_NET_VENDOR_EZCHIP is not set
 # CONFIG_NET_VENDOR_GOOGLE is not set
 # CONFIG_NET_VENDOR_HISILICON is not set
@@ -1752,7 +1745,6 @@ CONFIG_DWMAC_SUNXI=y
 CONFIG_DWMAC_SUN8I=y
 # CONFIG_DWMAC_INTEL_PLAT is not set
 # CONFIG_NET_VENDOR_SYNOPSYS is not set
-CONFIG_NET_VENDOR_VERTEXCOM=y
 # CONFIG_NET_VENDOR_VIA is not set
 # CONFIG_NET_VENDOR_WIZNET is not set
 # CONFIG_NET_VENDOR_XILINX is not set
@@ -2351,11 +2343,11 @@ CONFIG_PINCONF=y
 CONFIG_GENERIC_PINCONF=y
 # CONFIG_PINCTRL_AXP209 is not set
 # CONFIG_PINCTRL_MCP23S08 is not set
-# CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
-# CONFIG_PINCTRL_OCELOT is not set
 CONFIG_PINCTRL_SINGLE=y
-# CONFIG_PINCTRL_STMFX is not set
 # CONFIG_PINCTRL_SX150X is not set
+# CONFIG_PINCTRL_STMFX is not set
+# CONFIG_PINCTRL_OCELOT is not set
+# CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
 
 #
 # Renesas pinctrl drivers
@@ -2446,7 +2438,6 @@ CONFIG_GPIO_PCA953X_IRQ=y
 #
 # CONFIG_GPIO_AGGREGATOR is not set
 # CONFIG_GPIO_MOCKUP is not set
-# CONFIG_GPIO_SIM is not set
 # end of Virtual GPIO drivers
 
 # CONFIG_W1 is not set
@@ -2468,7 +2459,7 @@ CONFIG_POWER_SUPPLY=y
 CONFIG_POWER_SUPPLY_HWMON=y
 # CONFIG_PDA_POWER is not set
 # CONFIG_GENERIC_ADC_BATTERY is not set
-CONFIG_IP5XXX_POWER=y
+# CONFIG_IP5XXX_POWER is not set
 # CONFIG_TEST_POWER is not set
 # CONFIG_CHARGER_ADP5061 is not set
 # CONFIG_BATTERY_CW2015 is not set
@@ -2494,7 +2485,6 @@ CONFIG_AXP20X_POWER=y
 # CONFIG_CHARGER_LT3651 is not set
 # CONFIG_CHARGER_LTC4162L is not set
 # CONFIG_CHARGER_DETECTOR_MAX14656 is not set
-# CONFIG_CHARGER_MAX77976 is not set
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_BQ24190 is not set
 # CONFIG_CHARGER_BQ24257 is not set
@@ -2608,7 +2598,6 @@ CONFIG_SENSORS_ARM_SCPI=y
 # CONFIG_SENSORS_NCT7904 is not set
 # CONFIG_SENSORS_NPCM7XX is not set
 # CONFIG_SENSORS_NZXT_KRAKEN2 is not set
-# CONFIG_SENSORS_NZXT_SMART2 is not set
 # CONFIG_SENSORS_OCC_P8_I2C is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_PMBUS is not set
@@ -2636,7 +2625,6 @@ CONFIG_SENSORS_ARM_SCPI=y
 # CONFIG_SENSORS_AMC6821 is not set
 # CONFIG_SENSORS_INA209 is not set
 # CONFIG_SENSORS_INA2XX is not set
-# CONFIG_SENSORS_INA238 is not set
 # CONFIG_SENSORS_INA3221 is not set
 # CONFIG_SENSORS_TC74 is not set
 # CONFIG_SENSORS_THMC50 is not set
@@ -2815,6 +2803,7 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_WM8350_I2C is not set
 # CONFIG_MFD_WM8994 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
+# CONFIG_MFD_ROHM_BD70528 is not set
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
 # CONFIG_MFD_STPMIC1 is not set
@@ -2855,7 +2844,6 @@ CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_MAX8893 is not set
 # CONFIG_REGULATOR_MAX8952 is not set
 # CONFIG_REGULATOR_MAX8973 is not set
-# CONFIG_REGULATOR_MAX20086 is not set
 # CONFIG_REGULATOR_MAX77826 is not set
 # CONFIG_REGULATOR_MCP16502 is not set
 # CONFIG_REGULATOR_MP5416 is not set
@@ -3166,7 +3154,6 @@ CONFIG_VIDEO_OV5640=m
 # CONFIG_VIDEO_OV6650 is not set
 # CONFIG_VIDEO_OV5670 is not set
 # CONFIG_VIDEO_OV5675 is not set
-# CONFIG_VIDEO_OV5693 is not set
 # CONFIG_VIDEO_OV5695 is not set
 # CONFIG_VIDEO_OV7251 is not set
 # CONFIG_VIDEO_OV772X is not set
@@ -3243,6 +3230,7 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
 # CONFIG_DRM_DP_CEC is not set
 CONFIG_DRM_GEM_CMA_HELPER=y
+CONFIG_DRM_KMS_CMA_HELPER=y
 CONFIG_DRM_GEM_SHMEM_HELPER=y
 CONFIG_DRM_SCHED=y
 
@@ -3267,8 +3255,7 @@ CONFIG_DRM_MALI_DISPLAY=m
 # CONFIG_DRM_VKMS is not set
 CONFIG_DRM_UDL=m
 # CONFIG_DRM_RCAR_DW_HDMI is not set
-# CONFIG_DRM_RCAR_USE_LVDS is not set
-# CONFIG_DRM_RCAR_MIPI_DSI is not set
+# CONFIG_DRM_RCAR_LVDS is not set
 CONFIG_DRM_SUN4I=y
 CONFIG_DRM_SUN4I_HDMI=y
 # CONFIG_DRM_SUN4I_HDMI_CEC is not set
@@ -3284,7 +3271,6 @@ CONFIG_DRM_PANEL=y
 #
 # CONFIG_DRM_PANEL_ARM_VERSATILE is not set
 # CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596 is not set
-# CONFIG_DRM_PANEL_BOE_BF060Y8M_AJ0 is not set
 # CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set
 # CONFIG_DRM_PANEL_BOE_TV101WUM_NL6 is not set
 # CONFIG_DRM_PANEL_DSI_CM is not set
@@ -3298,13 +3284,11 @@ CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=y
 CONFIG_DRM_PANEL_ILITEK_ILI9881C=y
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
-# CONFIG_DRM_PANEL_JDI_R63452 is not set
 # CONFIG_DRM_PANEL_KHADAS_TS050 is not set
 # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT35510 is not set
-# CONFIG_DRM_PANEL_NOVATEK_NT35950 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
 # CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set
 # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
@@ -3331,7 +3315,6 @@ CONFIG_DRM_PANEL_ILITEK_ILI9881C=y
 # CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set
 CONFIG_DRM_PANEL_SITRONIX_ST7703=y
 # CONFIG_DRM_PANEL_SONY_ACX424AKP is not set
-# CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set
 # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
 # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
 # CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set
@@ -3396,7 +3379,6 @@ CONFIG_DRM_PANFROST=y
 # CONFIG_DRM_GUD is not set
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
-CONFIG_DRM_NOMODESET=y
 
 #
 # Frame buffer Devices
@@ -3464,7 +3446,6 @@ CONFIG_DUMMY_CONSOLE=y
 CONFIG_DUMMY_CONSOLE_COLUMNS=80
 CONFIG_DUMMY_CONSOLE_ROWS=25
 CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
@@ -3526,7 +3507,6 @@ CONFIG_SND_SOC=m
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_ADI is not set
 # CONFIG_SND_SOC_AMD_ACP is not set
-# CONFIG_SND_AMD_ACP_CONFIG is not set
 # CONFIG_SND_ATMEL_SOC is not set
 # CONFIG_SND_BCM63XX_I2S_WHISTLER is not set
 # CONFIG_SND_DESIGNWARE_I2S is not set
@@ -3589,7 +3569,6 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_ADAU7118_HW is not set
 # CONFIG_SND_SOC_ADAU7118_I2C is not set
 # CONFIG_SND_SOC_AK4118 is not set
-# CONFIG_SND_SOC_AK4375 is not set
 # CONFIG_SND_SOC_AK4458 is not set
 # CONFIG_SND_SOC_AK4554 is not set
 CONFIG_SND_SOC_AK4613=m
@@ -3678,7 +3657,6 @@ CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 # CONFIG_SND_SOC_TDA7419 is not set
 # CONFIG_SND_SOC_TFA9879 is not set
 # CONFIG_SND_SOC_TFA989X is not set
-# CONFIG_SND_SOC_TLV320ADC3XXX is not set
 # CONFIG_SND_SOC_TLV320AIC23_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC31XX is not set
 # CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set
@@ -3792,7 +3770,6 @@ CONFIG_HID_KENSINGTON=y
 # CONFIG_HID_LCPOWER is not set
 # CONFIG_HID_LED is not set
 # CONFIG_HID_LENOVO is not set
-# CONFIG_HID_LETSKETCH is not set
 CONFIG_HID_LOGITECH=y
 CONFIG_HID_LOGITECH_DJ=y
 CONFIG_HID_LOGITECH_HIDPP=y
@@ -4320,10 +4297,6 @@ CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_LEDS_TRIGGER_PATTERN=y
 # CONFIG_LEDS_TRIGGER_AUDIO is not set
 # CONFIG_LEDS_TRIGGER_TTY is not set
-
-#
-# Simple LED drivers
-#
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_INFINIBAND is not set
 CONFIG_EDAC_SUPPORT=y
@@ -4558,8 +4531,6 @@ CONFIG_RTL8723BS=m
 # end of IIO staging drivers
 
 CONFIG_STAGING_MEDIA=y
-# CONFIG_VIDEO_HANTRO is not set
-# CONFIG_VIDEO_MAX96712 is not set
 CONFIG_VIDEO_SUNXI=y
 CONFIG_VIDEO_SUNXI_CEDRUS=y
 
@@ -4582,7 +4553,6 @@ CONFIG_RTL8723CS=m
 # CONFIG_GOLDFISH is not set
 # CONFIG_CHROME_PLATFORMS is not set
 # CONFIG_MELLANOX_PLATFORM is not set
-CONFIG_SURFACE_PLATFORMS=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -4604,7 +4574,6 @@ CONFIG_COMMON_CLK_SCPI=y
 # CONFIG_COMMON_CLK_CDCE706 is not set
 # CONFIG_COMMON_CLK_CDCE925 is not set
 CONFIG_COMMON_CLK_CS2000_CP=y
-# CONFIG_COMMON_CLK_LAN966X is not set
 # CONFIG_COMMON_CLK_AXI_CLKGEN is not set
 CONFIG_COMMON_CLK_XGENE=y
 CONFIG_COMMON_CLK_PWM=y
@@ -4757,7 +4726,7 @@ CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
 #
 # DEVFREQ Drivers
 #
-# CONFIG_ARM_SUN8I_A33_MBUS_DEVFREQ is not set
+# CONFIG_ARM_SUN8I_MBUS_DEVFREQ is not set
 # CONFIG_PM_DEVFREQ_EVENT is not set
 CONFIG_EXTCON=y
 
@@ -4853,11 +4822,6 @@ CONFIG_AXP20X_ADC=y
 # CONFIG_XILINX_XADC is not set
 # end of Analog to digital converters
 
-#
-# Analog to digital and digital to analog converters
-#
-# end of Analog to digital and digital to analog converters
-
 #
 # Analog Front Ends
 #
@@ -4936,11 +4900,6 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 #
 # end of IIO dummy driver
 
-#
-# Filters
-#
-# end of Filters
-
 #
 # Frequency Synthesizers DDS/PLL
 #
@@ -5059,7 +5018,6 @@ CONFIG_STK3310=m
 #
 # Magnetometer sensors
 #
-# CONFIG_AF8133J is not set
 # CONFIG_AK8974 is not set
 # CONFIG_AK8975 is not set
 # CONFIG_AK09911 is not set
@@ -5221,10 +5179,8 @@ CONFIG_PHY_SUN50I_USB3=y
 # CONFIG_PHY_CADENCE_SALVO is not set
 # CONFIG_PHY_FSL_IMX8MQ_USB is not set
 # CONFIG_PHY_MIXEL_MIPI_DPHY is not set
-# CONFIG_PHY_FSL_IMX8M_PCIE is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
-# CONFIG_PHY_LAN966X_SERDES is not set
 # CONFIG_PHY_CPCAP_USB is not set
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 # CONFIG_PHY_OCELOT_SERDES is not set
@@ -5246,7 +5202,6 @@ CONFIG_PHY_SAMSUNG_USB2=y
 CONFIG_ARM_PMU=y
 # CONFIG_ARM_DSU_PMU is not set
 # CONFIG_ARM_SPE_PMU is not set
-# CONFIG_MARVELL_CN10K_TAD_PMU is not set
 # end of Performance monitor support
 
 CONFIG_RAS=y
@@ -5747,7 +5702,6 @@ CONFIG_CRYPTO_DRBG_HMAC=y
 # CONFIG_CRYPTO_DRBG_CTR is not set
 CONFIG_CRYPTO_DRBG=y
 CONFIG_CRYPTO_JITTERENTROPY=y
-CONFIG_CRYPTO_KDF800108_CTR=y
 CONFIG_CRYPTO_USER_API=m
 CONFIG_CRYPTO_USER_API_HASH=m
 CONFIG_CRYPTO_USER_API_SKCIPHER=m
@@ -5756,6 +5710,25 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
 # CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE is not set
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=y
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
+CONFIG_CRYPTO_LIB_BLAKE2S=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_ALLWINNER=y
 # CONFIG_CRYPTO_DEV_SUN4I_SS is not set
@@ -5798,6 +5771,7 @@ CONFIG_HAVE_ARCH_BITREVERSE=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
 # CONFIG_CORDIC is not set
 # CONFIG_PRIME_NUMBERS is not set
 CONFIG_RATIONAL=y
@@ -5806,26 +5780,6 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
 CONFIG_INDIRECT_PIO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=y
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
-# end of Crypto library routines
-
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
@@ -5981,11 +5935,6 @@ CONFIG_HAVE_KCSAN_COMPILER=y
 
 # CONFIG_DEBUG_KERNEL is not set
 
-#
-# Networking Debugging
-#
-# end of Networking Debugging
-
 #
 # Memory Debugging
 #
@@ -6081,6 +6030,7 @@ CONFIG_STRICT_DEVMEM=y
 # CONFIG_KUNIT is not set
 CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
+# CONFIG_KCOV is not set
 # CONFIG_RUNTIME_TESTING_MENU is not set
 CONFIG_ARCH_USE_MEMTEST=y
 # CONFIG_MEMTEST is not set