Skip to content

Commit 3c637e7

Browse files
kylebonnicikylebonnici
committed
devicetree: format files in boards/waveshare
Applying dts-linter results for format files in boards/waveshare Signed-off-by: Kyle Micallef Bonnici <[email protected]>
1 parent 821ce8d commit 3c637e7

15 files changed

+160
-161
lines changed

‎boards/waveshare/esp32s3_matrix/esp32s3_matrix-pinctrl.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
&pinctrl {
1212
spim2_ws2812_led: spim2_ws2812_led {
1313
group1 {
14-
pinmux = <SPIM2_MOSI_GPIO14>;
1514
output-low;
15+
pinmux = <SPIM2_MOSI_GPIO14>;
1616
};
1717
};
1818
};

‎boards/waveshare/esp32s3_matrix/esp32s3_matrix_esp32s3_appcpu.dts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
#include <espressif/partitions_0x0_amp_4M.dtsi>
1010

1111
/ {
12-
model = "ESP32-S3-Matrix APPCPU";
1312
compatible = "waveshare,esp32-s3-matrix";
13+
model = "ESP32-S3-Matrix APPCPU";
1414

1515
chosen {
16-
zephyr,sram = &sram1;
17-
zephyr,ipc_shm = &shm0;
18-
zephyr,ipc = &ipm0;
19-
zephyr,flash = &flash0;
2016
zephyr,code-partition = &slot0_appcpu_partition;
17+
zephyr,flash = &flash0;
18+
zephyr,ipc = &ipm0;
19+
zephyr,ipc_shm = &shm0;
20+
zephyr,sram = &sram1;
2121
};
2222
};
2323

‎boards/waveshare/esp32s3_matrix/esp32s3_matrix_esp32s3_procpu.dts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,23 @@
1313
#include "esp32s3_matrix-pinctrl.dtsi"
1414

1515
/ {
16-
model = "ESP32-S3-Matrix PROCPU";
1716
compatible = "waveshare,esp32-s3-matrix";
17+
model = "ESP32-S3-Matrix PROCPU";
1818

1919
aliases {
20+
led-strip = &led_strip;
2021
sw0 = &button0;
2122
watchdog0 = &wdt0;
22-
led-strip = &led_strip;
2323
};
2424

2525
chosen {
26-
zephyr,sram = &sram1;
27-
zephyr,console = &usb_serial;
28-
zephyr,shell-uart = &usb_serial;
29-
zephyr,flash = &flash0;
26+
zephyr,bt-hci = &esp32_bt_hci;
3027
zephyr,code-partition = &slot0_partition;
28+
zephyr,console = &usb_serial;
3129
zephyr,display = &rgb_matrix;
32-
zephyr,bt-hci = &esp32_bt_hci;
30+
zephyr,flash = &flash0;
31+
zephyr,shell-uart = &usb_serial;
32+
zephyr,sram = &sram1;
3333
};
3434

3535
buttons {
@@ -44,11 +44,11 @@
4444

4545
rgb_matrix: rgb-matrix {
4646
compatible = "led-strip-matrix";
47-
status = "okay";
48-
width = <8>;
49-
height = <8>;
5047
circulative;
48+
height = <8>;
5149
led-strips = <&led_strip>;
50+
width = <8>;
51+
status = "okay";
5252
};
5353
};
5454

@@ -65,21 +65,21 @@
6565
};
6666

6767
&spi2 {
68-
status = "okay";
6968
#address-cells = <1>;
7069
#size-cells = <0>;
70+
line-idle-low;
7171
pinctrl-0 = <&spim2_ws2812_led>;
7272
pinctrl-names = "default";
73-
line-idle-low;
73+
status = "okay";
7474

7575
led_strip: ws2812@0 {
7676
compatible = "worldsemi,ws2812-spi";
7777
reg = <0>;
78-
spi-max-frequency = <WS2812C_SPI_FREQ>;
7978
chain-length = <64>;
8079
color-mapping = <LED_COLOR_ID_RED>,
8180
<LED_COLOR_ID_GREEN>,
8281
<LED_COLOR_ID_BLUE>;
82+
spi-max-frequency = <WS2812C_SPI_FREQ>;
8383
spi-one-frame = <WS2812C_ONE_FRAME>;
8484
spi-zero-frame = <WS2812C_ZERO_FRAME>;
8585
};

‎boards/waveshare/esp32s3_touch_lcd_1_28/esp32s3_touch_lcd_1_28-pinctrl.dtsi‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@
1010
&pinctrl {
1111
i2c1_default: i2c1_default {
1212
group1 {
13-
pinmux = <I2C1_SDA_GPIO6>, <I2C1_SCL_GPIO7>;
1413
bias-pull-up;
1514
drive-open-drain;
1615
output-high;
16+
pinmux = <I2C1_SDA_GPIO6>, <I2C1_SCL_GPIO7>;
1717
};
1818
};
1919

2020
ledc0_default: ledc0_default {
2121
group1 {
22-
pinmux = <LEDC_CH0_GPIO2>, <LEDC_CH1_GPIO5>, <LEDC_CH2_GPIO4>;
2322
output-enable;
23+
pinmux = <LEDC_CH0_GPIO2>, <LEDC_CH1_GPIO5>, <LEDC_CH2_GPIO4>;
2424
};
2525
};
2626

@@ -30,20 +30,20 @@
3030
};
3131

3232
group2 {
33-
pinmux = <SPIM2_MOSI_GPIO11>;
3433
output-low;
34+
pinmux = <SPIM2_MOSI_GPIO11>;
3535
};
3636
};
3737

3838
uart0_default: uart0_default {
3939
group1 {
40-
pinmux = <UART0_TX_GPIO43>;
4140
output-high;
41+
pinmux = <UART0_TX_GPIO43>;
4242
};
4343

4444
group2 {
45-
pinmux = <UART0_RX_GPIO44>;
4645
bias-pull-up;
46+
pinmux = <UART0_RX_GPIO44>;
4747
};
4848
};
4949
};

‎boards/waveshare/esp32s3_touch_lcd_1_28/esp32s3_touch_lcd_1_28_esp32s3_appcpu.dts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
#include <espressif/partitions_0x0_amp_16M.dtsi>
99

1010
/ {
11-
model = "ESP32-S3-Touch-LCD-1.28 APPCPU";
1211
compatible = "waveshare,esp32-s3-touch-lcd-1.28";
12+
model = "ESP32-S3-Touch-LCD-1.28 APPCPU";
1313

1414
chosen {
15-
zephyr,sram = &sram1;
16-
zephyr,ipc_shm = &shm0;
17-
zephyr,ipc = &ipm0;
18-
zephyr,flash = &flash0;
1915
zephyr,code-partition = &slot0_appcpu_partition;
16+
zephyr,flash = &flash0;
17+
zephyr,ipc = &ipm0;
18+
zephyr,ipc_shm = &shm0;
19+
zephyr,sram = &sram1;
2020
};
2121
};
2222

‎boards/waveshare/esp32s3_touch_lcd_1_28/esp32s3_touch_lcd_1_28_esp32s3_procpu.dts‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
#include <espressif/partitions_0x0_amp_16M.dtsi>
1313

1414
/ {
15-
model = "ESP32-S3-Touch-LCD-1.28 PROCPU";
1615
compatible = "waveshare,esp32-s3-touch-lcd-1.28";
16+
model = "ESP32-S3-Touch-LCD-1.28 PROCPU";
1717

1818
aliases {
1919
i2c-1 = &i2c1;
@@ -25,13 +25,13 @@
2525
};
2626

2727
chosen {
28-
zephyr,sram = &sram1;
29-
zephyr,console = &uart0;
30-
zephyr,shell-uart = &uart0;
31-
zephyr,flash = &flash0;
28+
zephyr,bt-hci = &esp32_bt_hci;
3229
zephyr,code-partition = &slot0_partition;
30+
zephyr,console = &uart0;
3331
zephyr,display = &gc9a01;
34-
zephyr,bt-hci = &esp32_bt_hci;
32+
zephyr,flash = &flash0;
33+
zephyr,shell-uart = &uart0;
34+
zephyr,sram = &sram1;
3535
zephyr,touch = &cst816s;
3636
};
3737

@@ -64,22 +64,22 @@
6464
/* MIPI DBI */
6565
mipi_dbi {
6666
compatible = "zephyr,mipi-dbi-spi";
67-
spi-dev = <&spi2>;
67+
#address-cells = <1>;
68+
#size-cells = <0>;
6869
dc-gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
6970
reset-gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
71+
spi-dev = <&spi2>;
7072
write-only;
71-
#address-cells = <1>;
72-
#size-cells = <0>;
7373

7474
gc9a01: gc9a01@0 {
75-
status = "okay";
7675
compatible = "galaxycore,gc9x01x";
7776
reg = <0>;
77+
display-inversion;
78+
height = <240>;
7879
mipi-max-frequency = <100000000>;
7980
pixel-format = <PANEL_PIXEL_FORMAT_RGB_565>;
80-
display-inversion;
8181
width = <240>;
82-
height = <240>;
82+
status = "okay";
8383
};
8484
};
8585
};
@@ -97,27 +97,27 @@
9797
};
9898

9999
&i2c1 {
100-
status = "okay";
101100
clock-frequency = <I2C_BITRATE_STANDARD>;
102101
pinctrl-0 = <&i2c1_default>;
103102
pinctrl-names = "default";
103+
status = "okay";
104104

105105
/* Hynitron CST816S Capacitive Touch Controller */
106106
cst816s: cst816s@15 {
107-
status = "okay";
108107
compatible = "hynitron,cst816s";
109108
reg = <0x15>;
110109
irq-gpios = <&gpio0 5 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
111110
rst-gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
111+
status = "okay";
112112
};
113113
};
114114

115115
&ledc0 {
116-
status = "okay";
117-
pinctrl-0 = <&ledc0_default>;
118-
pinctrl-names = "default";
119116
#address-cells = <1>;
120117
#size-cells = <0>;
118+
pinctrl-0 = <&ledc0_default>;
119+
pinctrl-names = "default";
120+
status = "okay";
121121

122122
channel0@0 {
123123
reg = <0x0>;
@@ -136,23 +136,23 @@
136136
};
137137

138138
&spi2 {
139-
status = "okay";
140139
#address-cells = <1>;
141140
#size-cells = <0>;
141+
cs-gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
142142
pinctrl-0 = <&spim2_default>;
143143
pinctrl-names = "default";
144-
cs-gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
144+
status = "okay";
145145
};
146146

147147
&trng0 {
148148
status = "okay";
149149
};
150150

151151
&uart0 {
152-
status = "okay";
153152
current-speed = <115200>;
154153
pinctrl-0 = <&uart0_default>;
155154
pinctrl-names = "default";
155+
status = "okay";
156156
};
157157

158158
&wdt0 {

‎boards/waveshare/nrf51_ble400/nrf51_ble400-pinctrl.dtsi‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313

1414
i2c0_sleep: i2c0_sleep {
1515
group1 {
16+
low-power-enable;
1617
psels = <NRF_PSEL(TWIM_SDA, 0, 0)>,
1718
<NRF_PSEL(TWIM_SCL, 0, 1)>;
18-
low-power-enable;
1919
};
2020
};
2121

@@ -29,10 +29,10 @@
2929

3030
spi1_sleep: spi1_sleep {
3131
group1 {
32+
low-power-enable;
3233
psels = <NRF_PSEL(SPIM_SCK, 0, 25)>,
3334
<NRF_PSEL(SPIM_MOSI, 0, 24)>,
3435
<NRF_PSEL(SPIM_MISO, 0, 23)>;
35-
low-power-enable;
3636
};
3737
};
3838

@@ -47,11 +47,11 @@
4747

4848
uart0_sleep: uart0_sleep {
4949
group1 {
50+
low-power-enable;
5051
psels = <NRF_PSEL(UART_TX, 0, 9)>,
5152
<NRF_PSEL(UART_RX, 0, 11)>,
5253
<NRF_PSEL(UART_RTS, 0, 8)>,
5354
<NRF_PSEL(UART_CTS, 0, 10)>;
54-
low-power-enable;
5555
};
5656
};
5757
};

‎boards/waveshare/nrf51_ble400/nrf51_ble400.dts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
#include <zephyr/dt-bindings/input/input-event-codes.h>
1111

1212
/ {
13-
model = "Waveshare BLE400";
1413
compatible = "waveshare,BLE400";
14+
model = "Waveshare BLE400";
1515

1616
chosen {
17+
zephyr,bt-c2h-uart = &uart0;
18+
zephyr,bt-mon-uart = &uart0;
1719
zephyr,console = &uart0;
20+
zephyr,flash = &flash0;
1821
zephyr,shell-uart = &uart0;
19-
zephyr,bt-mon-uart = &uart0;
20-
zephyr,bt-c2h-uart = &uart0;
2122
zephyr,sram = &sram0;
22-
zephyr,flash = &flash0;
2323
};
2424

2525
/* These aliases are provided for compatibility with samples */
@@ -91,26 +91,26 @@
9191
};
9292

9393
&i2c0 {
94-
status = "okay";
9594
/* smba-pin = <2>; */
9695
pinctrl-0 = <&i2c0_default>;
9796
pinctrl-1 = <&i2c0_sleep>;
9897
pinctrl-names = "default", "sleep";
98+
status = "okay";
9999
};
100100

101101
&spi1 {
102102
compatible = "nordic,nrf-spi";
103-
status = "okay";
104103
cs-gpios = <&gpio0 30 GPIO_ACTIVE_LOW>;
105104
pinctrl-0 = <&spi1_default>;
106105
pinctrl-1 = <&spi1_sleep>;
107106
pinctrl-names = "default", "sleep";
107+
status = "okay";
108108
};
109109

110110
&uart0 {
111111
current-speed = <115200>;
112-
status = "okay";
113112
pinctrl-0 = <&uart0_default>;
114113
pinctrl-1 = <&uart0_sleep>;
115114
pinctrl-names = "default", "sleep";
115+
status = "okay";
116116
};

0 commit comments

Comments
 (0)