From f73319f96484a40efae87b008856ab0a579e2dac Mon Sep 17 00:00:00 2001 From: arpacique <8885388+arpacique@users.noreply.github.com> Date: Mon, 20 Nov 2023 18:14:56 +0300 Subject: [PATCH] Migrate to pinctrl Remove deprecated property Migrate to pinctrl Create nice_nano_v2.overlay Fix tabs Remove trailing spaces Co-Authored-By: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- .../shields/contra/boards/nice_nano.overlay | 60 ++++++++++++------- .../contra/boards/nice_nano_v2.overlay | 45 ++++++++++++++ 2 files changed, 82 insertions(+), 23 deletions(-) create mode 100644 app/boards/shields/contra/boards/nice_nano_v2.overlay diff --git a/app/boards/shields/contra/boards/nice_nano.overlay b/app/boards/shields/contra/boards/nice_nano.overlay index 95b83c78..a537585d 100644 --- a/app/boards/shields/contra/boards/nice_nano.overlay +++ b/app/boards/shields/contra/boards/nice_nano.overlay @@ -1,31 +1,45 @@ #include -&spi1 { - compatible = "nordic,nrf-spim"; - status = "okay"; - mosi-pin = <45>; // Data cable is on D15 of Nice!NanoV2 - // Unused pins, needed for SPI definition, but not used by the ws2812 driver itself. - sck-pin = <5>; - miso-pin = <7>; +&pinctrl { + spi3_default: spi3_default { + group1 { + psels = ; + }; + }; - led_strip: ws2812@0 { - compatible = "worldsemi,ws2812-spi"; - label = "SK6812mini"; + spi3_sleep: spi3_sleep { + group1 { + psels = ; + low-power-enable; + }; + }; +}; - /* SPI */ - reg = <0>; /* ignored, but necessary for SPI bindings */ - spi-max-frequency = <4000000>; +&spi3 { + compatible = "nordic,nrf-spim"; + status = "okay"; - /* WS2812 */ - chain-length = <6>; /* Change this according to how many leds are on the strip */ - spi-one-frame = <0x70>; - spi-zero-frame = <0x40>; - color-mapping = ; - }; + pinctrl-0 = <&spi3_default>; + pinctrl-1 = <&spi3_sleep>; + pinctrl-names = "default", "sleep"; + + led_strip: ws2812@0 { + compatible = "worldsemi,ws2812-spi"; + + /* SPI */ + reg = <0>; /* ignored, but necessary for SPI bindings */ + spi-max-frequency = <4000000>; + + /* WS2812 */ + chain-length = <6>; /* Change this according to how many leds are on the strip */ + spi-one-frame = <0x70>; + spi-zero-frame = <0x40>; + color-mapping = ; + }; }; / { - chosen { - zmk,underglow = &led_strip; - }; -}; \ No newline at end of file + chosen { + zmk,underglow = &led_strip; + }; +}; diff --git a/app/boards/shields/contra/boards/nice_nano_v2.overlay b/app/boards/shields/contra/boards/nice_nano_v2.overlay new file mode 100644 index 00000000..a537585d --- /dev/null +++ b/app/boards/shields/contra/boards/nice_nano_v2.overlay @@ -0,0 +1,45 @@ +#include + +&pinctrl { + spi3_default: spi3_default { + group1 { + psels = ; + }; + }; + + spi3_sleep: spi3_sleep { + group1 { + psels = ; + low-power-enable; + }; + }; +}; + +&spi3 { + compatible = "nordic,nrf-spim"; + status = "okay"; + + pinctrl-0 = <&spi3_default>; + pinctrl-1 = <&spi3_sleep>; + pinctrl-names = "default", "sleep"; + + led_strip: ws2812@0 { + compatible = "worldsemi,ws2812-spi"; + + /* SPI */ + reg = <0>; /* ignored, but necessary for SPI bindings */ + spi-max-frequency = <4000000>; + + /* WS2812 */ + chain-length = <6>; /* Change this according to how many leds are on the strip */ + spi-one-frame = <0x70>; + spi-zero-frame = <0x40>; + color-mapping = ; + }; +}; + +/ { + chosen { + zmk,underglow = &led_strip; + }; +};