kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'zmkfirmware:main' into tofu

Browse source
This commit is contained in:
digger vermont 2023-05-06 15:45:46 -04:00 • committed by GitHub
commit f14d6eb164
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/boards/arm/bluemicro840/bluemicro840_v1.dts
View file

@ -63,7 +63,7 @@
};
&i2c0 {
compatible = "nordic,nrf-twim";
compatible = "nordic,nrf-twi";
pinctrl-0 = <&i2c0_default>;
pinctrl-1 = <&i2c0_sleep>;
pinctrl-names = "default", "sleep";
@ -71,6 +71,7 @@
&uart0 {
compatible = "nordic,nrf-uarte";
current-speed = <115200>;
pinctrl-0 = <&uart0_default>;
pinctrl-1 = <&uart0_sleep>;
pinctrl-names = "default", "sleep";

3
app/boards/arm/nrfmicro/nrfmicro_11.dts
View file

@ -48,7 +48,7 @@
};
&i2c0 {
compatible = "nordic,nrf-twim";
compatible = "nordic,nrf-twi";
pinctrl-0 = <&i2c0_default>;
pinctrl-1 = <&i2c0_sleep>;
pinctrl-names = "default", "sleep";
@ -56,6 +56,7 @@
&uart0 {
compatible = "nordic,nrf-uarte";
current-speed = <115200>;
pinctrl-0 = <&uart0_default>;
pinctrl-1 = <&uart0_sleep>;
pinctrl-names = "default", "sleep";

3
app/boards/arm/nrfmicro/nrfmicro_11_flipped.dts
View file

@ -48,7 +48,7 @@
};
&i2c0 {
compatible = "nordic,nrf-twim";
compatible = "nordic,nrf-twi";
pinctrl-0 = <&i2c0_default>;
pinctrl-1 = <&i2c0_sleep>;
pinctrl-names = "default", "sleep";
@ -56,6 +56,7 @@
&uart0 {
compatible = "nordic,nrf-uarte";
current-speed = <115200>;
pinctrl-0 = <&uart0_default>;
pinctrl-1 = <&uart0_sleep>;
pinctrl-names = "default", "sleep";

3
app/boards/arm/nrfmicro/nrfmicro_13.dts
View file

@ -61,7 +61,7 @@
};
&i2c0 {
compatible = "nordic,nrf-twim";
compatible = "nordic,nrf-twi";
pinctrl-0 = <&i2c0_default>;
pinctrl-1 = <&i2c0_sleep>;
pinctrl-names = "default", "sleep";
@ -69,6 +69,7 @@
&uart0 {
compatible = "nordic,nrf-uarte";
current-speed = <115200>;
pinctrl-0 = <&uart0_default>;
pinctrl-1 = <&uart0_sleep>;
pinctrl-names = "default", "sleep";

3
app/boards/arm/nrfmicro/nrfmicro_13_52833.dts
View file

@ -61,7 +61,7 @@
};
&i2c0 {
compatible = "nordic,nrf-twim";
compatible = "nordic,nrf-twi";
pinctrl-0 = <&i2c0_default>;
pinctrl-1 = <&i2c0_sleep>;
pinctrl-names = "default", "sleep";
@ -69,6 +69,7 @@
&uart0 {
compatible = "nordic,nrf-uarte";
current-speed = <115200>;
pinctrl-0 = <&uart0_default>;
pinctrl-1 = <&uart0_sleep>;
pinctrl-names = "default", "sleep";