rarias/nixos-riscv
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Configure SPI addresses in header

Browse Source 
We use the ENABLE_SPI toggle to also set the PLIC number of inputs.
This commit is contained in:
Rodrigo Arias 2024-10-11 11:01:48 +02:00
parent 4d1e8d3dea
commit 4333f8074e
2 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dts/lagarto_ox.dts
View File

@ -205,7 +205,7 @@
* property is described in * property is described in
* Documentation/devicetree/bindings/riscv/cpus.yaml * Documentation/devicetree/bindings/riscv/cpus.yaml
*/ */
clint: clint@40100000 { clint: clint@CLINT_ADDR {
reg = /bits/ 64 <CLINT_ADDR CLINT_SIZE>; reg = /bits/ 64 <CLINT_ADDR CLINT_SIZE>;
reg-names = "control"; reg-names = "control";
interrupts-extended = <&HLIC0 3>, <&HLIC0 7>; interrupts-extended = <&HLIC0 3>, <&HLIC0 7>;
@ -217,8 +217,8 @@
/* There is another auxiliar clint (timer) at 40010000 for /* There is another auxiliar clint (timer) at 40010000 for
* tests, but we don't tell the kernel so we can use it for * tests, but we don't tell the kernel so we can use it for
* testing interrupts manually. */ * testing interrupts manually. */
aux_timer: clint@40010000 { aux_timer: clint@AUXTIMER_ADDR {
reg = /bits/ 64 <0x0 0x40010000 0x0 0x00010000>; reg = /bits/ 64 <AUXTIMER_ADDR AUXTIMER_SIZE>;
reg-names = "control"; reg-names = "control";
interrupts = <4>; /* PLIC input source 4 */ interrupts = <4>; /* PLIC input source 4 */
interrupt-parent = <&PLIC>; interrupt-parent = <&PLIC>;
@ -227,23 +227,23 @@
#endif #endif
#ifdef ENABLE_SPI #ifdef ENABLE_SPI
uart16750: serial@40005000 { serial@UART2_ADDR {
compatible = "ns16750"; compatible = "ns16750";
reg = <0x00000000 0x40005000 0x00000000 0x00001000>; reg = /bits/ 64 <UART2_ADDR UART2_SIZE>;
interrupt-parent = <&PLIC>; interrupt-parent = <&PLIC>;
interrupts = <5>; interrupts = <5>;
clock-frequency = <CPU_FREQ>; clock-frequency = <CPU_FREQ>;
current-speed = <0x0001c200>; current-speed = <UART2_SPEED>;
status = "okay"; status = "okay";
}; };
spi0: spi@40007000 { spi@SPI_ADDR {
compatible = "ti,keystone-spi"; compatible = "ti,keystone-spi";
reg = <0x00000000 0x40007000 0x00000000 0x00001000>; reg = /bits/ 64 <SPI_ADDR SPI_SIZE>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
interrupt-parent = <&PLIC>; interrupt-parent = <&PLIC>;
interrupt-names = "intvec0", "intvec1"; interrupt-names = "intvec0", "intvec1";
interrupts = <6 0>, <0x00000007 0>; interrupts = <6 0>, <7 0>;
ti,davinci-spi-intr-line = <0>; ti,davinci-spi-intr-line = <0>;
spi-max-frequency = <24000000>; spi-max-frequency = <24000000>;
loopback-mode = <1>; loopback-mode = <1>;

35
dts/lagarto_ox.h
View File

@ -1,3 +1,13 @@
/* Toggles */
#define ENABLE_UART0
#define ENABLE_UART1
#define ENABLE_ETHERNET
#define ENABLE_AXIDMA
#define ENABLE_PLIC
#define ENABLE_CLINT
//#define ENABLE_SPI
#define CPU_FREQ 50000000 /* 50 MHz */ #define CPU_FREQ 50000000 /* 50 MHz */
/* FIXME: The real RTC frequency is around half that, as the divider was wrongly /* FIXME: The real RTC frequency is around half that, as the divider was wrongly
* configured. So for now lets use the real frequency: * configured. So for now lets use the real frequency:
@ -22,6 +32,14 @@
#define UART1_ADDR 0x40003000 #define UART1_ADDR 0x40003000
#define UART1_SIZE 0x00001000 #define UART1_SIZE 0x00001000
/* UART2 via SPI */
#define UART2_SPEED UART0_SPEED
#define UART2_ADDR 0x40005000
#define UART2_SIZE 0x00001000
#define SPI_ADDR 0x40007000
#define SPI_SIZE 0x00001000
#define AUXTIMER_ADDR 0x40010000 #define AUXTIMER_ADDR 0x40010000
#define AUXTIMER_SIZE 0x00010000 #define AUXTIMER_SIZE 0x00010000
@ -36,7 +54,12 @@
#define PLIC_ADDR 0x40800000 #define PLIC_ADDR 0x40800000
#define PLIC_SIZE 0x00400000 #define PLIC_SIZE 0x00400000
#define PLIC_NDEV 4
#ifdef ENABLE_SPI
# define PLIC_NDEV 7 /* extra UART2 + 2 x SPI */
#else
# define PLIC_NDEV 4
#endif
#define ETHPOOL_ADDR 0x60000000 #define ETHPOOL_ADDR 0x60000000
#define ETHPOOL_SIZE 0x10000000 #define ETHPOOL_SIZE 0x10000000
@ -51,13 +74,3 @@
#define PMEM_ADDR 0x1c0000000 #define PMEM_ADDR 0x1c0000000
#define PMEM_SIZE 0x0c0000000 #define PMEM_SIZE 0x0c0000000
/* Toggles */
#define ENABLE_UART0
#define ENABLE_UART1
#define ENABLE_ETHERNET
#define ENABLE_AXIDMA
#define ENABLE_PLIC
#define ENABLE_CLINT
//#define ENABLE_SPI