From 783900f225d4feb36be9fcdac3de88105a54e521 Mon Sep 17 00:00:00 2001
From: j1nx
Date: Sat, 17 Feb 2024 19:35:47 +0000
Subject: [PATCH] [RPI] Use vocalfusion 6.6 kernel using new GPIO APIv2
---
.../raspberrypi/rootfs-overlay/usr/libexec/ovos-i2csound | 2 +-
buildroot-external/configs/rpi3_64_defconfig | 6 +++---
buildroot-external/package/vocalfusion/vocalfusion.hash | 2 +-
buildroot-external/package/vocalfusion/vocalfusion.mk | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/usr/libexec/ovos-i2csound b/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/usr/libexec/ovos-i2csound
index 0efd809c..171ea16b 100755
--- a/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/usr/libexec/ovos-i2csound
+++ b/buildroot-external/board/ovos/raspberrypi/rootfs-overlay/usr/libexec/ovos-i2csound
@@ -156,7 +156,7 @@ main() {
if [[ ${detection_results[TAS5806]} == true ]] ; then
echo "Installing and configuring SJ-201 HAT"
# Initializing XMOS xvf3510 based SJ-201 HAT
- dtoverlay sj201
+ dtoverlay xvf3510
xvf3510-flash --direct "/usr/lib/firmware/xvf3510/app_xvf3510_int_spi_boot_v4_1_0.bin"
# Initializing Texas Instruments 5806 Amplifier
/usr/bin/tas5806-init
diff --git a/buildroot-external/configs/rpi3_64_defconfig b/buildroot-external/configs/rpi3_64_defconfig
index 9de9a0e0..dfcd6271 100644
--- a/buildroot-external/configs/rpi3_64_defconfig
+++ b/buildroot-external/configs/rpi3_64_defconfig
@@ -143,7 +143,6 @@ BR2_PACKAGE_PYTHON3_PY_PYC=y
BR2_PACKAGE_PYTHON_GOBJECT=y
BR2_PACKAGE_PYTHON_PIP=y
BR2_PACKAGE_PYTHON_PODMAN_COMPOSE=y
-BR2_PACKAGE_PYTHON_RPI_GPIO=y
BR2_PACKAGE_PYTHON_SPIDEV=y
BR2_PACKAGE_ALSA_PLUGINS=y
BR2_PACKAGE_LIBVORBIS=y
@@ -321,6 +320,8 @@ BR2_PACKAGE_HOST_MTOOLS=y
BR2_PACKAGE_HOST_PKGCONF=y
BR2_PACKAGE_BTSPEAKER=y
BR2_PACKAGE_HOSTNAME_SERVICE=y
+BR2_PACKAGE_LIBGPIOD2=y
+BR2_PACKAGE_LIBGPIOD2_TOOLS=y
BR2_PACKAGE_NCPAMIXER=y
BR2_PACKAGE_OVOS_BUS_SERVER=y
BR2_PACKAGE_OVOS_CONTAINERS=y
@@ -332,6 +333,5 @@ BR2_PACKAGE_ROC_TOOLKIT=y
BR2_PACKAGE_USERLAND_TOOLS=y
BR2_PACKAGE_VOCALFUSION=y
BR2_PACKAGE_WIFI_CONNECT=y
-BR2_PACKAGE_PYTHON_SMBUS2=y
BR2_PACKAGE_PYTHON_ADAFRUIT_BLINKA=y
-BR2_PACKAGE_PYTHON_GPIOD=y
\ No newline at end of file
+BR2_PACKAGE_PYTHON_SMBUS2=y
diff --git a/buildroot-external/package/vocalfusion/vocalfusion.hash b/buildroot-external/package/vocalfusion/vocalfusion.hash
index fd8730db..6db63aab 100644
--- a/buildroot-external/package/vocalfusion/vocalfusion.hash
+++ b/buildroot-external/package/vocalfusion/vocalfusion.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 f4e193143be2ee1fd004c6d22cd4b06e11dda6abdf0c3f116d45fb265fb3e890 vocalfusion-f05a110772a47d02ddcc57128a7d1dc00a14ec5c.tar.gz
+sha256 c974fd4a6eeac9ce676827ca617674ee43ad40c98c31e6dd0a878591467ecd69 vocalfusion-fdf7e4efbe3237d68eb0d00388e57b0c891366b3.tar.gz
diff --git a/buildroot-external/package/vocalfusion/vocalfusion.mk b/buildroot-external/package/vocalfusion/vocalfusion.mk
index 62f1c959..1d6fcb92 100644
--- a/buildroot-external/package/vocalfusion/vocalfusion.mk
+++ b/buildroot-external/package/vocalfusion/vocalfusion.mk
@@ -4,7 +4,7 @@
#
################################################################################
-VOCALFUSION_VERSION = f05a110772a47d02ddcc57128a7d1dc00a14ec5c
+VOCALFUSION_VERSION = fdf7e4efbe3237d68eb0d00388e57b0c891366b3
VOCALFUSION_SITE = $(call github,OpenVoiceOS,VocalFusionDriver,$(VOCALFUSION_VERSION))
VOCALFUSION_MODULE_SUBDIRS = driver