Skip to content

Commit

Permalink
Revert "[nrf fromlist] dts: nordic: Change compatible property for EX…
Browse files Browse the repository at this point in the history 
…MIF node"

This reverts commit 7d684d9.

Signed-off-by: Andrzej Głąbek <[email protected]>
  • Loading branch information
@anangl @nordicjm
anangl authored and nordicjm committed Dec 18, 2024
1 parent 7d364d0 commit 9dc8c82
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 85 deletions.
27 changes: 1 addition & 26 deletions boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-pinctrl.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,37 +73,12 @@
/omit-if-no-ref/ exmif_default: exmif_default {
group1 {
psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
<NRF_PSEL(EXMIF_CS0, 6, 3)>,
<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
<NRF_PSEL(EXMIF_DQ1, 6, 5)>;
nordic,drive-mode = <NRF_DRIVE_H0H1>;
};
};

/omit-if-no-ref/ exmif_sleep: exmif_sleep {
group1 {
low-power-enable;
psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
<NRF_PSEL(EXMIF_CS0, 6, 3)>,
<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
};
};

/omit-if-no-ref/ can120_default: can120_default {
group1 {
psels = <NRF_PSEL(CAN_RX, 9, 4)>,
Expand Down
19 changes: 5 additions & 14 deletions boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,15 +262,15 @@ ipc0: &cpuapp_cpurad_ipc {
};

&exmif {
cs-gpios = <&gpio6 3 GPIO_ACTIVE_LOW>;
pinctrl-0 = <&exmif_default>;
pinctrl-1 = <&exmif_sleep>;
pinctrl-names = "default", "sleep";
pinctrl-names = "default";
status = "okay";

mx25uw63: mx25uw6345g@0 {
compatible = "jedec,mspi-nor";
status = "okay";
compatible = "jedec,spi-nor";
status = "disabled";
reg = <0>;
spi-max-frequency = <DT_FREQ_M(48)>;
jedec-id = [c2 84 37];
sfdp-bfp = [
e5 20 8a ff ff ff ff 03 00 ff 00 ff 00 ff 00 ff
Expand All @@ -283,15 +283,6 @@ ipc0: &cpuapp_cpurad_ipc {
has-dpd;
t-enter-dpd = <10000>;
t-exit-dpd = <30000>;
reset-gpios = <&gpio6 12 GPIO_ACTIVE_LOW>;

mspi-max-frequency = <DT_FREQ_M(50)>;
mspi-io-mode = "MSPI_IO_MODE_OCTAL";
mspi-data-rate = "MSPI_DATA_RATE_SINGLE";
mspi-hardware-ce-num = <1>;
mspi-cpp-mode = "MSPI_CPP_MODE_0";
mspi-endian = "MSPI_BIG_ENDIAN";
mspi-ce-polarity = "MSPI_CE_ACTIVE_LOW";
};
};

Expand Down
27 changes: 1 addition & 26 deletions boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-pinctrl.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,37 +54,12 @@
/omit-if-no-ref/ exmif_default: exmif_default {
group1 {
psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
<NRF_PSEL(EXMIF_CS0, 6, 3)>,
<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
<NRF_PSEL(EXMIF_DQ1, 6, 5)>;
nordic,drive-mode = <NRF_DRIVE_H0H1>;
};
};

/omit-if-no-ref/ exmif_sleep: exmif_sleep {
group1 {
low-power-enable;
psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
<NRF_PSEL(EXMIF_CS0, 6, 3)>,
<NRF_PSEL(EXMIF_RWDS, 6, 2)>,
<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
<NRF_PSEL(EXMIF_DQ1, 6, 5)>,
<NRF_PSEL(EXMIF_DQ2, 6, 10)>,
<NRF_PSEL(EXMIF_DQ3, 6, 9)>,
<NRF_PSEL(EXMIF_DQ4, 6, 11)>,
<NRF_PSEL(EXMIF_DQ5, 6, 8)>,
<NRF_PSEL(EXMIF_DQ6, 6, 6)>,
<NRF_PSEL(EXMIF_DQ7, 6, 4)>;
};
};

/omit-if-no-ref/ can120_default: can120_default {
group1 {
psels = <NRF_PSEL(CAN_RX, 9, 4)>,
Expand Down
19 changes: 5 additions & 14 deletions boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,15 +253,15 @@ ipc0: &cpuapp_cpurad_ipc {
};

&exmif {
cs-gpios = <&gpio6 3 GPIO_ACTIVE_LOW>;
pinctrl-0 = <&exmif_default>;
pinctrl-1 = <&exmif_sleep>;
pinctrl-names = "default", "sleep";
pinctrl-names = "default";
status = "okay";

mx25uw63: mx25uw6345g@0 {
compatible = "jedec,mspi-nor";
status = "okay";
compatible = "jedec,spi-nor";
status = "disabled";
reg = <0>;
spi-max-frequency = <DT_FREQ_M(48)>;
jedec-id = [c2 84 37];
sfdp-bfp = [
e5 20 8a ff ff ff ff 03 00 ff 00 ff 00 ff 00 ff
Expand All @@ -274,15 +274,6 @@ ipc0: &cpuapp_cpurad_ipc {
has-dpd;
t-enter-dpd = <10000>;
t-exit-dpd = <30000>;
reset-gpios = <&gpio6 12 GPIO_ACTIVE_LOW>;

mspi-max-frequency = <DT_FREQ_M(50)>;
mspi-io-mode = "MSPI_IO_MODE_OCTAL";
mspi-data-rate = "MSPI_DATA_RATE_SINGLE";
mspi-hardware-ce-num = <1>;
mspi-cpp-mode = "MSPI_CPP_MODE_0";
mspi-endian = "MSPI_BIG_ENDIAN";
mspi-ce-polarity = "MSPI_CE_ACTIVE_LOW";
};
};

Expand Down
6 changes: 5 additions & 1 deletion dts/bindings/spi/nordic,nrf-exmif.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,8 @@ description: Nordic External Memory Interface (EXMIF)

compatible: "nordic,nrf-exmif"

include: snps,designware-ssi.yaml
include: snps,designware-spi.yaml

properties:
reg:
required: true
5 changes: 3 additions & 2 deletions dts/common/nordic/nrf54h20.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -509,8 +509,8 @@
status = "disabled";
};

exmif: exmif@95000 {
compatible = "nordic,nrf-exmif", "snps,designware-ssi";
exmif: spi@95000 {
compatible = "nordic,nrf-exmif";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x95000 0x500 0x95500 0xb00>;
Expand All @@ -519,6 +519,7 @@
power-domains = <&gpd NRF_GPD_FAST_ACTIVE0>;
clock-frequency = <DT_FREQ_M(400)>;
fifo-depth = <32>;
max-xfer-size = <16>;
status = "disabled";
};

Expand Down
5 changes: 3 additions & 2 deletions dts/common/nordic/nrf9280.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -360,15 +360,16 @@
status = "disabled";
};

exmif: exmif@95000 {
compatible = "nordic,nrf-exmif", "snps,designware-ssi";
exmif: spi@95000 {
compatible = "nordic,nrf-exmif";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x95000 0x500 0x95500 0xb00>;
reg-names = "wrapper", "core";
interrupts = <149 NRF_DEFAULT_IRQ_PRIORITY>;
clock-frequency = <DT_FREQ_M(400)>;
fifo-depth = <32>;
max-xfer-size = <16>;
status = "disabled";
};

Expand Down

0 comments on commit 9dc8c82

Please sign in to comment.