diff --git a/boards/kws/pico_spe/pico_spe.dts b/boards/kws/pico_spe/pico_spe.dts index 5a4e89ead581..868a945aa922 100644 --- a/boards/kws/pico_spe/pico_spe.dts +++ b/boards/kws/pico_spe/pico_spe.dts @@ -206,6 +206,5 @@ zephyr_udc0: &usbd { }; pico_spi: &spi1 {}; -pico_i2c0: &i2c0 {}; -pico_i2c1: &i2c1 {}; +pico_i2c: &i2c0 {}; pico_serial: &uart0 {}; diff --git a/boards/pimoroni/pico_plus2/pico_plus2.dtsi b/boards/pimoroni/pico_plus2/pico_plus2.dtsi index f77ae33e0421..49ffc229ec4c 100644 --- a/boards/pimoroni/pico_plus2/pico_plus2.dtsi +++ b/boards/pimoroni/pico_plus2/pico_plus2.dtsi @@ -172,7 +172,6 @@ zephyr_udc0: &usbd { pico_spi: &spi0 {}; -pico_i2c0: &i2c0 {}; -pico_i2c1: &i2c1 {}; +pico_i2c: &i2c0 {}; pico_serial: &uart0 {}; stemma_qt_i2c: &i2c0 {}; diff --git a/boards/raspberrypi/common/rpi_pico-pinctrl-common.dtsi b/boards/raspberrypi/common/rpi_pico-pinctrl-common.dtsi index 66ccfd208959..0f4ee28263b1 100644 --- a/boards/raspberrypi/common/rpi_pico-pinctrl-common.dtsi +++ b/boards/raspberrypi/common/rpi_pico-pinctrl-common.dtsi @@ -23,14 +23,6 @@ }; }; - i2c1_default: i2c1_default { - group1 { - pinmux = , ; - input-enable; - input-schmitt-enable; - }; - }; - spi0_default: spi0_default { group1 { pinmux = , , ; diff --git a/boards/raspberrypi/rpi_pico/rpi_pico-common.dtsi b/boards/raspberrypi/rpi_pico/rpi_pico-common.dtsi index 811dafcdf773..9923a8df412f 100644 --- a/boards/raspberrypi/rpi_pico/rpi_pico-common.dtsi +++ b/boards/raspberrypi/rpi_pico/rpi_pico-common.dtsi @@ -107,13 +107,6 @@ pinctrl-names = "default"; }; -&i2c1 { - pinctrl-0 = <&i2c1_default>; - pinctrl-names = "default"; - status = "disabled"; - clock-frequency = ; -}; - &spi0 { clock-frequency = ; status = "okay"; @@ -155,6 +148,5 @@ zephyr_udc0: &usbd { }; pico_spi: &spi0 {}; -pico_i2c0: &i2c0 {}; -pico_i2c1: &i2c1 {}; +pico_i2c: &i2c0 {}; pico_serial: &uart0 {}; diff --git a/boards/raspberrypi/rpi_pico2/rpi_pico2.dtsi b/boards/raspberrypi/rpi_pico2/rpi_pico2.dtsi index 522413c94f1a..5844ec7a5c7a 100644 --- a/boards/raspberrypi/rpi_pico2/rpi_pico2.dtsi +++ b/boards/raspberrypi/rpi_pico2/rpi_pico2.dtsi @@ -114,13 +114,6 @@ gpio0_lo: &gpio0 { status = "okay"; }; -&i2c1 { - clock-frequency = ; - pinctrl-0 = <&i2c1_default>; - pinctrl-names = "default"; - status = "okay"; -}; - &adc { pinctrl-0 = <&adc_default>; pinctrl-names = "default"; diff --git a/boards/shields/rpi_pico_uno_flexypin/rpi_pico_uno_flexypin.overlay b/boards/shields/rpi_pico_uno_flexypin/rpi_pico_uno_flexypin.overlay index 3ddf28728830..a08db1052435 100644 --- a/boards/shields/rpi_pico_uno_flexypin/rpi_pico_uno_flexypin.overlay +++ b/boards/shields/rpi_pico_uno_flexypin/rpi_pico_uno_flexypin.overlay @@ -37,5 +37,5 @@ }; arduino_spi: &pico_spi {}; -arduino_i2c: &pico_i2c0 {}; +arduino_i2c: &pico_i2c {}; arduino_serial: &pico_serial {}; diff --git a/boards/shields/waveshare_ups/boards/rpi_pico.overlay b/boards/shields/waveshare_ups/boards/rpi_pico.overlay index f758012a7cbf..02352edca483 100644 --- a/boards/shields/waveshare_ups/boards/rpi_pico.overlay +++ b/boards/shields/waveshare_ups/boards/rpi_pico.overlay @@ -8,11 +8,17 @@ &pinctrl { i2c1_default: i2c1_default { group1 { + pinmux = , ; + input-enable; + input-schmitt-enable; bias-pull-up; }; }; }; -&pico_i2c1 { +&i2c1 { + pinctrl-0 = <&i2c1_default>; + pinctrl-names = "default"; + clock-frequency = ; status = "okay"; }; diff --git a/boards/shields/waveshare_ups/waveshare_pico_ups_b.overlay b/boards/shields/waveshare_ups/waveshare_pico_ups_b.overlay index 341927d1dd1e..ca6e84468266 100644 --- a/boards/shields/waveshare_ups/waveshare_pico_ups_b.overlay +++ b/boards/shields/waveshare_ups/waveshare_pico_ups_b.overlay @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -&pico_i2c1 { +&i2c1 { waveshare_pico_ups: ina219@43 { status = "okay"; compatible = "ti,ina219"; diff --git a/boards/waveshare/rp2040_zero/rp2040_zero.dts b/boards/waveshare/rp2040_zero/rp2040_zero.dts index 6e593f9a5ab4..4cd3d3089ef9 100644 --- a/boards/waveshare/rp2040_zero/rp2040_zero.dts +++ b/boards/waveshare/rp2040_zero/rp2040_zero.dts @@ -142,6 +142,5 @@ zephyr_udc0: &usbd { }; pico_spi: &spi0 {}; -pico_i2c0: &i2c0 {}; -pico_i2c1: &i2c1 {}; +pico_i2c: &i2c0 {}; pico_serial: &uart0 {}; diff --git a/boards/wiznet/w5500_evb_pico/w5500_evb_pico.dts b/boards/wiznet/w5500_evb_pico/w5500_evb_pico.dts index 3f853ce06051..cf361a69dc33 100644 --- a/boards/wiznet/w5500_evb_pico/w5500_evb_pico.dts +++ b/boards/wiznet/w5500_evb_pico/w5500_evb_pico.dts @@ -185,5 +185,4 @@ zephyr_udc0: &usbd { }; pico_spi: &spi0 {}; -pico_i2c0: &i2c0 {}; -pico_i2c1: &i2c1 {}; +pico_i2c: &i2c0 {}; diff --git a/boards/wiznet/w5500_evb_pico2/w5500_evb_pico2.dtsi b/boards/wiznet/w5500_evb_pico2/w5500_evb_pico2.dtsi index 5a0959d721e6..52f64bf026ab 100644 --- a/boards/wiznet/w5500_evb_pico2/w5500_evb_pico2.dtsi +++ b/boards/wiznet/w5500_evb_pico2/w5500_evb_pico2.dtsi @@ -171,6 +171,5 @@ zephyr_udc0: &usbd { }; pico_spi: &spi0 {}; -pico_i2c0: &i2c0 {}; -pico_i2c1: &i2c1 {}; +pico_i2c: &i2c0 {}; pico_serial: &uart0 {};