Skip to content

Commit edd22b9

Browse files
nzmichaelhnzmichaelh
committed
spi: sam0: use Device Tree for configuration.
Switch the SoC device tree to define a single entry per SERCOM instead of one per mode. Define a Device Tree binding for the SAM0 SPI and use it instead of Kconfig for enabling / disabaling instances Switch the Arduino Zero and Trinket M0 to use the new defintion. Add the APA102 LED that's on the Trinket as a test. Signed-off-by: Michael Hope <[email protected]>
1 parent 571069e commit edd22b9

File tree

10 files changed

+119
-68
lines changed

10 files changed

+119
-68
lines changed

‎arch/arm/soc/atmel_sam0/samd21/dts.fixup

+18
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,24 @@
4545
#define CONFIG_UART_SAM0_SERCOM5_LABEL ATMEL_SAM0_UART_42001C00_LABEL
4646
#define CONFIG_UART_SAM0_SERCOM5_BASE_ADDRESS ATMEL_SAM0_UART_42001C00_BASE_ADDRESS
4747

48+
#define CONFIG_SPI_SAM0_SERCOM0_LABEL ATMEL_SAM0_SPI_42000800_LABEL
49+
#define CONFIG_SPI_SAM0_SERCOM0_BASE_ADDRESS ATMEL_SAM0_SPI_42000800_BASE_ADDRESS
50+
51+
#define CONFIG_SPI_SAM0_SERCOM1_LABEL ATMEL_SAM0_SPI_42000C00_LABEL
52+
#define CONFIG_SPI_SAM0_SERCOM1_BASE_ADDRESS ATMEL_SAM0_SPI_42000C00_BASE_ADDRESS
53+
54+
#define CONFIG_SPI_SAM0_SERCOM2_LABEL ATMEL_SAM0_SPI_42001000_LABEL
55+
#define CONFIG_SPI_SAM0_SERCOM2_BASE_ADDRESS ATMEL_SAM0_SPI_42001000_BASE_ADDRESS
56+
57+
#define CONFIG_SPI_SAM0_SERCOM3_LABEL ATMEL_SAM0_SPI_42001400_LABEL
58+
#define CONFIG_SPI_SAM0_SERCOM3_BASE_ADDRESS ATMEL_SAM0_SPI_42001400_BASE_ADDRESS
59+
60+
#define CONFIG_SPI_SAM0_SERCOM4_LABEL ATMEL_SAM0_SPI_42001800_LABEL
61+
#define CONFIG_SPI_SAM0_SERCOM4_BASE_ADDRESS ATMEL_SAM0_SPI_42001800_BASE_ADDRESS
62+
63+
#define CONFIG_SPI_SAM0_SERCOM5_LABEL ATMEL_SAM0_SPI_42001C00_LABEL
64+
#define CONFIG_SPI_SAM0_SERCOM5_BASE_ADDRESS ATMEL_SAM0_SPI_42001C00_BASE_ADDRESS
65+
4866
#define CONFIG_WDT_SAM0_IRQ ATMEL_SAM0_WATCHDOG_40001000_IRQ_0
4967
#define CONFIG_WDT_SAM0_IRQ_PRIORITY ATMEL_SAM0_WATCHDOG_40001000_IRQ_0_PRIORITY
5068
#define CONFIG_WDT_SAM0_LABEL ATMEL_SAM0_WATCHDOG_40001000_LABEL

‎boards/arm/adafruit_trinket_m0/adafruit_trinket_m0.dts

+13-1
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,29 @@
2121

2222
&sercom0 {
2323
status = "ok";
24+
compatible = "atmel,sam0-uart";
2425
current-speed = <115200>;
2526
};
2627

2728
&sercom2 {
2829
status = "ok";
30+
compatible = "atmel,sam0-uart";
2931
current-speed = <115200>;
3032
};
3133

3234
/* Drives the on-board DotStar LED */
33-
&spi1 {
35+
&sercom1 {
3436
status = "ok";
37+
compatible = "atmel,sam0-spi";
38+
#address-cells = <1>;
39+
#size-cells = <0>;
40+
41+
led1: apa102@0 {
42+
compatible = "apa,apa102";
43+
reg = <0>;
44+
spi-max-frequency = <24000000>;
45+
label = "LED1";
46+
};
3547
};
3648

3749
&flash0 {

‎boards/arm/adafruit_trinket_m0/adafruit_trinket_m0_defconfig

-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ CONFIG_WATCHDOG=y
1616
CONFIG_WDT_SAM0=y
1717
CONFIG_SPI=y
1818
CONFIG_SPI_SAM0=y
19-
CONFIG_SPI_1=y
20-
CONFIG_SPI_1_IRQ_PRI=0
2119
CONFIG_SPI_LEGACY_API=n
2220
CONFIG_PINMUX=y
2321
CONFIG_PINMUX_SAM0=y

‎boards/arm/arduino_zero/arduino_zero.dts

+10-2
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,23 @@
1818
};
1919
};
2020

21-
&sercom5 {
21+
&sercom0 {
2222
status = "ok";
23+
compatible = "atmel,sam0-uart";
2324
current-speed = <115200>;
2425
};
25-
&sercom0 {
26+
27+
&sercom5 {
2628
status = "ok";
29+
compatible = "atmel,sam0-uart";
2730
current-speed = <115200>;
2831
};
2932

33+
&sercom4 {
34+
status = "ok";
35+
compatible = "atmel,sam0-spi";
36+
};
37+
3038
&flash0 {
3139
partitions {
3240
compatible = "fixed-partitions";

‎boards/arm/arduino_zero/arduino_zero_defconfig

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ CONFIG_SOC_ATMEL_SAMD_XOSC32K=y
1717
CONFIG_SOC_ATMEL_SAMD_XOSC32K_AS_MAIN=y
1818
CONFIG_SPI=y
1919
CONFIG_SPI_SAM0=y
20-
CONFIG_SPI_4=y
2120
CONFIG_SPI_LEGACY_API=n
2221
CONFIG_PINMUX=y
2322
CONFIG_PINMUX_SAM0=y

‎drivers/spi/Kconfig.sam0

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
menuconfig SPI_SAM0
77
bool "Atmel SAM0 series SERCOM SPI driver"
88
depends on SOC_FAMILY_SAM0
9+
select HAS_DTS_SPI
910
default n
1011
help
1112
Enable support for the SAM0 SERCOM SPI driver.

‎drivers/spi/spi_sam0.c

+9-8
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ static const struct spi_driver_api spi_sam0_driver_api = {
436436

437437
#define SPI_SAM0_DEFINE_CONFIG(n) \
438438
static const struct spi_sam0_config spi_sam0_config_##n = { \
439-
.regs = &SERCOM##n->SPI, \
439+
.regs = (SercomSpi *)CONFIG_SPI_SAM0_SERCOM##n##_BASE_ADDRESS, \
440440
.pm_apbcmask = PM_APBCMASK_SERCOM##n, \
441441
.gclk_clkctrl_id = GCLK_CLKCTRL_ID_SERCOM##n##_CORE, \
442442
.pads = CONFIG_SPI_SAM0_SERCOM##n##_PADS \
@@ -448,31 +448,32 @@ static const struct spi_driver_api spi_sam0_driver_api = {
448448
SPI_CONTEXT_INIT_LOCK(spi_sam0_dev_data_##n, ctx), \
449449
SPI_CONTEXT_INIT_SYNC(spi_sam0_dev_data_##n, ctx), \
450450
}; \
451-
DEVICE_AND_API_INIT(spi_sam0_##n, CONFIG_SPI_##n##_NAME, \
451+
DEVICE_AND_API_INIT(spi_sam0_##n, \
452+
CONFIG_SPI_SAM0_SERCOM##n##_LABEL, \
452453
&spi_sam0_init, &spi_sam0_dev_data_##n, \
453454
&spi_sam0_config_##n, POST_KERNEL, \
454455
CONFIG_SPI_INIT_PRIORITY, &spi_sam0_driver_api)
455456

456-
#if CONFIG_SPI_0
457+
#if CONFIG_SPI_SAM0_SERCOM0_BASE_ADDRESS
457458
SPI_SAM0_DEVICE_INIT(0);
458459
#endif
459460

460-
#if CONFIG_SPI_1
461+
#if CONFIG_SPI_SAM0_SERCOM1_BASE_ADDRESS
461462
SPI_SAM0_DEVICE_INIT(1);
462463
#endif
463464

464-
#if CONFIG_SPI_2
465+
#if CONFIG_SPI_SAM0_SERCOM2_BASE_ADDRESS
465466
SPI_SAM0_DEVICE_INIT(2);
466467
#endif
467468

468-
#if CONFIG_SPI_3
469+
#if CONFIG_SPI_SAM0_SERCOM3_BASE_ADDRESS
469470
SPI_SAM0_DEVICE_INIT(3);
470471
#endif
471472

472-
#if CONFIG_SPI_4
473+
#if CONFIG_SPI_SAM0_SERCOM4_BASE_ADDRESS
473474
SPI_SAM0_DEVICE_INIT(4);
474475
#endif
475476

476-
#if CONFIG_SPI_5
477+
#if CONFIG_SPI_SAM0_SERCOM5_BASE_ADDRESS
477478
SPI_SAM0_DEVICE_INIT(5);
478479
#endif

‎dts/arm/atmel/samd21.dtsi

+12-54
Original file line numberDiff line numberDiff line change
@@ -61,96 +61,54 @@
6161
label = "WATCHDOG_0";
6262
};
6363

64-
sercom0: uart@42000800 {
65-
compatible = "atmel,sam0-uart";
64+
sercom0: sercom@42000800 {
65+
compatible = "atmel,sam0-sercom";
6666
reg = <0x42000800 0x40>;
6767
interrupts = <9 0>;
6868
status = "disabled";
6969
label = "SERCOM0";
7070
};
7171

72-
sercom1: uart@42000c00 {
73-
compatible = "atmel,sam0-uart";
72+
sercom1: sercom@42000c00 {
73+
compatible = "atmel,sam0-sercom";
7474
reg = <0x42000c00 0x40>;
7575
interrupts = <10 0>;
7676
status = "disabled";
7777
label = "SERCOM1";
7878
};
7979

80-
sercom2: uart@42001000 {
81-
compatible = "atmel,sam0-uart";
80+
sercom2: sercom@42001000 {
81+
compatible = "atmel,sam0-sercom";
8282
reg = <0x42001000 0x40>;
8383
interrupts = <11 0>;
8484
status = "disabled";
8585
label = "SERCOM2";
8686
};
8787

88-
sercom3: uart@42001400 {
89-
compatible = "atmel,sam0-uart";
88+
sercom3: sercom@42001400 {
89+
compatible = "atmel,sam0-sercom";
9090
reg = <0x42001400 0x40>;
9191
interrupts = <12 0>;
9292
status = "disabled";
9393
label = "SERCOM3";
9494
};
9595

96-
sercom4: uart@42001800 {
97-
compatible = "atmel,sam0-uart";
96+
sercom4: sercom@42001800 {
97+
compatible = "atmel,sam0-sercom";
9898
reg = <0x42001800 0x40>;
9999
interrupts = <13 0>;
100100
status = "disabled";
101101
label = "SERCOM4";
102102
};
103103

104-
sercom5: uart@42001C00 {
105-
compatible = "atmel,sam0-uart";
104+
sercom5: sercom@42001C00 {
105+
compatible = "atmel,sam0-sercom";
106106
reg = <0x42001C00 0x40>;
107107
interrupts = <14 0>;
108108
status = "disabled";
109109
label = "SERCOM5";
110110
};
111111

112-
spi0: spi@42000800 {
113-
compatible = "atmel,sam0-spi";
114-
reg = <0x42000800 0x40>;
115-
status = "disabled";
116-
label = "SPI0";
117-
};
118-
119-
spi1: spi@42000c00 {
120-
compatible = "atmel,sam0-spi";
121-
reg = <0x42000c00 0x40>;
122-
status = "disabled";
123-
label = "SPI1";
124-
};
125-
126-
spi2: spi@42001000 {
127-
compatible = "atmel,sam0-spi";
128-
reg = <0x42001000 0x40>;
129-
status = "disabled";
130-
label = "SPI2";
131-
};
132-
133-
spi3: spi@42001400 {
134-
compatible = "atmel,sam0-spi";
135-
reg = <0x42001400 0x40>;
136-
status = "disabled";
137-
label = "SPI3";
138-
};
139-
140-
spi4: spi@42001800 {
141-
compatible = "atmel,sam0-spi";
142-
reg = <0x42001800 0x40>;
143-
status = "disabled";
144-
label = "SPI4";
145-
};
146-
147-
spi5: spi@42001C00 {
148-
compatible = "atmel,sam0-spi";
149-
reg = <0x42001C00 0x40>;
150-
status = "disabled";
151-
label = "SPI5";
152-
};
153-
154112
porta: gpio@41004400 {
155113
compatible = "atmel,sam0-gpio";
156114
reg = <0x41004400 0x80>;

‎dts/bindings/arm/atmel,sam0-sercom.yaml

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
---
2+
title: Atmel SERCOM binding
3+
id: atmel,sam0-sercom
4+
version: 0.1
5+
6+
description: >
7+
Binding for the Atmel SAM0 multi-protocol (UART, SPI, I2C) SERCOM unit.
8+
9+
properties:
10+
compatible:
11+
type: string
12+
category: required
13+
description: compatible strings
14+
constraint: "atmel,sam0-sercom"
15+
16+
reg:
17+
type: array
18+
description: mmio register space
19+
generation: define
20+
category: required
21+
22+
interrupts:
23+
type: array
24+
category: required
25+
description: required interrupts
26+
generation: define
27+
...

‎dts/bindings/spi/atmel,sam0-spi.yaml

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#
2+
# Copyright (c) 2018, Google LLC.
3+
#
4+
# SPDX-License-Identifier: Apache-2.0
5+
#
6+
---
7+
title: Atmel SAM0 SERCOM SPI driver
8+
id: atmel,sam0-spi
9+
version: 0.1
10+
11+
description: >
12+
This binding gives a base representation of the Atmel SAM0 SERCOM SPI controller
13+
14+
inherits:
15+
!include spi.yaml
16+
17+
properties:
18+
compatible:
19+
type: string
20+
category: required
21+
description: compatible strings
22+
constraint: "atmel,sam0-spi"
23+
24+
reg:
25+
type: array
26+
description: mmio register space
27+
generation: define
28+
category: required
29+
...

0 commit comments

Comments
 (0)