Commit f29d3faf authored by Raptor Engineering Development Team's avatar Raptor Engineering Development Team
Browse files

Minor changes to support new Zephyr 3.2.x version

parent b91db472
......@@ -16,9 +16,7 @@
aliases {
led0 = &led_0;
led1 = &led_1;
};
aliases {
sw0 = &button0;
swhog0 = &button0_hog;
sw1 = &button1;
......@@ -35,19 +33,15 @@
compatible = "gpio-keys";
button0: button_0 {
gpios = <&gpio_discrete 6 GPIO_ACTIVE_HIGH>;
label = "Host power button";
};
button0_hog: button_0_hog {
gpios = <&gpio_discrete 7 GPIO_ACTIVE_HIGH>;
label = "Host power button contact voltage hog";
};
button1: button_1 {
gpios = <&gpio_discrete 8 GPIO_ACTIVE_HIGH>;
label = "Host reset button";
};
button1_hog: button_1_hog {
gpios = <&gpio_discrete 9 GPIO_ACTIVE_HIGH>;
label = "Host reset button contact voltage hog";
};
};
......@@ -55,11 +49,9 @@
compatible = "gpio-leds";
led_0: led_0 {
gpios = <&gpio_discrete 10 GPIO_ACTIVE_HIGH>;
label = "USERLED0";
};
led_1: led_1 {
gpios = <&gpio_discrete 12 GPIO_ACTIVE_HIGH>;
label = "USERLED1";
};
};
......@@ -76,29 +68,77 @@
&spi0 {
status = "okay";
};
&spi1 {
status = "okay";
flash0: flash@0 {
compatible = "micron,n25q128a","jedec,spi-nor";
status = "okay";
reg = <0x00>;
size = <DT_SIZE_M(16)>;
jedec-id = [20 bb 18];
spi-max-frequency = <12000000>;
partitions {
compatible = "fixed-partitions";
#address-cells = <0x01>;
#size-cells = <0x01>;
bitstream: partition@0 {
reg = <0x0 0x800000>;
};
};
};
};
&spi2 {
&spi1 {
status = "okay";
};
&flash0 {
status = "okay";
spi-max-frequency = <12000000>;
flash1: flash@0 {
compatible = "micron,n25q128a","jedec,spi-nor";
/* Zephyr can only handle one Flash device at a time, see bug #32100 */
status = "disabled";
reg = <0x00>;
size = <DT_SIZE_M(16)>;
jedec-id = [20 bb 18];
spi-max-frequency = <12000000>;
partitions {
compatible = "fixed-partitions";
#address-cells = <0x01>;
#size-cells = <0x01>;
zephyr_rofs: partition@0 {
reg = <0x0 0x800000>;
};
zephyr_rwfs: partition@c00000 {
reg = <0xc00000 0x400000>;
};
};
};
};
&flash1 {
&spi2 {
status = "okay";
spi-max-frequency = <12000000>;
};
&flash2 {
status = "okay";
spi-max-frequency = <12000000>;
flash2: flash@0 {
compatible = "micron,n25q512a","jedec,spi-nor";
/* Zephyr can only handle one Flash device at a time, see bug #32100 */
status = "disabled";
reg = <0x00>;
size = <DT_SIZE_M(64)>;
jedec-id = [20 44 c0];
spi-max-frequency = <12000000>;
partitions {
compatible = "fixed-partitions";
#address-cells = <0x01>;
#size-cells = <0x01>;
pnor: partition@0 {
reg = <0x0 0x4000000>;
};
};
};
};
&eth0 {
......
......@@ -155,7 +155,6 @@
"ev_enable",
"txempty",
"rxfull";
label = "uart0";
status = "disabled";
};
......@@ -213,28 +212,6 @@
reg = <0xc3004000 0x80
0xc4000000 0x01000000>;
reg-names = "control", "data";
label = "SPI_0";
flash0: flash@0 {
compatible = "micron,n25q128a","jedec,spi-nor";
status = "okay";
label = "fpga";
reg = <0x00>;
size = <DT_SIZE_M(16)>;
jedec-id = [20 bb 18];
spi-max-frequency = <4000000>;
partitions {
compatible = "fixed-partitions";
#address-cells = <0x01>;
#size-cells = <0x01>;
bitstream: partition@0 {
label = "bitstream";
reg = <0x0 0x800000>;
};
};
};
};
spi1: spi@c3004100 {
......@@ -245,33 +222,6 @@
reg = <0xc3004100 0x80
0xc6000000 0x01000000>;
reg-names = "control", "data";
label = "SPI_1";
flash1: flash@0 {
compatible = "micron,n25q128a","jedec,spi-nor";
status = "okay";
label = "bmc";
reg = <0x00>;
size = <DT_SIZE_M(16)>;
jedec-id = [20 bb 18];
spi-max-frequency = <4000000>;
partitions {
compatible = "fixed-partitions";
#address-cells = <0x01>;
#size-cells = <0x01>;
zephyr_rofs: partition@0 {
label = "zephyr_rofs";
reg = <0x0 0x800000>;
};
zephyr_rwfs: partition@c00000 {
label = "storage";
reg = <0xc00000 0x400000>;
};
};
};
};
spi2: spi@c3004200 {
......@@ -282,28 +232,6 @@
reg = <0xc3004200 0x80
0xc8000000 0x04000000>;
reg-names = "control", "data";
label = "SPI_2";
flash2: flash@0 {
compatible = "micron,n25q512a","jedec,spi-nor";
status = "okay";
label = "pnor";
reg = <0x00>;
size = <DT_SIZE_M(64)>;
jedec-id = [20 44 c0];
spi-max-frequency = <4000000>;
partitions {
compatible = "fixed-partitions";
#address-cells = <0x01>;
#size-cells = <0x01>;
pnor: partition@0 {
label = "pnor";
reg = <0x0 0x4000000>;
};
};
};
};
i2c0@c3008000 {
......@@ -371,7 +299,6 @@
"tx_length",
"tx_ev_pending",
"buffers";
label = "eth0";
status = "disabled";
};
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment