dts: nrf: dts.fixup cleanup for nRF series #10377

Mierunski · 2018-10-04T13:13:22Z

All dts defines for nRF series are now extracted through aliases instead of dts.fixup files.
I left NAME defines for compatibility with examples and other drivers.
I moved WNCM14A2A dts.fixups to board level, but they should also be replaced with aliases and overlay files at example level.

Fixes #10658

codecov-io · 2018-10-04T13:46:29Z

Codecov Report

Merging #10377 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master   #10377   +/-   ##
=======================================
  Coverage   48.41%   48.41%           
=======================================
  Files         270      270           
  Lines       42121    42121           
  Branches    10139    10139           
=======================================
  Hits        20394    20394           
  Misses      17645    17645           
  Partials     4082     4082

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 57a6858...c5bb5f7. Read the comment docs.

galak

So the use of non-CONFIG_ defines is something we've been trying to avoid. I guess if we want to go in this direction, we should start create DT_ prefix defines

anangl · 2018-10-05T05:24:54Z

@galak I think we should go in this direction. CONFIG_ prefixes in macros generated from DT entries are confusing since they suggest the values are configured via Kconfig.
DT_ prefix seems reasonable to me.

Mierunski · 2018-10-05T07:13:12Z

Should I use for example DT_NRF_I2C or DT_I2C ?

anangl · 2018-10-05T08:41:02Z

@Mierunski DT_ is sufficient IMO. We'll have then:

IRQ_CONNECT(DT_I2C_0_IRQ, DT_I2C_0_IRQ_PRIORITY, ...

gpio0 = get_device_binding(DT_GPIO_0_LABEL);

Should work.

galak · 2018-10-05T12:08:37Z

@Mierunski DT_ is sufficient IMO. We'll have then:
IRQ_CONNECT(DT_I2C_0_IRQ, DT_I2C_0_IRQ_PRIORITY, ...

gpio0 = get_device_binding(DT_GPIO_0_LABEL);
Should work.

As I think about this more, I worry about this since we are using a convention based on aliases, I guess I'd rather us focus our efforts on using code generation to remove dts.fixup and not introduce a new convention related to aliases (I know we do this some already for GPIOs w/LEDs & BUTTONs).

Mierunski · 2018-10-05T13:09:50Z

Using code generation will be next step

Mierunski · 2018-10-08T07:14:28Z

@galak @anangl I changed prefix to DT_

anangl · 2018-10-09T09:20:07Z

@Mierunski boards/arm/nrf52840_pca10056/dts.fixup should be also renamed to dts_fixup.h

Mierunski · 2018-10-09T10:30:19Z

@anangl Fixed

carlescufi · 2018-10-09T10:47:17Z

@galak can you revisit please?

galak · 2018-10-09T16:50:36Z

@galak @anangl I changed prefix to DT_

As I mentioned before, I'd rather us stick with the dts fixup file for now and not introduce this style of DT_ usage. Lets focus on the code generation solution.

galak

Some minor cleanups and comments

galak · 2018-11-16T16:52:29Z

boards/arm/nrf52840_pca10056/dts_fixup.h

Why is this here? We moved wcm14a2a out of the board.dts:

commit edefd7d
Author: Kumar Gala [email protected]
Date: Thu Nov 15 09:58:49 2018 -0600

boards: nrf52840_pca10056: move modem configurtion to overlay

galak · 2018-11-16T16:53:43Z

drivers/i2c/i2c_nrfx_twi.c

We'll need to rebase this once the I2C PRI fix (#11427) goes in.

galak · 2018-11-16T16:54:38Z

drivers/i2c/i2c_nrfx_twi.c

technically I wouldn't change the name right now since sensor drivers still use CONFIG_I2C_x_NAME. But I'm ok if you want to.

galak · 2018-11-16T16:57:01Z

soc/arm/nordic_nrf/nrf52/dts_fixup.h

Ah, this should move to samples/net/lwm2m_client/dts_fixup.h

drivers/sensor/qdec_nrfx/qdec_nrfx.c

drivers/serial/uart_nrfx_uarte.c

soc/arm/nordic_nrf/nrf51/dts_fixup.h

soc/arm/nordic_nrf/nrf52/dts_fixup.h

drivers/i2c/i2c_nrfx_twim.c

Changed driver to use alias defines instead of fixup. Signed-off-by: Mieszko Mierunski <[email protected]>

Changed driver to use defines from aliases instead of fixup. Signed-off-by: Mieszko Mierunski <[email protected]>

anangl · 2018-11-19T11:43:18Z

You can also add "Fixes #10658" in the PR description.

drivers/serial/uart_nrfx_uarte.c

Changed driver to use defines from aliases instead of fixup. Signed-off-by: Mieszko Mierunski <[email protected]>

Mierunski · 2018-11-20T15:38:12Z

@galak @anangl All changes should be fixed now

ioannisg · 2018-11-20T16:37:32Z

soc/arm/nordic_nrf/nrf52/dts_fixup.h

+#define DT_SPI_3_NAME			DT_NORDIC_NRF_SPI_SPI_3_LABEL

-#if defined(DT_NORDIC_NRF_CC310_5002A000_BASE_ADDRESS)
-#define DT_CC310_CTL_BASE_ADDR	DT_NORDIC_NRF_CC310_5002A000_BASE_ADDRESS


Seems there are no "_NAME" defines for crypto. Is this intentional?

carlescufi

This looks fine now.

issues addressed

Mierunski requested review from anangl, carlescufi, galak, jakub-uC, mike-scott and pawelzadrozniak October 4, 2018 13:13

Mierunski requested review from finikorg, ioannisg, jfischer-no and tbursztyka as code owners October 4, 2018 13:13

Mierunski force-pushed the dts_fixup_cleanup_nrf branch from b972865 to 6596261 Compare October 4, 2018 14:27

galak requested changes Oct 4, 2018

View reviewed changes

Mierunski force-pushed the dts_fixup_cleanup_nrf branch from 6596261 to 2537b99 Compare October 5, 2018 12:14

anangl approved these changes Oct 8, 2018

View reviewed changes

Mierunski force-pushed the dts_fixup_cleanup_nrf branch from 2537b99 to dcc09a2 Compare October 9, 2018 06:52

Mierunski force-pushed the dts_fixup_cleanup_nrf branch from dcc09a2 to e2ea496 Compare October 9, 2018 09:34

carlescufi approved these changes Oct 9, 2018

View reviewed changes

galak added area: Devicetree platform: nRF Nordic nRFx labels Oct 9, 2018

Mierunski requested a review from MaureenHelm as a code owner November 16, 2018 12:48

Mierunski force-pushed the dts_fixup_cleanup_nrf branch from 5f0e8ea to d84a8ef Compare November 16, 2018 15:41

galak previously requested changes Nov 16, 2018

View reviewed changes

anangl requested changes Nov 19, 2018

View reviewed changes

Mierunski force-pushed the dts_fixup_cleanup_nrf branch from d84a8ef to 432c29f Compare November 19, 2018 10:21

Mierunski added 2 commits November 19, 2018 11:35

dts: nrf: Remove TWI dts.fixup defines and use aliases instead.

25277c9

Changed driver to use alias defines instead of fixup. Signed-off-by: Mieszko Mierunski <[email protected]>

dts: nrf: Remove SPI dts.fixup defines and use aliases instead.

11f4edb

Changed driver to use defines from aliases instead of fixup. Signed-off-by: Mieszko Mierunski <[email protected]>

Mierunski force-pushed the dts_fixup_cleanup_nrf branch from 432c29f to 42af0bb Compare November 19, 2018 10:40

anangl reviewed Nov 19, 2018

View reviewed changes

drivers/serial/uart_nrfx_uarte.c Outdated Show resolved Hide resolved

Mierunski force-pushed the dts_fixup_cleanup_nrf branch from 42af0bb to 94e2ee9 Compare November 19, 2018 12:11

Mierunski added 6 commits November 19, 2018 15:34

dts: nrf: Remove UART dts.fixup defines and use aliases instead.

978062c

Changed driver to use defines from aliases instead of fixup. Signed-off-by: Mieszko Mierunski <[email protected]>

dts: nrf: Remove ADC dts.fixup defines and use aliases instead.

00e2789

Changed driver to use defines from aliases instead of fixup. Signed-off-by: Mieszko Mierunski <[email protected]>

dts: nrf: Remove GPIOTE dts.fixup defines and use aliases instead.

85acf9c

Changed driver to use defines from aliases instead of fixup. Signed-off-by: Mieszko Mierunski <[email protected]>

dts: nrf: Remove WDT dts.fixup defines and use aliases instead.

c75035d

Changed driver to use defines from aliases instead of fixup. Signed-off-by: Mieszko Mierunski <[email protected]>

dts: nrf: Remove USBD dts.fixup defines and use aliases instead.

b9a7a38

Changed driver to use defines from aliases instead of fixup. Signed-off-by: Mieszko Mierunski <[email protected]>

dts: nrf: Remove cryptocell dts.fixup defines and use aliases insted.

ce71d0c

Changed driver to use defines from aliases instead of fixup. Signed-off-by: Mieszko Mierunski <[email protected]>

Mierunski force-pushed the dts_fixup_cleanup_nrf branch from 94e2ee9 to 6a77704 Compare November 19, 2018 14:35

dts: nrf: Remove qdec dts.fixup defines and use aliases instead.

c5bb5f7

Changed driver to use defines from aliases instead of fixup. Signed-off-by: Mieszko Mierunski <[email protected]>

Mierunski force-pushed the dts_fixup_cleanup_nrf branch from 6a77704 to c5bb5f7 Compare November 20, 2018 11:27

ioannisg reviewed Nov 20, 2018

View reviewed changes

anangl approved these changes Nov 20, 2018

View reviewed changes

carlescufi approved these changes Nov 20, 2018

View reviewed changes

galak approved these changes Nov 20, 2018

View reviewed changes

carlescufi merged commit c9906dd into zephyrproject-rtos:master Nov 20, 2018

Mierunski deleted the dts_fixup_cleanup_nrf branch November 21, 2018 08:26

pabigot mentioned this pull request Nov 30, 2018

watchdog sample application not being built on Nordic devices #11779

Closed

Mierunski mentioned this pull request Dec 11, 2018

[RFC]: moving to eliminate dts_fixup files #11737

Closed

dts: nrf: dts.fixup cleanup for nRF series #10377

dts: nrf: dts.fixup cleanup for nRF series #10377

Uh oh!

Conversation

Mierunski commented Oct 4, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov-io commented Oct 4, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

galak left a comment

Choose a reason for hiding this comment

Uh oh!

anangl commented Oct 5, 2018

Uh oh!

Mierunski commented Oct 5, 2018

Uh oh!

anangl commented Oct 5, 2018

Uh oh!

galak commented Oct 5, 2018

Uh oh!

Mierunski commented Oct 5, 2018

Uh oh!

Mierunski commented Oct 8, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

anangl commented Oct 9, 2018

Uh oh!

Mierunski commented Oct 9, 2018

Uh oh!

carlescufi commented Oct 9, 2018

Uh oh!

galak commented Oct 9, 2018

Uh oh!

galak left a comment

Choose a reason for hiding this comment

Uh oh!

galak Nov 16, 2018

Choose a reason for hiding this comment

Uh oh!

galak Nov 16, 2018

Choose a reason for hiding this comment

Uh oh!

galak Nov 16, 2018

Choose a reason for hiding this comment

Uh oh!

galak Nov 16, 2018

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

anangl commented Nov 19, 2018

Uh oh!

Uh oh!

Mierunski commented Nov 20, 2018

Uh oh!

ioannisg Nov 20, 2018

Choose a reason for hiding this comment

Uh oh!

carlescufi left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Mierunski commented Oct 4, 2018 •

edited

Loading

codecov-io commented Oct 4, 2018 •

edited

Loading

Mierunski commented Oct 8, 2018 •

edited

Loading