From 46cb5c2d69c2a6cdcc8196075823629d00cc32e5 Mon Sep 17 00:00:00 2001 From: Luis Mantilla Date: Wed, 12 Aug 2026 09:34:33 -0500 Subject: [PATCH] Fix Rockchip I2C pinctrl group --- device/overlays/cdmx-zero3w-i2c-gpio.dts | 12 +++++++----- tests/host/imager_test.sh | 2 ++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/device/overlays/cdmx-zero3w-i2c-gpio.dts b/device/overlays/cdmx-zero3w-i2c-gpio.dts index 6d7477b..e4082f0 100644 --- a/device/overlays/cdmx-zero3w-i2c-gpio.dts +++ b/device/overlays/cdmx-zero3w-i2c-gpio.dts @@ -28,11 +28,13 @@ fragment@2 { target = <&pinctrl>; __overlay__ { - cdmx_i2c_gpio_pins: cdmx-i2c-gpio-pins { - /* bank 0, RK_PD1/RK_PD0 (25/24), GPIO function */ - rockchip,pins = - <0 25 0 &pcfg_pull_up>, - <0 24 0 &pcfg_pull_up>; + cdmx-i2c-gpio { + cdmx_i2c_gpio_pins: cdmx-i2c-gpio-pins { + /* bank 0, RK_PD1/RK_PD0 (25/24), GPIO function */ + rockchip,pins = + <0 25 0 &pcfg_pull_up>, + <0 24 0 &pcfg_pull_up>; + }; }; }; }; diff --git a/tests/host/imager_test.sh b/tests/host/imager_test.sh index e9b5af2..10af8fe 100755 --- a/tests/host/imager_test.sh +++ b/tests/host/imager_test.sh @@ -179,6 +179,8 @@ assert_eq 1 "$(grep -c '^legacy_i2c=/boot/dtbo/rk3568-i2c4-m0.dtbo$' "$ROOT/devi 'legacy I2C4 mapping is explicitly disabled' assert_eq 1 "$(grep -c 'i2c-gpio-cdmx {' "$ROOT/device/overlays/cdmx-zero3w-i2c-gpio.dts")" \ 'software I2C adapter has a stable discoverable name' +assert_eq 1 "$(grep -c '^[[:space:]]*cdmx-i2c-gpio {$' "$ROOT/device/overlays/cdmx-zero3w-i2c-gpio.dts")" \ + 'Rockchip pinctrl pins are nested inside a function group' assert_eq 1 "$(grep -c 'sda-gpios = <&gpio0 24 6>;' "$ROOT/device/overlays/cdmx-zero3w-i2c-gpio.dts")" \ 'physical pin 10 is open-drain GPIO0_D0 SDA' assert_eq 1 "$(grep -c 'scl-gpios = <&gpio0 25 6>;' "$ROOT/device/overlays/cdmx-zero3w-i2c-gpio.dts")" \