michaelh/zephyr
1
0
Fork 0
Code Releases Activity

dts: nordic,nrf-twim: rename non-hardware property

Browse source 
As a general rule devicetree properties should correspond to hardware
description or configuration.  In cases where a Zephyr driver receives
instance-specific configuration data from a devicetree property that
property should be marked as being Zephyr-specific.  Rename
concat-buf-size to zephyr,concat-buf-size to follow this guideline.

Signed-off-by: Peter Bigot <peter.bigot@nordicsemi.no>
This commit is contained in:
Peter Bigot 2020-08-19 14:35:06 -05:00 • committed by Maureen Helm
commit c789ea87ef
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/i2c/i2c_nrfx_twim.c
View file

@ -310,10 +310,10 @@ static int twim_nrfx_pm_control(struct device *dev, uint32_t ctrl_command,
#define I2C_FREQUENCY(idx) \ #define I2C_FREQUENCY(idx) \
I2C_NRFX_TWIM_FREQUENCY(DT_PROP(I2C(idx), clock_frequency)) I2C_NRFX_TWIM_FREQUENCY(DT_PROP(I2C(idx), clock_frequency))
#define CONCAT_BUF_SIZE(idx) DT_PROP(I2C(idx), concat_buf_size) #define CONCAT_BUF_SIZE(idx) DT_PROP(I2C(idx), zephyr_concat_buf_size)
#define I2C_CONCAT_BUF(idx) \ #define I2C_CONCAT_BUF(idx) \
COND_CODE_1(DT_NODE_HAS_PROP(I2C(idx), concat_buf_size), \ COND_CODE_1(DT_NODE_HAS_PROP(I2C(idx), zephyr_concat_buf_size), \
(.concat_buf = twim_##idx##_concat_buf, \ (.concat_buf = twim_##idx##_concat_buf, \
.concat_buf_size = CONCAT_BUF_SIZE(idx),), ()) .concat_buf_size = CONCAT_BUF_SIZE(idx),), ())
@ -327,7 +327,7 @@ static int twim_nrfx_pm_control(struct device *dev, uint32_t ctrl_command,
nrfx_isr, nrfx_twim_##idx##_irq_handler, 0); \ nrfx_isr, nrfx_twim_##idx##_irq_handler, 0); \
return init_twim(dev); \ return init_twim(dev); \
} \ } \
COND_CODE_1(DT_NODE_HAS_PROP(I2C(idx), concat_buf_size), \ COND_CODE_1(DT_NODE_HAS_PROP(I2C(idx), zephyr_concat_buf_size), \
(static uint8_t twim_##idx##_concat_buf[CONCAT_BUF_SIZE(idx)];), \ (static uint8_t twim_##idx##_concat_buf[CONCAT_BUF_SIZE(idx)];), \
()) \ ()) \
\ \

2
dts/bindings/i2c/nordic,nrf-twim.yaml
View file

@ -8,7 +8,7 @@ compatible: "nordic,nrf-twim"
include: nordic,nrf-twi-common.yaml include: nordic,nrf-twi-common.yaml
properties: properties:
concat-buf-size: zephyr,concat-buf-size:
type: int type: int
required: false required: false
description: description: