From 4a43f241ee0b211aaa9f47348a57fabe59bdbe1c Mon Sep 17 00:00:00 2001
From: exkc <NULL>
Date: Tue, 8 Nov 2022 16:59:28 +0800
Subject: [PATCH] linux-postmarketos-allwinner: enable compiling sunxi-cir (MR
 3609)

This gets IR RX working on Allwinner-based devices that have IR.

[ci:skip-build]: already built successfully in CI
---
 .../linux-postmarketos-allwinner/APKBUILD     |  4 ++--
 .../config-postmarketos-allwinner.aarch64     | 23 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/device/main/linux-postmarketos-allwinner/APKBUILD b/device/main/linux-postmarketos-allwinner/APKBUILD
index 7af741b1c..8631b3257 100644
--- a/device/main/linux-postmarketos-allwinner/APKBUILD
+++ b/device/main/linux-postmarketos-allwinner/APKBUILD
@@ -8,7 +8,7 @@ _flavor=postmarketos-allwinner
 _config="config-$_flavor.$CARCH"
 pkgname=linux-$_flavor
 pkgver=6.0.7_git20221105
-pkgrel=0
+pkgrel=1
 _tag="orange-pi-6.0-20221105-1830"
 pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)"
 arch="aarch64 armv7"
@@ -84,7 +84,7 @@ package() {
 
 sha512sums="
 c36aec0f3e807d9631811b0f77fed75e961e9617a8d3f5e4ae21e87d39c64623dc201626d49a3f292298369ee18d99de66577adcf9347af192a651a3cc2545b3  linux-postmarketos-allwinner-orange-pi-6.0-20221105-1830.tar.gz
-89995eec95ed38a7f61c08e62af0cfb38bbf0030721bff8ab4944e054f6292b1a6af8871bcacfe01d14acb30d0fd08deac20f2d954cd8e6e946fd0a4db01524e  config-postmarketos-allwinner.aarch64
+46bdcb9307dd7593dabdda9d046f2166a18086d7ea9374ea4d119645bcb91d2b0c32993b4076178265c7f259e1ad62f66b7ad3ea3b265aa5314794c8cac14edd  config-postmarketos-allwinner.aarch64
 04364e9b741e06efdf171e73bf7733ffb920f369a9e0748b5df2737eb86f7b7c4cfbac6fc72484505379b808e5896beee81599f850c0804fbb0ffecf09ca2a5b  config-postmarketos-allwinner.armv7
 126e0a65e04f22f14eac1281a69000d9d5b107ed8fd1b52f37e812751f55e6c45b0240ceac61c9d95ae7f0543aaf9d96b85a8532baf59283c077b9945e615367  0001-dts-add-dontbeevil-pinephone-devkit.patch
 1dc710f5abacdd5698169d5e985efeca8114986c774c3d65e89812d08ceb3db5ebdc6dd64dd76a262c761f3bfc3ffb6bc237fd5236bd1f89c5975d12e42eda04  0002-dts-add-pinetab-dev-old-display-panel.patch
diff --git a/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 b/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64
index 7b3483e81..58ce52889 100644
--- a/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64
+++ b/device/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64
@@ -3001,7 +3001,27 @@ CONFIG_REGULATOR_PWM=y
 CONFIG_REGULATOR_VCTRL=y
 # CONFIG_REGULATOR_QCOM_LABIBB is not set
 # CONFIG_REGULATOR_TP65185X is not set
-# CONFIG_RC_CORE is not set
+CONFIG_RC_CORE=y
+# CONFIG_LIRC is not set
+CONFIG_RC_MAP=y
+# CONFIG_RC_DECODERS is not set
+CONFIG_RC_DEVICES=y
+# CONFIG_IR_GPIO_CIR is not set
+# CONFIG_IR_HIX5HD2 is not set
+# CONFIG_IR_IGORPLUGUSB is not set
+# CONFIG_IR_IGUANA is not set
+# CONFIG_IR_IMON is not set
+# CONFIG_IR_IMON_RAW is not set
+# CONFIG_IR_MCEUSB is not set
+# CONFIG_IR_REDRAT3 is not set
+# CONFIG_IR_SERIAL is not set
+# CONFIG_IR_STREAMZAP is not set
+CONFIG_IR_SUNXI=y
+# CONFIG_IR_TOY is not set
+# CONFIG_IR_TTUSBIR is not set
+# CONFIG_RC_ATI_REMOTE is not set
+# CONFIG_RC_LOOPBACK is not set
+# CONFIG_RC_XBOX_DVD is not set
 
 #
 # CEC support
@@ -3234,6 +3254,7 @@ CONFIG_VIDEOBUF2_VMALLOC=m
 #
 # Media ancillary drivers
 #
+CONFIG_VIDEO_IR_I2C=y
 
 #
 # Camera sensor devices