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

Move the BOARD.dts files for Nordic-based boards to use the new I2C devicetree properties for specifying the SDA and SCL pins. This was done with a script. Signed-off-by: Martí Bolívar <[email protected]>
mbolivar-nordic · Mar 1, 2021 · 17a6630 · 17a6630
1 parent 821c03a
commit 17a6630
Show file tree

Hide file tree

Showing 50 changed files with 124 additions and 124 deletions.
diff --git a/boards/arm/96b_carbon_nrf51/96b_carbon_nrf51.dts b/boards/arm/96b_carbon_nrf51/96b_carbon_nrf51.dts
@@ -30,8 +30,8 @@
 
 &i2c0 {
  status = "okay";
- sda-pin = <28>;
- scl-pin = <2>;
+ sda-gpios = <&gpio0 28 0>;
+ scl-gpios = <&gpio0 2 0>;
 };
 
 &uart0 {

diff --git a/boards/arm/96b_nitrogen/96b_nitrogen.dts b/boards/arm/96b_nitrogen/96b_nitrogen.dts
@@ -75,8 +75,8 @@
 &i2c0 {
  compatible = "nordic,nrf-twi";
  status = "okay";
- sda-pin = <20>;
- scl-pin = <22>;
+ sda-gpios = <&gpio0 20 0>;
+ scl-gpios = <&gpio0 22 0>;
 };
 
 &spi1 {

diff --git a/boards/arm/actinius_icarus/actinius_icarus_common.dts b/boards/arm/actinius_icarus/actinius_icarus_common.dts
@@ -123,8 +123,8 @@
  status = "okay";
 
  clock-frequency = <I2C_BITRATE_FAST>;
- sda-pin = <26>;
- scl-pin = <27>;
+ sda-gpios = <&gpio0 26 0>;
+ scl-gpios = <&gpio0 27 0>;
 
  lis2dh12-accel@19 {
  compatible = "st,lis2dh12", "st,lis2dh";

diff --git a/boards/arm/adafruit_feather_nrf52840/adafruit_feather_nrf52840.dts b/boards/arm/adafruit_feather_nrf52840/adafruit_feather_nrf52840.dts
@@ -77,8 +77,8 @@
 
 &i2c0 {
  status = "okay";
- sda-pin = <12>;
- scl-pin = <11>;
+ sda-gpios = <&gpio0 12 0>;
+ scl-gpios = <&gpio0 11 0>;
 };
 
 &spi1 {

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

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

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

diff --git a/boards/arm/bl652_dvk/bl652_dvk.dts b/boards/arm/bl652_dvk/bl652_dvk.dts
@@ -80,8 +80,8 @@
 &i2c0 {
  compatible = "nordic,nrf-twi";
  status = "okay";
- sda-pin = <26>;
- scl-pin = <27>;
+ sda-gpios = <&gpio0 26 0>;
+ scl-gpios = <&gpio0 27 0>;
 };
 
 &pwm0 {

diff --git a/boards/arm/bl653_dvk/bl653_dvk.dts b/boards/arm/bl653_dvk/bl653_dvk.dts
@@ -104,8 +104,8 @@
 &i2c0 {
  compatible = "nordic,nrf-twi";
  status = "okay";
- sda-pin = <26>;
- scl-pin = <27>;
+ sda-gpios = <&gpio0 26 0>;
+ scl-gpios = <&gpio0 27 0>;
 };
 
 &pwm0 {

diff --git a/boards/arm/bl654_dvk/bl654_dvk.dts b/boards/arm/bl654_dvk/bl654_dvk.dts
@@ -104,8 +104,8 @@
 &i2c0 {
  compatible = "nordic,nrf-twi";
  status = "okay";
- sda-pin = <26>;
- scl-pin = <27>;
+ sda-gpios = <&gpio0 26 0>;
+ scl-gpios = <&gpio0 27 0>;
 };
 
 &pwm0 {

diff --git a/boards/arm/bt510/bt510.dts b/boards/arm/bt510/bt510.dts
@@ -110,8 +110,8 @@
 &i2c0 {
  compatible = "nordic,nrf-twi";
  status = "okay";
- sda-pin = <26>;
- scl-pin = <27>;
+ sda-gpios = <&gpio0 26 0>;
+ scl-gpios = <&gpio0 27 0>;
 
  lis2dh12@18 {
  compatible = "st,lis2dh12", "st,lis2dh";

diff --git a/boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_common.dts b/boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_common.dts
@@ -108,8 +108,8 @@
 &i2c1 {
  compatible = "nordic,nrf-twim";
  status = "okay";
- sda-pin = <26>;
- scl-pin = <27>;
+ sda-gpios = <&gpio0 26 0>;
+ scl-gpios = <&gpio0 27 0>;
 
  pcf85063a@51 {
  compatible = "nxp,pcf85063a";

diff --git a/boards/arm/contextualelectronics_abc/contextualelectronics_abc.dts b/boards/arm/contextualelectronics_abc/contextualelectronics_abc.dts
@@ -69,8 +69,8 @@ arduino_serial: &uart1 {
 arduino_i2c: &i2c0 {
  compatible = "nordic,nrf-twi";
  status = "okay";
- sda-pin = <27>;
- scl-pin = <26>;
+ sda-gpios = <&gpio0 27 0>;
+ scl-gpios = <&gpio0 26 0>;
 };
 
 &spi2 {

diff --git a/boards/arm/decawave_dwm1001_dev/decawave_dwm1001_dev.dts b/boards/arm/decawave_dwm1001_dev/decawave_dwm1001_dev.dts
@@ -98,8 +98,8 @@
  compatible = "nordic,nrf-twim";
  status = "okay";
  clock-frequency = <I2C_BITRATE_FAST>;
- sda-pin = <29>;
- scl-pin = <28>;
+ sda-gpios = <&gpio0 29 0>;
+ scl-gpios = <&gpio0 28 0>;
 
  lis2dh12: lis2dh12@19 {
  compatible = "st,lis2dh12", "st,lis2dh";

diff --git a/boards/arm/degu_evk/degu_evk.dts b/boards/arm/degu_evk/degu_evk.dts
@@ -94,15 +94,15 @@
 &i2c0 {
  compatible = "nordic,nrf-twim";
  status = "okay";
- sda-pin = <20>;
- scl-pin = <22>;
+ sda-gpios = <&gpio0 20 0>;
+ scl-gpios = <&gpio0 22 0>;
 };
 
 &i2c1 {
  compatible = "nordic,nrf-twim";
  status = "okay";
- sda-pin = <41>;
- scl-pin = <11>;
+ sda-gpios = <&gpio1 9 0>;
+ scl-gpios = <&gpio0 11 0>;
 };
 
 &flash0 {

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

diff --git a/boards/arm/nrf51_ble400/nrf51_ble400.dts b/boards/arm/nrf51_ble400/nrf51_ble400.dts
@@ -81,8 +81,8 @@
 
 &i2c0 {
  status = "okay";
- sda-pin = <0>;
- scl-pin = <1>;
+ sda-gpios = <&gpio0 0 0>;
+ scl-gpios = <&gpio0 1 0>;
  /* smba-pin = <2>; */
 };
 

diff --git a/boards/arm/nrf51_vbluno51/nrf51_vbluno51.dts b/boards/arm/nrf51_vbluno51/nrf51_vbluno51.dts
@@ -66,6 +66,6 @@
 &i2c0 {
  status = "okay";
  clock-frequency = <I2C_BITRATE_FAST>;
- sda-pin = <29>;
- scl-pin = <30>;
+ sda-gpios = <&gpio0 29 0>;
+ scl-gpios = <&gpio0 30 0>;
 };
diff --git a/boards/arm/nrf51dk_nrf51422/nrf51dk_nrf51422.dts b/boards/arm/nrf51dk_nrf51422/nrf51dk_nrf51422.dts
@@ -106,15 +106,15 @@
 
 &i2c0 {
  status = "okay";
- sda-pin = <30>;
- scl-pin = <7>;
+ sda-gpios = <&gpio0 30 0>;
+ scl-gpios = <&gpio0 7 0>;
 };
 
 &i2c1 {
  /* Cannot be used together with spi1. */
  /* status = "okay"; */
- sda-pin = <5>;
- scl-pin = <6>;
+ sda-gpios = <&gpio0 5 0>;
+ scl-gpios = <&gpio0 6 0>;
 };
 
 &spi0 {

diff --git a/boards/arm/nrf52832_mdk/nrf52832_mdk.dts b/boards/arm/nrf52832_mdk/nrf52832_mdk.dts
@@ -103,15 +103,15 @@
 &i2c0 {
  compatible = "nordic,nrf-twi";
  status = "okay";
- sda-pin = <26>;
- scl-pin = <27>;
+ sda-gpios = <&gpio0 26 0>;
+ scl-gpios = <&gpio0 27 0>;
 };
 
 &i2c1 {
  compatible = "nordic,nrf-twi";
  status = "okay";
- sda-pin = <30>;
- scl-pin = <31>;
+ sda-gpios = <&gpio0 30 0>;
+ scl-gpios = <&gpio0 31 0>;
 };
 
 &pwm0 {

diff --git a/boards/arm/nrf52833dk_nrf52820/nrf52833dk_nrf52820.dts b/boards/arm/nrf52833dk_nrf52820/nrf52833dk_nrf52820.dts
@@ -103,8 +103,8 @@
 &i2c0 {
  compatible = "nordic,nrf-twi";
  status = "okay";
- sda-pin = <28>;
- scl-pin = <29>;
+ sda-gpios = <&gpio0 28 0>;
+ scl-gpios = <&gpio0 29 0>;
 };
 
 &i2c1 {

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

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

diff --git a/boards/arm/nrf52840_mdk/nrf52840_mdk.dts b/boards/arm/nrf52840_mdk/nrf52840_mdk.dts
@@ -109,15 +109,15 @@
 &i2c0 {
  compatible = "nordic,nrf-twi";
  status = "okay";
- sda-pin = <26>;
- scl-pin = <27>;
+ sda-gpios = <&gpio0 26 0>;
+ scl-gpios = <&gpio0 27 0>;
 };
 
 &i2c1 {
  compatible = "nordic,nrf-twi";
  status = "okay";
- sda-pin = <30>;
- scl-pin = <31>;
+ sda-gpios = <&gpio0 30 0>;
+ scl-gpios = <&gpio0 31 0>;
 };
 
 &pwm0 {

diff --git a/boards/arm/nrf52840_papyr/nrf52840_papyr.dts b/boards/arm/nrf52840_papyr/nrf52840_papyr.dts
@@ -103,8 +103,8 @@
 &i2c0 {
  compatible = "nordic,nrf-twi";
  status = "okay";
- sda-pin = <5>;
- scl-pin = <6>;
+ sda-gpios = <&gpio0 5 0>;
+ scl-gpios = <&gpio0 6 0>;
 };
 
 &spi1 {

diff --git a/boards/arm/nrf52840dk_nrf52811/nrf52840dk_nrf52811.dts b/boards/arm/nrf52840dk_nrf52811/nrf52840dk_nrf52811.dts
@@ -109,8 +109,8 @@
  compatible = "nordic,nrf-twi";
  status = "okay";
  /* Arduino compatible PINs */
- sda-pin = <26>;
- scl-pin = <27>;
+ sda-gpios = <&gpio0 26 0>;
+ scl-gpios = <&gpio0 27 0>;
 };
 
 &pwm0 {

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

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