Merge pull request #1 from dreipunkteinsvier/master

changes for update to Zephyr 3.2
GEIGEIGEIST · Apr 27, 2023 · dd16feb · dd16feb
2 parents 232fdf3 + 22937a0
commit dd16feb
Show file tree

Hide file tree

Showing 6 changed files with 101 additions and 32 deletions.
diff --git a/config/boards/shields/klor/Kconfig.defconfig b/config/boards/shields/klor/Kconfig.defconfig
@@ -33,23 +33,17 @@ endif # ZMK_DISPLAY
 
 if LVGL
 
-    config LVGL_HOR_RES_MAX
-        default 128
-
-    config LVGL_VER_RES_MAX
-        default 64
-
-    config LVGL_VDB_SIZE
+    config LV_Z_VDB_SIZE
         default 64
 
-    config LVGL_DPI
+    config LV_DPI_DEF
         default 148
 
-    config LVGL_BITS_PER_PIXEL
+    config LV_Z_BITS_PER_PIXEL
         default 1
 
-    choice LVGL_COLOR_DEPTH
-        default LVGL_COLOR_DEPTH_1
+    choice LV_COLOR_DEPTH
+        default LV_COLOR_DEPTH_1
     endchoice
 
 endif # LVGL

diff --git a/config/boards/shields/klor/boards/nice_nano.overlay b/config/boards/shields/klor/boards/nice_nano.overlay
@@ -1,12 +1,27 @@
 #include <dt-bindings/led/led.h>
 
+&pinctrl {
+	spi1_default: spi1_default {
+		group1 {
+			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+		};
+	};
+
+	spi1_sleep: spi1_sleep {
+		group1 {
+			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+			low-power-enable;
+		};
+	};
+};
+
 &spi1 {
 	compatible = "nordic,nrf-spim";
 	status = "okay";
-	mosi-pin = <6>;
-	// Unused pins, needed for SPI definition, but not used by the ws2812 driver itself.
-	sck-pin = <5>;
-	miso-pin = <7>;
+
+	pinctrl-0 = <&spi1_default>;
+	pinctrl-1 = <&spi1_sleep>;
+	pinctrl-names = "default", "sleep";
 
 	led_strip: ws2812@0 {
 		compatible = "worldsemi,ws2812-spi";

diff --git a/config/boards/shields/klor/boards/nice_nano_v2.overlay b/config/boards/shields/klor/boards/nice_nano_v2.overlay
@@ -1,12 +1,27 @@
 #include <dt-bindings/led/led.h>
 
+&pinctrl {
+	spi1_default: spi1_default {
+		group1 {
+			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+		};
+	};
+
+	spi1_sleep: spi1_sleep {
+		group1 {
+			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+			low-power-enable;
+		};
+	};
+};
+
 &spi1 {
 	compatible = "nordic,nrf-spim";
 	status = "okay";
-	mosi-pin = <6>;
-	// Unused pins, needed for SPI definition, but not used by the ws2812 driver itself.
-	sck-pin = <20>;
-	miso-pin = <7>;
+
+	pinctrl-0 = <&spi1_default>;
+	pinctrl-1 = <&spi1_sleep>;
+	pinctrl-names = "default", "sleep";
 
 	led_strip: ws2812@0 {
 		compatible = "worldsemi,ws2812-spi";

diff --git a/config/boards/shields/klor/boards/nrfmicro_11.overlay b/config/boards/shields/klor/boards/nrfmicro_11.overlay
@@ -1,13 +1,28 @@
 #include <dt-bindings/led/led.h>
 
+&pinctrl {
+	spi1_default: spi1_default {
+		group1 {
+			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+		};
+	};
+
+	spi1_sleep: spi1_sleep {
+		group1 {
+			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+			low-power-enable;
+		};
+	};
+};
+
 &spi1 {
 	compatible = "nordic,nrf-spim";
 	status = "okay";
-	mosi-pin = <6>;
-	// Unused pins, needed for SPI definition, but not used by the ws2812 driver itself.
-	sck-pin = <12>;  // 0.12 is not broken out on the nRFMicro
-	miso-pin = <22>; // 0.22 is not broken out on the nRFMicro
-
+
+	pinctrl-0 = <&spi1_default>;
+	pinctrl-1 = <&spi1_sleep>;
+	pinctrl-names = "default", "sleep";
+	
 	led_strip: ws2812@0 {
 		compatible = "worldsemi,ws2812-spi";
 		label = "WS2812";

diff --git a/config/boards/shields/klor/boards/nrfmicro_11_flipped.overlay b/config/boards/shields/klor/boards/nrfmicro_11_flipped.overlay
@@ -1,12 +1,27 @@
 #include <dt-bindings/led/led.h>
 
+&pinctrl {
+	spi1_default: spi1_default {
+		group1 {
+			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+		};
+	};
+
+	spi1_sleep: spi1_sleep {
+		group1 {
+			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+			low-power-enable;
+		};
+	};
+};
+
 &spi1 {
 	compatible = "nordic,nrf-spim";
 	status = "okay";
-	mosi-pin = <6>;
-	// Unused pins, needed for SPI definition, but not used by the ws2812 driver itself.
-	sck-pin = <12>;  // 0.12 is not broken out on the nRFMicro
-	miso-pin = <22>; // 0.22 is not broken out on the nRFMicro
+
+	pinctrl-0 = <&spi1_default>;
+	pinctrl-1 = <&spi1_sleep>;
+	pinctrl-names = "default", "sleep";
 
 	led_strip: ws2812@0 {
 		compatible = "worldsemi,ws2812-spi";

diff --git a/config/boards/shields/klor/boards/nrfmicro_13.overlay b/config/boards/shields/klor/boards/nrfmicro_13.overlay
@@ -1,12 +1,27 @@
 #include <dt-bindings/led/led.h>
 
+&pinctrl {
+	spi1_default: spi1_default {
+		group1 {
+			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+		};
+	};
+
+	spi1_sleep: spi1_sleep {
+		group1 {
+			psels = <NRF_PSEL(SPIM_MOSI, 0, 6)>;
+			low-power-enable;
+		};
+	};
+};
+
 &spi1 {
 	compatible = "nordic,nrf-spim";
 	status = "okay";
-	mosi-pin = <6>;
-	// Unused pins, needed for SPI definition, but not used by the ws2812 driver itself.
-	sck-pin = <12>;  // 0.12 is not broken out on the nRFMicro
-	miso-pin = <22>; // 0.22 is not broken out on the nRFMicro
+
+	pinctrl-0 = <&spi1_default>;
+	pinctrl-1 = <&spi1_sleep>;
+	pinctrl-names = "default", "sleep";
 
 	led_strip: ws2812@0 {
 		compatible = "worldsemi,ws2812-spi";