Merge remote-tracking branch 'upstream/main'

chdorner · Oct 24, 2024 · cc1cc30 · cc1cc30
2 parents 2b3c98c + d6b3e3b
commit cc1cc30
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 15 deletions.
diff --git a/boards/arm/zaphod/Kconfig.defconfig b/boards/arm/zaphod/Kconfig.defconfig
@@ -34,6 +34,9 @@ config ZMK_DISPLAY_STATUS_SCREEN_CUSTOM
 
 if ZMK_DISPLAY
 
+config LV_Z_MEM_POOL_SIZE
+     default 4096
+
 choice LV_FONT_DEFAULT
     default LV_FONT_DEFAULT_MONTSERRAT_26
 

diff --git a/boards/arm/zaphod/zaphod.dts b/boards/arm/zaphod/zaphod.dts
@@ -8,6 +8,27 @@
 #include <nordic/nrf52840_qiaa.dtsi>
 #include <dt-bindings/zmk/matrix_transform.h>
 
+&pinctrl {
+    spi0_default: spi0_default {
+        group1 {
+            psels = <NRF_PSEL(SPIM_SCK, 0, 7)>
+                  , <NRF_PSEL(SPIM_MOSI, 0, 5)>
+                  , <NRF_PSEL(SPIM_MISO, 0, 8)>
+	          ;
+        };
+    };
+
+    spi0_sleep: spi0_sleep {
+        group1 {
+            psels = <NRF_PSEL(SPIM_SCK, 0, 7)>
+                  , <NRF_PSEL(SPIM_MOSI, 0, 5)>
+                  , <NRF_PSEL(SPIM_MISO, 0, 8)>
+	          ;
+            low-power-enable;
+        };
+    };
+};
+
 / {
 	model = "zaphod";
 	compatible = "petejohanson,zaphod";
@@ -27,13 +48,11 @@
 		compatible = "gpio-leds";
 		blue_led: led_0 {
 			gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
-			label = "Blue LED";
 		};
 	};
 
 	vbatt: vbatt {
 		compatible = "zmk,battery-voltage-divider";
-		label = "BATTERY";
 		io-channels = <&adc 7>;
 		output-ohms = <2000000>;
 		full-ohms = <(2000000 + 806000)>;
@@ -54,7 +73,8 @@
 
 	kscan: kscan {
 		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
+		wakeup-source;
+
 		debounce-press-ms = <1>;
 		debounce-release-ms = <5>;
 
@@ -100,14 +120,15 @@
 &spi0 {
 	compatible = "nordic,nrf-spim";
 	status = "okay";
-	sck-pin = <7>;
-	mosi-pin = <5>;
-	miso-pin = <8>;
+
+	pinctrl-0 = <&spi0_default>;
+	pinctrl-1 = <&spi0_default>;
+	pinctrl-names = "default", "sleep";
+
 	cs-gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>;
 
 	ls0xx: ls0xx@0 {
 		compatible = "sharp,ls0xx";
-		label = "DISPLAY";
 		spi-max-frequency = <2000000>;
 		reg = <0>;
 		width = <144>;
@@ -121,7 +142,6 @@
 	compatible = "nordic,nrf-usbd";
 	cdc_acm_uart: cdc_acm_uart {
 		compatible = "zephyr,cdc-acm-uart";
-		label = "CDC_ACM_0";
 	};
 };
 
@@ -137,21 +157,17 @@
 		#size-cells = <1>;
 
 		sd_partition: partition@0 {
-			label = "mbr";
 			reg = <0x00000000 0x00001000>;
 		};
 		code_partition: partition@1000 {
-			label = "code_partition";
 			reg = <0x00001000 0x000d3000>;
 		};
 
 		storage_partition: partition@d4000 {
-			label = "storage";
 			reg = <0x000d4000 0x00020000>;
 		};
 
 		boot_partition: partition@f4000 {
-			label = "adafruit_boot";
 			reg = <0x000f4000 0x0000c000>;
 		};
 	};

diff --git a/boards/shields/zaphod_lite/Kconfig.defconfig b/boards/shields/zaphod_lite/Kconfig.defconfig
@@ -18,6 +18,9 @@ if ZMK_DISPLAY
 config SYSTEM_WORKQUEUE_STACK_SIZE
     default 2048
 
+config LV_Z_MEM_POOL_SIZE
+     default 4096
+
 choice LV_FONT_DEFAULT
     default LV_FONT_DEFAULT_MONTSERRAT_26
 

diff --git a/boards/shields/zaphod_lite/zaphod_lite.overlay b/boards/shields/zaphod_lite/zaphod_lite.overlay
@@ -16,14 +16,12 @@
 		gpio-controller;
 		spi-max-frequency = <200000>;
 		reg = <0>;
-		label = "4HC595";
 		#gpio-cells = <2>;
 		ngpios = <8>;
 	};
 
 	ls0xx: ls0xx@1 {
 		compatible = "sharp,ls0xx";
-		label = "DISPLAY";
 		spi-max-frequency = <2000000>;
 		reg = <1>;
 		width = <144>;
@@ -61,7 +59,7 @@
 
 	kscan: kscan {
 		compatible = "zmk,kscan-gpio-matrix";
-		label = "KSCAN";
+		wakeup-source;
 
 		debounce-press-ms = <1>;
 		debounce-release-ms = <5>;