Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

modules: hal: nordic: Add missing mappings of peripheral base addresses #18937

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions dts/arm/nordic/nrf9160.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,20 @@
uart-2 = &uart2;
uart-3 = &uart3;
adc-0 = &adc;
egu-0 = &egu0;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really need to add these aliases? Can we not use DT_INST defines?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, we can't use DT_INST_* macros, see my comment above.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Than, lets not add new aliases.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, misread your comment.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If #18986 gets approved for work and resolved then we can remove them.

egu-1 = &egu1;
egu-2 = &egu2;
egu-3 = &egu3;
egu-4 = &egu4;
egu-5 = &egu5;
gpio-0 = &gpio0;
gpiote-0 = &gpiote;
i2c-0 = &i2c0;
i2c-1 = &i2c1;
i2c-2 = &i2c2;
i2c-3 = &i2c3;
i2s-0 = &i2s0;
pdm-0 = &pdm0;
spi-0 = &spi0;
spi-1 = &spi1;
spi-2 = &spi2;
Expand Down
79 changes: 79 additions & 0 deletions dts/arm/nordic/nrf9160_common.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,85 @@ dppic: dppic@17000 {
label = "DPPIC";
};

egu0: egu@1b000 {
compatible = "nordic,nrf-egu";
reg = <0x1b000 0x1000>;
interrupts = <27 1>;
status = "okay";
};

egu1: egu@1c000 {
compatible = "nordic,nrf-egu";
reg = <0x1c000 0x1000>;
interrupts = <28 1>;
status = "okay";
};

egu2: egu@1d000 {
compatible = "nordic,nrf-egu";
reg = <0x1d000 0x1000>;
interrupts = <29 1>;
status = "okay";
};

egu3: egu@1e000 {
compatible = "nordic,nrf-egu";
reg = <0x1e000 0x1000>;
interrupts = <30 1>;
status = "okay";
};

egu4: egu@1f000 {
compatible = "nordic,nrf-egu";
reg = <0x1f000 0x1000>;
interrupts = <31 1>;
status = "okay";
};

egu5: egu@20000 {
compatible = "nordic,nrf-egu";
reg = <0x20000 0x1000>;
interrupts = <32 1>;
status = "okay";
};

i2s0: i2s@28000 {
compatible = "nordic,nrf-i2s";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x28000 0x1000>;
interrupts = <40 1>;
status = "disabled";
label = "I2S_0";
};

kmu: kmu@39000 {
compatible = "nordic,nrf-kmu";
reg = <0x39000 0x1000>;
interrupts = <57 1>;
status = "okay";
};

pdm0: pdm@26000 {
compatible = "nordic,nrf-pdm";
reg = <0x26000 0x1000>;
interrupts = <38 1>;
status = "disabled";
label = "PDM_0";
};

regulators: regulator@4000 {
compatible = "nordic,nrf-regulators";
reg = <0x4000 0x1000>;
status = "okay";
};

vmc: vmc@3a000 {
compatible = "nordic,nrf-vmc";
reg = <0x3a000 0x1000>;
status = "okay";
};

uart0: uart@8000 {
compatible = "nordic,nrf-uarte";
reg = <0x8000 0x1000>;
Expand Down
8 changes: 8 additions & 0 deletions dts/arm/nordic/nrf9160ns.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,20 @@
uart-2 = &uart2;
uart-3 = &uart3;
adc-0 = &adc;
egu-0 = &egu0;
egu-1 = &egu1;
egu-2 = &egu2;
egu-3 = &egu3;
egu-4 = &egu4;
egu-5 = &egu5;
gpio-0 = &gpio0;
gpiote-0 = &gpiote; /* FIXME alias should be gpiote-1 */
i2c-0 = &i2c0;
i2c-1 = &i2c1;
i2c-2 = &i2c2;
i2c-3 = &i2c3;
i2s-0 = &i2s0;
pdm-0 = &pdm0;
spi-0 = &spi0;
spi-1 = &spi1;
spi-2 = &spi2;
Expand Down
18 changes: 18 additions & 0 deletions dts/bindings/arm/nordic,nrf-egu.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Copyright (c) 2019 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0

title: Nordic EGU

description: >
Binding for the Nordic EGU (Event Generator Unit)

compatible: "nordic,nrf-egu"

include: base.yaml

properties:
reg:
required: true

interrupts:
required: true
18 changes: 18 additions & 0 deletions dts/bindings/arm/nordic,nrf-kmu.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Copyright (c) 2019 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0

title: Nordic KMU

description: >
Binding for the Nordic KMU (Key Management Unit)

compatible: "nordic,nrf-kmu"

include: base.yaml

properties:
reg:
required: true

interrupts:
required: true
28 changes: 28 additions & 0 deletions dts/bindings/audio/nordic,nrf-pdm.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Copyright (c) 2019 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0

title: Nordic PDM

description: >
Binding for the Nordic PDM (pulse density modulation interface)

compatible: "nordic,nrf-pdm"

include: base.yaml

properties:
reg:
required: true

interrupts:
required: true

clk-pin:
type: int
required: true
description: CLK pin

din-pin:
type: int
required: true
description: DIN pin
38 changes: 38 additions & 0 deletions dts/bindings/i2c/nordic,nrf-twis.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Copyright (c) 2019 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0

title: Nordic TWIS

description: >
Binding for the Nordic TWIS (TWI slave with EasyDMA)

compatible: "nordic,nrf-twis"

include: base.yaml

properties:
reg:
required: true

interrupts:
required: true

sda-pin:
type: int
required: true
description: SDA pin

scl-pin:
type: int
required: true
description: SCL pin

address-0:
type: int
required: false
description: TWI slave address 0

address-1:
type: int
required: false
description: TWI slave address 1
43 changes: 43 additions & 0 deletions dts/bindings/i2s/nordic,nrf-i2s.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# Copyright (c) 2019 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0

title: Nordic I2S

description: >
Binding for the Nordic I2S (Inter-IC sound interface)

compatible: "nordic,nrf-i2s"

include: i2s-controller.yaml

properties:
reg:
required: true

interrupts:
required: true

sck-pin:
type: int
required: true
description: SCK pin

lrck-pin:
type: int
required: true
description: LRCK pin

sdout-pin:
type: int
required: false
description: SDOUT pin

sdin-pin:
type: int
required: false
description: SDIN pin

mck-pin:
type: int
required: false
description: MCK pin
15 changes: 15 additions & 0 deletions dts/bindings/power/nordic,nrf-regulators.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Copyright (c) 2019 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0

title: Nordic REGULATORS

description: >
Binding for the Nordic REGULATORS (voltage regulators control module)

compatible: "nordic,nrf-regulators"

include: base.yaml

properties:
reg:
required: true
15 changes: 15 additions & 0 deletions dts/bindings/power/nordic,nrf-vmc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Copyright (c) 2019 Nordic Semiconductor ASA
# SPDX-License-Identifier: Apache-2.0

title: Nordic VMC

description: >
Binding for the Nordic VMC (Volatile Memory Controller)

compatible: "nordic,nrf-vmc"

include: base.yaml

properties:
reg:
required: true