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 <marti.bolivar@nordicsemi.no>
This commit is contained in:
Martí Bolívar 2021-02-03 18:15:54 -08:00 committed by Carles Cufí
parent 821c03a14a
commit 17a66304c4
50 changed files with 124 additions and 124 deletions

View File

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

View File

@ -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 {

View File

@ -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";

View File

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

View File

@ -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 {

View File

@ -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 */

View File

@ -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 */

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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";

View File

@ -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";

View File

@ -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 {

View File

@ -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";

View File

@ -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 {

View File

@ -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 {

View File

@ -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>; */
};

View File

@ -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>;
};

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -149,16 +149,16 @@ arduino_serial: &uart0 {
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 {

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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