Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert nordic I2C sda-gpios, scl-gpios changes #34356

Merged
merged 2 commits into from
Apr 20, 2021
Merged

Revert nordic I2C sda-gpios, scl-gpios changes #34356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
446a25b
dts: nrf: revert i2c sda-gpios, scl-gpios changes
mbolivar-nordic Apr 16, 2021
50936c8
dts: remove remaining nRF {scl,sda}-gpios
mbolivar-nordic Apr 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions boards/arm/96b_carbon_nrf51/96b_carbon_nrf51.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@

&i2c0 {
status = "okay";
sda-gpios = <&gpio0 28 0>;
scl-gpios = <&gpio0 2 0>;
sda-pin = <28>;
scl-pin = <2>;
};

&uart0 {
Expand Down
4 changes: 2 additions & 2 deletions boards/arm/96b_nitrogen/96b_nitrogen.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions boards/arm/actinius_icarus/actinius_icarus_common.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 2 additions & 2 deletions boards/arm/adafruit_feather_nrf52840/adafruit_feather_nrf52840.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions boards/arm/arduino_nano_33_ble/arduino_nano_33_ble.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions boards/arm/bbc_microbit/bbc_microbit.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down
4 changes: 2 additions & 2 deletions boards/arm/bbc_microbit_v2/bbc_microbit_v2.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down
4 changes: 2 additions & 2 deletions boards/arm/bl652_dvk/bl652_dvk.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions boards/arm/bl653_dvk/bl653_dvk.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions boards/arm/bl654_dvk/bl654_dvk.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions boards/arm/bmd_345_eval/bmd_345_eval.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions boards/arm/bt510/bt510.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 2 additions & 2 deletions boards/arm/circuitdojo_feather_nrf9160/circuitdojo_feather_nrf9160_common.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 2 additions & 2 deletions boards/arm/contextualelectronics_abc/contextualelectronics_abc.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions boards/arm/decawave_dwm1001_dev/decawave_dwm1001_dev.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
8 changes: 4 additions & 4 deletions boards/arm/degu_evk/degu_evk.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions boards/arm/nrf21540dk_nrf52840/nrf21540dk_nrf52840.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions boards/arm/nrf51_ble400/nrf51_ble400.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>; */
};

Expand Down
4 changes: 2 additions & 2 deletions boards/arm/nrf51_vbluno51/nrf51_vbluno51.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 4 additions & 4 deletions boards/arm/nrf51dk_nrf51422/nrf51dk_nrf51422.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions boards/arm/nrf52832_mdk/nrf52832_mdk.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions boards/arm/nrf52833dk_nrf52820/nrf52833dk_nrf52820.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions boards/arm/nrf52833dk_nrf52833/nrf52833dk_nrf52833.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions boards/arm/nrf52840_blip/nrf52840_blip.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions boards/arm/nrf52840_mdk/nrf52840_mdk.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions boards/arm/nrf52840_papyr/nrf52840_papyr.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions boards/arm/nrf52840dk_nrf52811/nrf52840dk_nrf52811.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions boards/arm/nrf52840dk_nrf52840/nrf52840dk_nrf52840.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading