From 0e0bf9fb23674bcfa3aa4b986e5ba42d0dd20c5f Mon Sep 17 00:00:00 2001
From: Greg Chadwick <gac@lowrisc.org>
Date: Wed, 16 Oct 2024 08:11:54 +0100
Subject: [PATCH 1/2] Bump CHERIoT-RTOS

---
 cheriot-rtos | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cheriot-rtos b/cheriot-rtos
index 444e496..5668b9a 160000
--- a/cheriot-rtos
+++ b/cheriot-rtos
@@ -1 +1 @@
-Subproject commit 444e4965c1dc84414e4959d55e47b0e999c086c9
+Subproject commit 5668b9afd5d55ee750eed6077f72d3c2a6f35234

From c8596bc556644811f49e688d97a8c3dd5545b432 Mon Sep 17 00:00:00 2001
From: Greg Chadwick <gac@lowrisc.org>
Date: Wed, 16 Oct 2024 08:13:23 +0100
Subject: [PATCH 2/2] Update LCD to use new SPI CS control

---
 libraries/lcd.cc | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/libraries/lcd.cc b/libraries/lcd.cc
index 19fb4e0..8582c3b 100644
--- a/libraries/lcd.cc
+++ b/libraries/lcd.cc
@@ -64,7 +64,15 @@ namespace sonata::lcd::internal
 		};
 		lcdIntf->gpio_write =
 		  [](void *handle, bool csHigh, bool dcHigh) -> uint32_t {
-			set_gpio_output_bit(LcdCsPin, csHigh);
+			if (csHigh)
+			{
+				spi()->cs = 1;
+			}
+			else
+			{
+				spi()->cs = 0;
+			}
+
 			set_gpio_output_bit(LcdDcPin, dcHigh);
 			return 0;
 		};