zephyrproject-rtos · soburi · Aug 10, 2024 · Aug 9, 2024 · Aug 10, 2024 · Aug 10, 2024
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -422,7 +422,7 @@
 /dts/arm/nxp/ @mmahadevan108 @dleach02
 /dts/arm/nxp/nxp_s32* @manuargue
 /dts/arm/microchip/ @franciscomunoz @albertofloyd @sjvasanth1
-/dts/arm/rpi_pico/  @yonsch
+/dts/arm/raspberry/rpi_pico/ @yonsch
 /dts/arm/silabs/efm32_pg_1b.dtsi @rdmeneze
 /dts/arm/silabs/efm32gg11b* @oanerer
 /dts/arm/silabs/efr32bg13p* @mnkp

diff --git a/Kconfig.zephyr b/Kconfig.zephyr
@@ -766,7 +766,8 @@ config BUILD_OUTPUT_UF2_FAMILY_ID
  default "0xada52840" if SOC_NRF52840_QIAA
  default "0x4fb2d5bd" if SOC_SERIES_IMXRT10XX || SOC_SERIES_IMXRT11XX
  default "0x2abc77ec" if SOC_SERIES_LPC55XXX
- default "0xe48bff56" if SOC_SERIES_RP2XXX
+ default "0xe48bff56" if SOC_SERIES_RP2040
+ default "0xe48bff57" if SOC_SERIES_RP2350
  default "0x68ed2b88" if SOC_SERIES_SAMD21
  default "0x55114460" if SOC_SERIES_SAMD51
  default "0x647824b6" if SOC_SERIES_STM32F0X

diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
@@ -3471,7 +3471,7 @@ Raspberry Pi Pico Platforms:
  - boards/raspberrypi/
  - boards/adafruit/kb2040/
  - boards/sparkfun/pro_micro_rp2040/
- - dts/arm/rpi_pico/
+ - dts/arm/raspberrypi/rpi_pico/
  - dts/bindings/*/raspberrypi,pico*
  - drivers/*/*rpi_pico
  - drivers/*/*rpi_pico*/

diff --git a/boards/adafruit/kb2040/adafruit_kb2040-pinctrl.dtsi b/boards/adafruit/kb2040/adafruit_kb2040-pinctrl.dtsi
@@ -48,9 +48,6 @@
  };
  };
 
- clocks_default: clocks_default {
- };
-
  ws2812_pio0_default: ws2812_pio0_default {
  ws2812 {
  pinmux = <PIO0_P17>;

diff --git a/boards/adafruit/kb2040/adafruit_kb2040.dts b/boards/adafruit/kb2040/adafruit_kb2040.dts
@@ -7,7 +7,7 @@
 
 /dts-v1/;
 
-#include <rpi_pico/rp2040.dtsi>
+#include <raspberrypi/rpi_pico/rp2040.dtsi>
 #include "adafruit_kb2040-pinctrl.dtsi"
 #include "sparkfun_pro_micro_connector.dtsi"
 #include <freq.h>
@@ -56,11 +56,6 @@
  };
 };
 
-&clocks {
- pinctrl-0 = <&clocks_default>;
- pinctrl-names = "default";
-};
-
 &uart0 {
  current-speed = <115200>;
  status = "okay";

diff --git a/boards/adafruit/qt_py_rp2040/adafruit_qt_py_rp2040-pinctrl.dtsi b/boards/adafruit/qt_py_rp2040/adafruit_qt_py_rp2040-pinctrl.dtsi
@@ -59,9 +59,6 @@
  };
  };
 
- clocks_default: clocks_default {
- };
-
  ws2812_pio1_default: ws2812_pio1_default {
  ws2812 {
  pinmux = <PIO1_P12>;

diff --git a/boards/adafruit/qt_py_rp2040/adafruit_qt_py_rp2040.dts b/boards/adafruit/qt_py_rp2040/adafruit_qt_py_rp2040.dts
@@ -7,7 +7,7 @@
 
 /dts-v1/;
 
-#include <rpi_pico/rp2040.dtsi>
+#include <raspberrypi/rpi_pico/rp2040.dtsi>
 #include "adafruit_qt_py_rp2040-pinctrl.dtsi"
 #include "seeed_xiao_connector.dtsi"
 #include <freq.h>
@@ -56,11 +56,6 @@
  };
 };
 
-&clocks {
- pinctrl-0 = <&clocks_default>;
- pinctrl-names = "default";
-};
-
 &uart1 {
  current-speed = <115200>;
  status = "okay";

diff --git a/boards/nordic/nrf9160dk/board.c b/boards/nordic/nrf9160dk/board.c
@@ -95,8 +95,8 @@
 
 #if USE_RESET_GPIO
 static void chip_reset(const struct device *gpio,
- struct gpio_callback *cb, uint32_t pins)
+ struct gpio_callback *cb, gpio_port_pins_t pins)
 {
  const uint32_t stamp = k_cycle_get_32();
 
 printk("GPIO reset line asserted, device reset.\n");
@@ -136,7 +136,7 @@
  return rc;
  }
 
- gpio_init_callback(&gpio_ctx, chip_reset, BIT(pin));
+ gpio_init_callback(&gpio_ctx, chip_reset, GPIO_BIT(pin));
 
  rc = gpio_add_callback(gpio, &gpio_ctx);
  if (rc) {

diff --git a/boards/pimoroni/pico_plus2/Kconfig.defconfig b/boards/pimoroni/pico_plus2/Kconfig.defconfig
@@ -0,0 +1,9 @@
+# Copyright (c) 2024 TOKITA Hiroshi
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_PICO_PLUS2
+
+config USB_SELF_POWERED
+ default n
+
+endif # BOARD_PICO_PLUS2
diff --git a/boards/pimoroni/pico_plus2/Kconfig.pico_plus2 b/boards/pimoroni/pico_plus2/Kconfig.pico_plus2
@@ -0,0 +1,5 @@
+# Copyright (c) 2024 TOKITA Hiroshi
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_PICO_PLUS2
+ select SOC_RP2350B
diff --git a/boards/pimoroni/pico_plus2/board.cmake b/boards/pimoroni/pico_plus2/board.cmake
@@ -0,0 +1,32 @@
+# SPDX-License-Identifier: Apache-2.0
+
+# This configuration allows selecting what debug adapter debugging rpi_pico
+# by a command-line argument.
+# It is mainly intended to support both the 'picoprobe' and 'raspberrypi-swd'
+# adapter described in "Getting started with Raspberry Pi Pico".
+# And any other SWD debug adapter might also be usable with this configuration.
+
+# Set RPI_PICO_DEBUG_ADAPTER to select debug adapter by command-line arguments.
+# e.g.) west build -b rpi_pico -- -DRPI_PICO_DEBUG_ADAPTER=raspberrypi-swd
+# The value is treated as a part of an interface file name that
+# the debugger's configuration file.
+# The value must be the 'stem' part of the name of one of the files
+# in the openocd interface configuration file.
+# The setting is store to CMakeCache.txt.
+if ("${RPI_PICO_DEBUG_ADAPTER}" STREQUAL "")
+ set(RPI_PICO_DEBUG_ADAPTER "cmsis-dap")
+endif()
+
+board_runner_args(openocd --cmd-pre-init "source [find interface/${RPI_PICO_DEBUG_ADAPTER}.cfg]")
+board_runner_args(openocd --cmd-pre-init "transport select swd")
+board_runner_args(openocd --cmd-pre-init "source [find target/rp2350.cfg]")
+
+# The adapter speed is expected to be set by interface configuration.
+# But if not so, set 2000 to adapter speed.
+board_runner_args(openocd --cmd-pre-init "set_adapter_speed_if_not_set 2000")
+
+board_runner_args(uf2 "--board-id=RP2350")
+
+include(${ZEPHYR_BASE}/boards/common/openocd.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/uf2.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
diff --git a/boards/pimoroni/pico_plus2/board.yml b/boards/pimoroni/pico_plus2/board.yml
@@ -0,0 +1,5 @@
+board:
+ name: pico_plus2
+ vendor: pimoroni
+ socs:
+ - name: rp2350b