From 60ca1b30657ef08105f62771b777b5a5a1fcdb43 Mon Sep 17 00:00:00 2001 From: Daniel Irekvist Date: Fri, 8 Mar 2024 23:28:54 +0100 Subject: [PATCH] boards: sparkfun: Fix incorrect pro_micro gpio-map The SparkFun Pro Micro header pins are numbered D1, D0, GND, ... from top left whereas the SparkFun Pro Micro RP2040 and the Adafruit KB2040 boards are using gpio 0, 1, GND, ... , so the pro_micro: connector gpio-map of these boards should reflect that. Graphical Datasheet for SparkFun Pro Micro RP2040: https://cdn.sparkfun.com/assets/e/2/7/6/b/ProMicroRP2040_Graphical_Datasheet.pdf Graphical Datasheet for SparkFun Pro Micro: https://cdn.sparkfun.com/assets/f/d/8/0/d/ProMicro16MHzv2.pdf Pinout of the Adafruit KB2040: https://learn.adafruit.com/assets/106984 Please note that the KB2040 uses CircuitPython pin labels D0, D1 which does not seemt correspond to the Arduino labels D0 and D1 used by the Pro Micro. Signed-off-by: Daniel Irekvist --- boards/adafruit/kb2040/sparkfun_pro_micro_connector.dtsi | 4 ++-- .../pro_micro_rp2040/sparkfun_pro_micro_connector.dtsi | 4 ++-- doc/releases/migration-guide-3.7.rst | 3 +++ dts/bindings/gpio/sparkfun-pro-micro-header.yaml | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/boards/adafruit/kb2040/sparkfun_pro_micro_connector.dtsi b/boards/adafruit/kb2040/sparkfun_pro_micro_connector.dtsi index c3ec9f3eb49aae3..7412cb915e9c741 100644 --- a/boards/adafruit/kb2040/sparkfun_pro_micro_connector.dtsi +++ b/boards/adafruit/kb2040/sparkfun_pro_micro_connector.dtsi @@ -11,8 +11,8 @@ gpio-map-mask = <0xffffffff 0xffffffc0>; gpio-map-pass-thru = <0 0x3f>; gpio-map - = <0 0 &gpio0 0 0> /* D0 */ - , <1 0 &gpio0 1 0> /* D1 */ + = <1 0 &gpio0 0 0> /* D1 */ + , <0 0 &gpio0 1 0> /* D0 */ , <2 0 &gpio0 2 0> /* D2 */ , <3 0 &gpio0 3 0> /* D3 */ , <4 0 &gpio0 4 0> /* D4/A6 */ diff --git a/boards/sparkfun/pro_micro_rp2040/sparkfun_pro_micro_connector.dtsi b/boards/sparkfun/pro_micro_rp2040/sparkfun_pro_micro_connector.dtsi index 21852f64b7be8ee..c43b52f2ead102c 100644 --- a/boards/sparkfun/pro_micro_rp2040/sparkfun_pro_micro_connector.dtsi +++ b/boards/sparkfun/pro_micro_rp2040/sparkfun_pro_micro_connector.dtsi @@ -11,8 +11,8 @@ gpio-map-mask = <0xffffffff 0xffffffc0>; gpio-map-pass-thru = <0 0x3f>; gpio-map - = <0 0 &gpio0 0 0> /* D0 */ - , <1 0 &gpio0 1 0> /* D1 */ + = <1 0 &gpio0 0 0> /* D1 */ + , <0 0 &gpio0 1 0> /* D0 */ , <2 0 &gpio0 2 0> /* D2 */ , <3 0 &gpio0 3 0> /* D3 */ , <4 0 &gpio0 4 0> /* D4/A6 */ diff --git a/doc/releases/migration-guide-3.7.rst b/doc/releases/migration-guide-3.7.rst index be9a9ef489fa918..2d72046ef15a120 100644 --- a/doc/releases/migration-guide-3.7.rst +++ b/doc/releases/migration-guide-3.7.rst @@ -28,6 +28,9 @@ Kernel Boards ****** +* Reordered D1 and D0 in the `pro_micro` connector gpio-map for SparkFun Pro Micro RP2040 to match + original Pro Micro definition. Out-of-tree shields must be updated to reflect this change. + Modules ******* diff --git a/dts/bindings/gpio/sparkfun-pro-micro-header.yaml b/dts/bindings/gpio/sparkfun-pro-micro-header.yaml index 25e9f1611ca153f..7ef31b8dd7f2127 100644 --- a/dts/bindings/gpio/sparkfun-pro-micro-header.yaml +++ b/dts/bindings/gpio/sparkfun-pro-micro-header.yaml @@ -16,8 +16,8 @@ description: | This binding provides a nexus mapping for 18 pins, as depicted below: - 0 TX0 RAW - - 1 RX1 GND - + 1 TX0 RAW - + 0 RX1 GND - - GND RST - - GND VCC - 2 D2 D21/A3 21