From 7bfb48f7b6947f24195cfaab9d5b61c7c0dd3122 Mon Sep 17 00:00:00 2001 From: Chris Andreae Date: Fri, 8 Dec 2023 13:55:35 +0900 Subject: [PATCH] remove deprecated label devicetree property --- app/boards/arm/glove80/glove80.keymap | 2 -- app/boards/arm/glove80_v0/glove80_v0.dtsi | 6 ------ app/boards/arm/glove80_v0/glove80_v0_lh.dts | 9 ++------- app/boards/arm/glove80_v0/glove80_v0_rh.dts | 10 ++-------- 4 files changed, 4 insertions(+), 23 deletions(-) diff --git a/app/boards/arm/glove80/glove80.keymap b/app/boards/arm/glove80/glove80.keymap index 4f482b31c82..6806be79f97 100644 --- a/app/boards/arm/glove80/glove80.keymap +++ b/app/boards/arm/glove80/glove80.keymap @@ -32,7 +32,6 @@ magic: magic_hold_tap { compatible = "zmk,behavior-hold-tap"; - label = "MAGIC_HOLD_TAP"; #binding-cells = <2>; flavor = "tap-preferred"; tapping-term-ms = <200>; @@ -42,7 +41,6 @@ macros { rgb_ug_status_macro: rgb_ug_status_macro_0 { - label = "RGB_UG_STATUS"; compatible = "zmk,behavior-macro"; #binding-cells = <0>; bindings diff --git a/app/boards/arm/glove80_v0/glove80_v0.dtsi b/app/boards/arm/glove80_v0/glove80_v0.dtsi index a7fcda37cca..0a30f4d3668 100644 --- a/app/boards/arm/glove80_v0/glove80_v0.dtsi +++ b/app/boards/arm/glove80_v0/glove80_v0.dtsi @@ -32,7 +32,6 @@ RC(5,0) RC(5,1) RC(5,2) RC(5,3) RC(5,4) RC(3,6) RC(4,6) RC(5,6) RC(5,7 kscan0: kscan { compatible = "zmk,kscan-gpio-matrix"; - label = "KSCAN"; diode-direction = "row2col"; debounce-press-ms = <1>; @@ -61,7 +60,6 @@ RC(5,0) RC(5,1) RC(5,2) RC(5,3) RC(5,4) RC(3,6) RC(4,6) RC(5,6) RC(5,7 status = "okay"; cdc_acm_uart: cdc_acm_uart { compatible = "zephyr,cdc-acm-uart"; - label = "CDC_ACM_0"; }; }; @@ -76,11 +74,9 @@ RC(5,0) RC(5,1) RC(5,2) RC(5,3) RC(5,4) RC(3,6) RC(4,6) RC(5,6) RC(5,7 #size-cells = <1>; sd_partition: partition@0 { - label = "softdevice"; reg = <0x00000000 0x00026000>; }; code_partition: partition@26000 { - label = "code_partition"; reg = <0x00026000 0x000c6000>; }; @@ -94,12 +90,10 @@ RC(5,0) RC(5,1) RC(5,2) RC(5,3) RC(5,4) RC(3,6) RC(4,6) RC(5,6) RC(5,7 * if enabled. */ storage_partition: partition@ec000 { - label = "storage"; reg = <0x000ec000 0x00008000>; }; boot_partition: partition@f4000 { - label = "adafruit_boot"; reg = <0x000f4000 0x0000c000>; }; }; diff --git a/app/boards/arm/glove80_v0/glove80_v0_lh.dts b/app/boards/arm/glove80_v0/glove80_v0_lh.dts index bbaa95f9e94..db8ae5a3334 100644 --- a/app/boards/arm/glove80_v0/glove80_v0_lh.dts +++ b/app/boards/arm/glove80_v0/glove80_v0_lh.dts @@ -23,23 +23,20 @@ power_led_backlight: pwmleds { compatible = "pwm-leds"; - label = "Backlight LEDs"; pwm_led_0 { pwms = <&pwm0 0 PWM_USEC(20) PWM_POLARITY_NORMAL>; - label = "Power Led Backlight"; }; }; - ext-power { + // Node name must match original "EXT_POWER" label to preserve user settings. + EXT_POWER { compatible = "zmk,ext-power-generic"; - label = "EXT_POWER"; control-gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>; /**[SC] WS2812_CE */ init-delay-ms = <10>; }; vbatt: vbatt-divider { compatible = "zmk,battery-voltage-divider"; - label = "BATTERY"; io-channels = <&adc 5>; output-ohms = <820000>; /** Double check that this is right */ full-ohms = <(1500000 + 820000)>; @@ -47,7 +44,6 @@ vbatt-vddh { compatible = "zmk,battery-nrf-vddh"; - label = "BATTERY-VDDH"; }; /* @@ -88,7 +84,6 @@ pinctrl-names = "default", "sleep"; led_strip: ws2812@0 { compatible = "worldsemi,ws2812-spi"; - label = "WS2812C-2020"; /* SPI */ reg = <0>; /* ignored, but necessary for SPI bindings */ diff --git a/app/boards/arm/glove80_v0/glove80_v0_rh.dts b/app/boards/arm/glove80_v0/glove80_v0_rh.dts index 4ff8ef39700..c2185da7817 100644 --- a/app/boards/arm/glove80_v0/glove80_v0_rh.dts +++ b/app/boards/arm/glove80_v0/glove80_v0_rh.dts @@ -24,29 +24,25 @@ compatible = "gpio-leds"; red_led: led_0 { gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>; - label = "Red LED"; }; }; power_led_backlight: pwmleds { compatible = "pwm-leds"; - label = "Backlight LEDs"; pwm_led_0 { pwms = <&pwm0 0 PWM_USEC(20) PWM_POLARITY_NORMAL>; - label = "Power Led Backlight"; }; }; - ext-power { + // Node name must match original "EXT_POWER" label to preserve user settings. + EXT_POWER { compatible = "zmk,ext-power-generic"; - label = "EXT_POWER"; control-gpios = <&gpio0 21 GPIO_ACTIVE_HIGH>; /**[SC] WS2812_CE */ init-delay-ms = <10>; }; vbatt: vbatt-divider { compatible = "zmk,battery-voltage-divider"; - label = "BATTERY"; io-channels = <&adc 5>; output-ohms = <820000>; /** Double check that this is right */ full-ohms = <(1500000 + 820000)>; @@ -54,7 +50,6 @@ vbatt-vddh { compatible = "zmk,battery-nrf-vddh"; - label = "BATTERY-VDDH"; }; }; @@ -69,7 +64,6 @@ pinctrl-names = "default", "sleep"; led_strip: ws2812@0 { compatible = "worldsemi,ws2812-spi"; - label = "WS2812C-2020"; /* SPI */ reg = <0>; /* ignored, but necessary for SPI bindings */