michaelh/zephyr
1
0
Fork 0
Code Releases Activity

dts: nrf: revert i2c sda-gpios, scl-gpios changes

Browse source 
These changes turn out to have been incompatible with the way pinctrl
drivers are going to work, so we need to go back to what we had before
until we can agree on a better approach.

Squash of the following reverts:

Revert "boards: nrf: fix deprecated I2C properties"

This reverts commit 2a4ac9ac02.

Revert "samples: switch nrf overlays to sda-gpios, scl-gpios"

This reverts commit 01bb08e7d8.

Revert "boards: nrf: switch to sda-gpios, scl-gpios"

This reverts commit 17a66304c4.

Revert "i2c: nordic: switch to phandle arrays for pinmux"

This reverts commit 821c03a14a.

Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
This commit is contained in:
Martí Bolívar 2021-04-16 13:33:40 -07:00 • committed by Carles Cufí
commit 15f9ae0e0b
56 changed files with 138 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

4
boards/arm/96b_carbon_nrf51/96b_carbon_nrf51.dts
View file

@ -30,8 +30,8 @@
&i2c0 {
status = "okay";
sda-gpios = <&gpio0 28 0>;
scl-gpios = <&gpio0 2 0>;
sda-pin = <28>;
scl-pin = <2>;
};
&uart0 {

4
boards/arm/96b_nitrogen/96b_nitrogen.dts
View file

@ -75,8 +75,8 @@
&i2c0 {
compatible = "nordic,nrf-twi";
status = "okay";
sda-gpios = <&gpio0 20 0>;
scl-gpios = <&gpio0 22 0>;
sda-pin = <20>;
scl-pin = <22>;
};
&spi1 {

4
boards/arm/actinius_icarus/actinius_icarus_common.dts
View file

@ -123,8 +123,8 @@
status = "okay";
clock-frequency = <I2C_BITRATE_FAST>;
sda-gpios = <&gpio0 26 0>;
scl-gpios = <&gpio0 27 0>;
sda-pin = <26>;
scl-pin = <27>;
lis2dh12-accel@19 {
compatible = "st,lis2dh12", "st,lis2dh";

4
boards/arm/adafruit_feather_nrf52840/adafruit_feather_nrf52840.dts
View file

@ -78,8 +78,8 @@
&i2c0 {
compatible = "nordic,nrf-twi";
status = "okay";
sda-gpios = <&gpio0 12 0>;
scl-gpios = <&gpio0 11 0>;
sda-pin = <12>;
scl-pin = <11>;
};
&spi1 {

8
boards/arm/arduino_nano_33_ble/arduino_nano_33_ble.dts
View file

@ -69,14 +69,14 @@
&i2c0 {
compatible = "nordic,nrf-twim";
status = "okay";
sda-gpios = <&gpio0 31 0>;
scl-gpios = <&gpio0 2 0>;
sda-pin = <31>; //P0.31
scl-pin = <2>; //P0.02
};
&i2c1 {
compatible = "nordic,nrf-twim";
status = "okay";
sda-gpios = <&gpio0 14 0>;
scl-gpios = <&gpio0 15 0>;
sda-pin = <14>; //P0.14
scl-pin = <15>; //P0.15
};
// we use SPI2 because SPI1/0 shares conflicts with I2C1/0
&spi2 {

4
boards/arm/bbc_microbit/bbc_microbit.dts
View file

@ -60,8 +60,8 @@
&i2c0 {
status = "okay";
clock-frequency = <I2C_BITRATE_FAST>;
sda-gpios = <&gpio0 30 0>;
scl-gpios = <&gpio0 0 0>;
sda-pin = <30>;
scl-pin = <0>;
/* See https://tech.microbit.org/hardware/i2c/ for board variants */

4
boards/arm/bbc_microbit_v2/bbc_microbit_v2.dts
View file

@ -91,8 +91,8 @@
compatible = "nordic,nrf-twim";
status = "okay";
clock-frequency = <I2C_BITRATE_FAST>;
sda-gpios = <&gpio0 16 0>;
scl-gpios = <&gpio0 8 0>;
sda-pin = <16>;
scl-pin = <8>;
/* See https://tech.microbit.org/hardware/i2c/ for board variants */

4
boards/arm/bl652_dvk/bl652_dvk.dts
View file

@ -80,8 +80,8 @@
&i2c0 {
compatible = "nordic,nrf-twi";
status = "okay";
sda-gpios = <&gpio0 26 0>;
scl-gpios = <&gpio0 27 0>;
sda-pin = <26>;
scl-pin = <27>;
};
&pwm0 {

4
boards/arm/bl653_dvk/bl653_dvk.dts
View file

@ -104,8 +104,8 @@
&i2c0 {
compatible = "nordic,nrf-twi";
status = "okay";
sda-gpios = <&gpio0 26 0>;
scl-gpios = <&gpio0 27 0>;
sda-pin = <26>;
scl-pin = <27>;
};
&pwm0 {

4
boards/arm/bl654_dvk/bl654_dvk.dts
View file

@ -104,8 +104,8 @@
&i2c0 {
compatible = "nordic,nrf-twi";
status = "okay";
sda-gpios = <&gpio0 26 0>;
scl-gpios = <&gpio0 27 0>;
sda-pin = <26>;
scl-pin = <27>;
};
&pwm0 {

8
boards/arm/bmd_345_eval/bmd_345_eval.dts
View file

@ -154,16 +154,16 @@
arduino_i2c: &i2c0 {
compatible = "nordic,nrf-twi";
status = "okay";
sda-gpios = <&gpio0 26 0>;
scl-gpios = <&gpio0 27 0>;
sda-pin = <26>;
scl-pin = <27>;
};
&i2c1 {
compatible = "nordic,nrf-twi";
/* Cannot be used together with spi1. */
/* status = "okay"; */
sda-gpios = <&gpio0 30 0>;
scl-gpios = <&gpio0 31 0>;
sda-pin = <30>;
scl-pin = <31>;
};
&spi0 {

4
boards/arm/bt510/bt510.dts
View file

@ -110,8 +110,8 @@
&i2c0 {
compatible = "nordic,nrf-twi";
status = "okay";
sda-gpios = <&gpio0 26 0>;
scl-gpios = <&gpio0 27 0>;
sda-pin = <26>;
scl-pin = <27>;
lis2dh12@18 {
compatible = "st,lis2dh12", "st,lis2dh";

4
boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_common.dts
View file

@ -108,8 +108,8 @@
&i2c1 {
compatible = "nordic,nrf-twim";
status = "okay";
sda-gpios = <&gpio0 26 0>;
scl-gpios = <&gpio0 27 0>;
sda-pin = <26>;
scl-pin = <27>;
pcf85063a@51 {
compatible = "nxp,pcf85063a";

4
boards/arm/contextualelectronics_abc/contextualelectronics_abc.dts
View file

@ -69,8 +69,8 @@ arduino_serial: &uart1 {
arduino_i2c: &i2c0 {
compatible = "nordic,nrf-twi";
status = "okay";
sda-gpios = <&gpio0 27 0>;
scl-gpios = <&gpio0 26 0>;
sda-pin = <27>;
scl-pin = <26>;
};
&spi2 {

4
boards/arm/decawave_dwm1001_dev/decawave_dwm1001_dev.dts
View file

@ -98,8 +98,8 @@
compatible = "nordic,nrf-twim";
status = "okay";
clock-frequency = <I2C_BITRATE_FAST>;
sda-gpios = <&gpio0 29 0>;
scl-gpios = <&gpio0 28 0>;
sda-pin = <29>;
scl-pin = <28>;
lis2dh12: lis2dh12@19 {
compatible = "st,lis2dh12", "st,lis2dh";

8
boards/arm/degu_evk/degu_evk.dts
View file

@ -94,15 +94,15 @@
&i2c0 {
compatible = "nordic,nrf-twim";
status = "okay";
sda-gpios = <&gpio0 20 0>;
scl-gpios = <&gpio0 22 0>;
sda-pin = <20>;
scl-pin = <22>;
};
&i2c1 {
compatible = "nordic,nrf-twim";
status = "okay";
sda-gpios = <&gpio1 9 0>;
scl-gpios = <&gpio0 11 0>;
sda-pin = <41>;
scl-pin = <11>;
};
&flash0 {

8
boards/arm/nrf21540dk_nrf52840/nrf21540dk_nrf52840.dts
View file

@ -171,16 +171,16 @@ arduino_serial: &uart1 {
arduino_i2c: &i2c0 {
compatible = "nordic,nrf-twi";
status = "okay";
sda-gpios = <&gpio0 26 0>;
scl-gpios = <&gpio0 27 0>;
sda-pin = <26>;
scl-pin = <27>;
};
&i2c1 {
compatible = "nordic,nrf-twi";
/* Cannot be used together with spi1. */
/* status = "okay"; */
sda-gpios = <&gpio0 30 0>;
scl-gpios = <&gpio0 31 0>;
sda-pin = <30>;
scl-pin = <31>;
};
&pwm0 {

4
boards/arm/nrf51_ble400/nrf51_ble400.dts
View file

@ -81,8 +81,8 @@
&i2c0 {
status = "okay";
sda-gpios = <&gpio0 0 0>;
scl-gpios = <&gpio0 1 0>;
sda-pin = <0>;
scl-pin = <1>;
/* smba-pin = <2>; */
};

4
boards/arm/nrf51_vbluno51/nrf51_vbluno51.dts
View file

@ -66,6 +66,6 @@
&i2c0 {
status = "okay";
clock-frequency = <I2C_BITRATE_FAST>;
sda-gpios = <&gpio0 29 0>;
scl-gpios = <&gpio0 30 0>;
sda-pin = <29>;
scl-pin = <30>;
};

8
boards/arm/nrf51dk_nrf51422/nrf51dk_nrf51422.dts
View file

@ -107,15 +107,15 @@
&i2c0 {
status = "okay";
sda-gpios = <&gpio0 30 0>;
scl-gpios = <&gpio0 7 0>;
sda-pin = <30>;
scl-pin = <7>;
};
&i2c1 {
/* Cannot be used together with spi1. */
/* status = "okay"; */
sda-gpios = <&gpio0 5 0>;
scl-gpios = <&gpio0 6 0>;
sda-pin = <5>;
scl-pin = <6>;
};
&spi0 {

8
boards/arm/nrf52832_mdk/nrf52832_mdk.dts
View file

@ -103,15 +103,15 @@
&i2c0 {
compatible = "nordic,nrf-twi";
status = "okay";
sda-gpios = <&gpio0 26 0>;
scl-gpios = <&gpio0 27 0>;
sda-pin = <26>;
scl-pin = <27>;
};
&i2c1 {
compatible = "nordic,nrf-twi";
status = "okay";
sda-gpios = <&gpio0 30 0>;
scl-gpios = <&gpio0 31 0>;
sda-pin = <30>;
scl-pin = <31>;
};
&pwm0 {

4
boards/arm/nrf52833dk_nrf52820/nrf52833dk_nrf52820.dts
View file

@ -104,8 +104,8 @@
&i2c0 {
compatible = "nordic,nrf-twi";
status = "okay";
sda-gpios = <&gpio0 28 0>;
scl-gpios = <&gpio0 29 0>;
sda-pin = <28>;
scl-pin = <29>;
};
&i2c1 {

8
boards/arm/nrf52833dk_nrf52833/nrf52833dk_nrf52833.dts
View file

@ -149,16 +149,16 @@ arduino_serial: &uart1 {
arduino_i2c: &i2c0 {
compatible = "nordic,nrf-twi";
status = "okay";
sda-gpios = <&gpio0 26 0>;
scl-gpios = <&gpio0 27 0>;
sda-pin = <26>;
scl-pin = <27>;
};
&i2c1 {
compatible = "nordic,nrf-twi";
/* Cannot be used together with spi1. */
/* status = "okay"; */
sda-gpios = <&gpio0 30 0>;
scl-gpios = <&gpio0 31 0>;
sda-pin = <30>;
scl-pin = <31>;
};
&pwm0 {

8
boards/arm/nrf52840_blip/nrf52840_blip.dts
View file

@ -86,16 +86,16 @@
&i2c0 {
compatible = "nordic,nrf-twi";
status = "okay";
sda-gpios = <&gpio0 12 0>;
scl-gpios = <&gpio0 11 0>;
sda-pin = <12>;
scl-pin = <11>;
};
&i2c1 {
compatible = "nordic,nrf-twi";
/* Cannot be used together with spi1. */
/* status = "okay"; */
sda-gpios = <&gpio0 2 0>;
scl-gpios = <&gpio0 3 0>;
sda-pin = <2>;
scl-pin = <3>;
};
&spi0 {

8
boards/arm/nrf52840_mdk/nrf52840_mdk.dts
View file

@ -109,15 +109,15 @@
&i2c0 {
compatible = "nordic,nrf-twi";
status = "okay";
sda-gpios = <&gpio0 26 0>;
scl-gpios = <&gpio0 27 0>;
sda-pin = <26>;
scl-pin = <27>;
};
&i2c1 {
compatible = "nordic,nrf-twi";
status = "okay";
sda-gpios = <&gpio0 30 0>;
scl-gpios = <&gpio0 31 0>;
sda-pin = <30>;
scl-pin = <31>;
};
&pwm0 {

4
boards/arm/nrf52840_papyr/nrf52840_papyr.dts
View file

@ -103,8 +103,8 @@
&i2c0 {
compatible = "nordic,nrf-twi";
status = "okay";
sda-gpios = <&gpio0 5 0>;
scl-gpios = <&gpio0 6 0>;
sda-pin = <5>;
scl-pin = <6>;
};
&spi1 {

4
boards/arm/nrf52840dk_nrf52811/nrf52840dk_nrf52811.dts
View file

@ -110,8 +110,8 @@
compatible = "nordic,nrf-twi";
status = "okay";
/* Arduino compatible PINs */
sda-gpios = <&gpio0 26 0>;
scl-gpios = <&gpio0 27 0>;
sda-pin = <26>;
scl-pin = <27>;
};
&pwm0 {

8
boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840.dts
View file

@ -160,16 +160,16 @@ arduino_serial: &uart1 {
arduino_i2c: &i2c0 {
compatible = "nordic,nrf-twi";
status = "okay";
sda-gpios = <&gpio0 26 0>;
scl-gpios = <&gpio0 27 0>;
sda-pin = <26>;
scl-pin = <27>;
};
&i2c1 {
compatible = "nordic,nrf-twi";
/* Cannot be used together with spi1. */
/* status = "okay"; */
sda-gpios = <&gpio0 30 0>;
scl-gpios = <&gpio0 31 0>;
sda-pin = <30>;
scl-pin = <31>;
};
&pwm0 {

8
boards/arm/nrf52840dongle_nrf52840/nrf52840dongle_nrf52840.dts
View file

@ -113,16 +113,16 @@
&i2c0 {
compatible = "nordic,nrf-twi";
status = "okay";
sda-gpios = <&gpio0 26 0>;
scl-gpios = <&gpio0 27 0>;
sda-pin = <26>;
scl-pin = <27>;
};
&i2c1 {
compatible = "nordic,nrf-twi";
/* Cannot be used together with spi1. */
/* status = "okay"; */
sda-gpios = <&gpio0 30 0>;
scl-gpios = <&gpio0 31 0>;
sda-pin = <30>;
scl-pin = <31>;
};
&pwm0 {

4
boards/arm/nrf52_adafruit_feather/nrf52_adafruit_feather.dts
View file

@ -84,8 +84,8 @@
&i2c0 {
compatible = "nordic,nrf-twi";
sda-gpios = <&gpio0 25 0>;
scl-gpios = <&gpio0 26 0>;
sda-pin = <25>;
scl-pin = <26>;
};
&flash0 {

4
boards/arm/nrf52_blenano2/nrf52_blenano2.dts
View file

@ -56,8 +56,8 @@
&i2c0 {
compatible = "nordic,nrf-twim";
status = "okay";
sda-gpios = <&gpio0 28 0>;
scl-gpios = <&gpio0 2 0>;
sda-pin = <28>;
scl-pin = <2>;
};
&flash0 {

4
boards/arm/nrf52_vbluno52/nrf52_vbluno52.dts
View file

@ -67,6 +67,6 @@
compatible = "nordic,nrf-twim";
status = "okay";
clock-frequency = <I2C_BITRATE_FAST>;
sda-gpios = <&gpio0 26 0>;
scl-gpios = <&gpio0 27 0>;
sda-pin = <26>;
scl-pin = <27>;
};

4
boards/arm/nrf52dk_nrf52805/nrf52dk_nrf52805.dts
View file

@ -91,8 +91,8 @@
&i2c0 {
compatible = "nordic,nrf-twi";
status = "okay";
sda-gpios = <&gpio0 26 0>;
scl-gpios = <&gpio0 27 0>;
sda-pin = <26>;
scl-pin = <27>;
};
&spi0 {

4
boards/arm/nrf52dk_nrf52810/nrf52dk_nrf52810.dts
View file

@ -103,8 +103,8 @@
&i2c0 {
compatible = "nordic,nrf-twi";
status = "okay";
sda-gpios = <&gpio0 26 0>;
scl-gpios = <&gpio0 27 0>;
sda-pin = <26>;
scl-pin = <27>;
};
&spi0 {

8
boards/arm/nrf52dk_nrf52832/nrf52dk_nrf52832.dts
View file

@ -150,16 +150,16 @@ arduino_serial: &uart0 {
arduino_i2c: &i2c0 {
compatible = "nordic,nrf-twi";
status = "okay";
sda-gpios = <&gpio0 26 0>;
scl-gpios = <&gpio0 27 0>;
sda-pin = <26>;
scl-pin = <27>;
};
&i2c1 {
compatible = "nordic,nrf-twi";
/* Cannot be used together with spi1. */
/* status = "okay"; */
sda-gpios = <&gpio0 30 0>;
scl-gpios = <&gpio0 31 0>;
sda-pin = <30>;
scl-pin = <31>;
};
&pwm0 {

4
boards/arm/nrf5340dk_nrf5340/nrf5340_cpuapp_common.dts
View file

@ -135,8 +135,8 @@
&i2c1 {
compatible = "nordic,nrf-twim";
status = "okay";
sda-gpios = <&gpio1 2 0>;
scl-gpios = <&gpio1 3 0>;
sda-pin = <34>;
scl-pin = <35>;
};
&uart0 {

4
boards/arm/nrf5340dk_nrf5340/nrf5340dk_nrf5340_cpunet.dts
View file

@ -132,8 +132,8 @@ arduino_i2c: &i2c0 {
compatible = "nordic,nrf-twim";
/* Cannot be used together with uart0. */
/* status = "okay"; */
sda-gpios = <&gpio1 2 0>;
scl-gpios = <&gpio1 3 0>;
sda-pin = <34>;
scl-pin = <35>;
};
arduino_spi: &spi0 {

4
boards/arm/nrf9160_innblue21/nrf9160_innblue21_common.dts
View file

@ -87,8 +87,8 @@
&i2c2 {
compatible = "nordic,nrf-twim";
status = "okay";
sda-gpios = <&gpio0 25 0>;
scl-gpios = <&gpio0 26 0>;
sda-pin = <25>;
scl-pin = <26>;
clock-frequency = <I2C_BITRATE_FAST>;

4
boards/arm/nrf9160_innblue22/nrf9160_innblue22_common.dts
View file

@ -89,8 +89,8 @@
&i2c2 {
compatible = "nordic,nrf-twim";
status = "okay";
sda-gpios = <&gpio0 25 0>;
scl-gpios = <&gpio0 26 0>;
sda-pin = <25>;
scl-pin = <26>;
clock-frequency = <I2C_BITRATE_FAST>;

4
boards/arm/nrf9160dk_nrf9160/nrf9160dk_nrf9160_common.dts
View file

@ -140,8 +140,8 @@
&i2c2 {
compatible = "nordic,nrf-twim";
status = "okay";
sda-gpios = <&gpio0 30 0>;
scl-gpios = <&gpio0 31 0>;
sda-pin = <30>;
scl-pin = <31>;
};
&pwm0 {

4
boards/arm/particle_argon/dts/mesh_feather.dtsi
View file

@ -179,8 +179,8 @@ arduino_i2c: &i2c0 { /* feather I2C */
compatible = "nordic,nrf-twi";
status = "okay";
clock-frequency = <I2C_BITRATE_FAST>;
sda-gpios = <&gpio0 26 0>;
scl-gpios = <&gpio0 27 0>;
sda-pin = <26>;
scl-pin = <27>;
};
feather_i2c: &i2c0 { };

4
boards/arm/particle_argon/dts/mesh_feather_i2c1_twi1.dtsi
View file

@ -10,7 +10,7 @@
* Changes should be made in all instances. */
&i2c1 { /* feather I2C1 */
status = "okay";
sda-gpios = <&gpio1 1 0>;
scl-gpios = <&gpio1 2 0>;
sda-pin = <33>;
scl-pin = <34>;
};

4
boards/arm/particle_boron/dts/mesh_feather.dtsi
View file

@ -179,8 +179,8 @@ arduino_i2c: &i2c0 { /* feather I2C */
compatible = "nordic,nrf-twi";
status = "okay";
clock-frequency = <I2C_BITRATE_FAST>;
sda-gpios = <&gpio0 26 0>;
scl-gpios = <&gpio0 27 0>;
sda-pin = <26>;
scl-pin = <27>;
};
feather_i2c: &i2c0 { };

4
boards/arm/particle_boron/particle_boron.dts
View file

@ -27,8 +27,8 @@
compatible = "nordic,nrf-twi";
status = "okay";
clock-frequency = <I2C_BITRATE_FAST>;
sda-gpios = <&gpio0 24 0>;
scl-gpios = <&gpio1 9 0>;
sda-pin = <24>;
scl-pin = <41>;
};
&uart1 { /* u-blox SARA-U2 or SARA-R4 */

4
boards/arm/particle_xenon/dts/mesh_feather.dtsi
View file

@ -179,8 +179,8 @@ arduino_i2c: &i2c0 { /* feather I2C */
compatible = "nordic,nrf-twi";
status = "okay";
clock-frequency = <I2C_BITRATE_FAST>;
sda-gpios = <&gpio0 26 0>;
scl-gpios = <&gpio0 27 0>;
sda-pin = <26>;
scl-pin = <27>;
};
feather_i2c: &i2c0 { };

4
boards/arm/particle_xenon/dts/mesh_feather_i2c1_twi1.dtsi
View file

@ -10,7 +10,7 @@
* Changes should be made in all instances. */
&i2c1 { /* feather I2C1 */
status = "okay";
sda-gpios = <&gpio1 1 0>;
scl-gpios = <&gpio1 2 0>;
sda-pin = <33>;
scl-pin = <34>;
};

4
boards/arm/pinetime_devkit0/pinetime_devkit0.dts
View file

@ -86,8 +86,8 @@
&i2c0 {
compatible = "nordic,nrf-twim";
status = "okay";
sda-gpios = <&gpio0 6 0>;
scl-gpios = <&gpio0 7 0>;
sda-pin = <6>;
scl-pin = <7>;
clock-frequency = <I2C_BITRATE_FAST>; /* 400KHz */
/* BOSCH BMA421 Triaxial Acceleration Sensor (1000KHz) */

4
boards/arm/pinnacle_100_dvk/pinnacle_100_dvk.dts
View file

@ -127,8 +127,8 @@
&i2c0 {
compatible = "nordic,nrf-twi";
status = "okay";
sda-gpios = <&gpio0 26 0>;
scl-gpios = <&gpio0 27 0>;
sda-pin = <26>;
scl-pin = <27>;
bme680@76 {
compatible = "bosch,bme680";

4
boards/arm/rak5010_nrf52840/rak5010_nrf52840.dts
View file

@ -84,8 +84,8 @@
&i2c1 {
compatible = "nordic,nrf-twi";
status = "okay";
sda-gpios = <&gpio0 14 0>;
scl-gpios = <&gpio0 13 0>;
sda-pin = <14>;
scl-pin = <13>;
/* TI OPT3001 light sensor */
opt3001@44 {

4
boards/arm/reel_board/dts/reel_board.dtsi
View file

@ -117,8 +117,8 @@ arduino_i2c: &i2c0 {
compatible = "nordic,nrf-twim";
status = "okay";
clock-frequency = <I2C_BITRATE_FAST>;
sda-gpios = <&gpio0 26 0>;
scl-gpios = <&gpio0 27 0>;
sda-pin = <26>;
scl-pin = <27>;
mma8652fc@1d {
compatible = "nxp,fxos8700","nxp,mma8652fc";

8
boards/arm/thingy52_nrf52832/thingy52_nrf52832.dts
View file

@ -127,8 +127,8 @@
compatible = "nordic,nrf-twim";
status = "okay";
clock-frequency = <I2C_BITRATE_FAST>;
sda-gpios = <&gpio0 7 0>;
scl-gpios = <&gpio0 8 0>;
sda-pin = <7>;
scl-pin = <8>;
sx1509b: sx1509b@3e {
compatible = "semtech,sx1509b";
@ -173,8 +173,8 @@
compatible = "nordic,nrf-twim";
status = "okay";
clock-frequency = <I2C_BITRATE_FAST>;
sda-gpios = <&gpio0 14 0>;
scl-gpios = <&gpio0 15 0>;
sda-pin = <14>;
scl-pin = <15>;
lis2dh12: lis2dh12@19 {
compatible = "st,lis2dh12", "st,lis2dh";

4
boards/arm/ubx_bmd380eval_nrf52840/ubx_bmd380eval_nrf52840.dts
View file

@ -119,8 +119,8 @@
compatible = "nordic,nrf-twi";
/* Cannot be used together with spi1. */
/* status = "okay"; */
sda-gpios = <&gpio0 30 0>;
scl-gpios = <&gpio0 31 0>;
sda-pin = <30>;
scl-pin = <31>;
};
&pwm0 {

13
drivers/i2c/i2c_nrfx_twi.c
View file

@ -8,7 +8,6 @@
#include <drivers/i2c.h>
#include <dt-bindings/i2c/i2c.h>
#include <nrfx_twi.h>
#include <soc.h>
#include <logging/log.h>
LOG_MODULE_REGISTER(i2c_nrfx_twi, CONFIG_I2C_LOG_LEVEL);
@ -277,14 +276,6 @@ static int twi_nrfx_pm_control(const struct device *dev,
BUILD_ASSERT(I2C_FREQUENCY(idx) != \
I2C_NRFX_TWI_INVALID_FREQUENCY, \
"Wrong I2C " #idx " frequency setting in dts"); \
NRF_DT_PSEL_CHECK_EXACTLY_ONE(I2C(idx), \
sda_pin, "sda-pin", \
sda_gpios, "sda-gpios"); \
NRF_DT_PSEL_CHECK_EXACTLY_ONE(I2C(idx), \
scl_pin, "scl-pin", \
scl_gpios, "scl-gpios"); \
NRF_DT_CHECK_GPIO_CTLR_IS_SOC(I2C(idx), sda_gpios, "sda-gpios"); \
NRF_DT_CHECK_GPIO_CTLR_IS_SOC(I2C(idx), scl_gpios, "scl-gpios"); \
static int twi_##idx##_init(const struct device *dev) \
{ \
IRQ_CONNECT(DT_IRQN(I2C(idx)), DT_IRQ(I2C(idx), priority), \
@ -300,8 +291,8 @@ static int twi_nrfx_pm_control(const struct device *dev,
static const struct i2c_nrfx_twi_config twi_##idx##z_config = { \
.twi = NRFX_TWI_INSTANCE(idx), \
.config = { \
.scl = NRF_DT_PSEL(I2C(idx), scl_pin, scl_gpios, 0), \
.sda = NRF_DT_PSEL(I2C(idx), sda_pin, sda_gpios, 0), \
.scl = DT_PROP(I2C(idx), scl_pin), \
.sda = DT_PROP(I2C(idx), sda_pin), \
.frequency = I2C_FREQUENCY(idx), \
} \
}; \

13
drivers/i2c/i2c_nrfx_twim.c
View file

@ -9,7 +9,6 @@
#include <dt-bindings/i2c/i2c.h>
#include <nrfx_twim.h>
#include <sys/util.h>
#include <soc.h>
#include <logging/log.h>
LOG_MODULE_REGISTER(i2c_nrfx_twim, CONFIG_I2C_LOG_LEVEL);
@ -325,14 +324,6 @@ static int twim_nrfx_pm_control(const struct device *dev,
BUILD_ASSERT(I2C_FREQUENCY(idx) != \
I2C_NRFX_TWIM_INVALID_FREQUENCY, \
"Wrong I2C " #idx " frequency setting in dts"); \
NRF_DT_PSEL_CHECK_EXACTLY_ONE(I2C(idx), \
sda_pin, "sda-pin", \
sda_gpios, "sda-gpios"); \
NRF_DT_PSEL_CHECK_EXACTLY_ONE(I2C(idx), \
scl_pin, "scl-pin", \
scl_gpios, "scl-gpios"); \
NRF_DT_CHECK_GPIO_CTLR_IS_SOC(I2C(idx), sda_gpios, "sda-gpios"); \
NRF_DT_CHECK_GPIO_CTLR_IS_SOC(I2C(idx), scl_gpios, "scl-gpios"); \
static int twim_##idx##_init(const struct device *dev) \
{ \
IRQ_CONNECT(DT_IRQN(I2C(idx)), DT_IRQ(I2C(idx), priority), \
@ -353,8 +344,8 @@ static int twim_nrfx_pm_control(const struct device *dev,
static const struct i2c_nrfx_twim_config twim_##idx##z_config = { \
.twim = NRFX_TWIM_INSTANCE(idx), \
.config = { \
.scl = NRF_DT_PSEL(I2C(idx), scl_pin, scl_gpios, 0), \
.sda = NRF_DT_PSEL(I2C(idx), sda_pin, sda_gpios, 0), \
.scl = DT_PROP(I2C(idx), scl_pin), \
.sda = DT_PROP(I2C(idx), sda_pin), \
.frequency = I2C_FREQUENCY(idx), \
} \
}; \

33
dts/bindings/i2c/nordic,nrf-twi-common.yaml
View file

@ -13,36 +13,10 @@ properties:
interrupts:
required: true
sda-gpios:
type: phandle-array
required: false
description: |
The SDA pin to use. The value is "<&gpioX Y flags>".
Pin PX.Y will be used for SDA. The "flags" portion currently
has no effect, but must be set to zero.
For example, to use P0.16 for SDA, set:
sda-gpios = <&gpio0 16 0>;
To use P1.2 for SDA, set:
sda-gpios = <&gpio1 2 0>;
scl-gpios:
type: phandle-array
required: false
description: |
The SCL pin to use. The value should be set in the same
way as the sda-gpios property.
sda-pin:
type: int
required: false
deprecated: true
required: true
description: |
Deprecated; use sda-gpios instead.
The SDA pin to use.
For pins P0.0 through P0.31, use the pin number. For example,
@ -57,10 +31,7 @@ properties:
scl-pin:
type: int
required: false
deprecated: true
required: true
description: |
Deprecated; use scl-gpios instead.
The SCL pin to use. The pin numbering scheme is the same as
the sda-pin property's.

4
samples/sensor/ccs811/boards/nrf51_ble400.overlay
View file

@ -6,8 +6,8 @@
&i2c0 {
status = "okay";
sda-gpios = <&gpio0 0 0>;
scl-gpios = <&gpio0 1 0>;
sda-pin = <0>;
scl-pin = <1>;
/* Sparkfun Environment Combo uses second I2C address */
ccs811: ccs811@5b {