commit 08095cecb6f02208d625a98e1ba8c5f5c3108b8e
author Anthony DiGirolamo <tonymd@google.com> Fri Mar 22 23:56:14 2024 +0000
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Mar 22 23:56:14 2024 +0000
tree 3b1b690414cca2fcbcaec731de45be9c51debe59
parent 86914dd667c5924d21a7f2c5f7034a1999ecbb62

Switch to upstream pw_i2c_rp2040

Bug: 303255049
Change-Id: Ie4bda9dd8ea975935b6ec8b50f7c526efe2b6a22
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/kudzu/+/198970
Reviewed-by: Erik Gilling <konkers@google.com>
Commit-Queue: Anthony DiGirolamo <tonymd@google.com>

applications/app_common_impl/common_pico.cc

diff --git a/applications/app_common_impl/common_pico.cc b/applications/app_common_impl/common_pico.cc
index d94b060..0464790 100644
--- a/applications/app_common_impl/common_pico.cc
+++ b/applications/app_common_impl/common_pico.cc
@@ -22,6 +22,7 @@
 #include "ft6236/device.h"
 #include "hardware/adc.h"
 #include "hardware/gpio.h"
+#include "hardware/i2c.h"
 #include "hardware/pwm.h"
 #include "hardware/vreg.h"
 #include "icm42670p/device.h"
@@ -233,20 +234,18 @@
       borrowable_initiator(initiator, initiator_mutex),
       device(borrowable_initiator, config, selector) {}
 
-constexpr pw::i2c::PicoInitiator::Config ki2c0Config{
-    .i2c_block = 0,
-    .baud_rate_bps = 400'000,
+constexpr pw::i2c::Rp2040Initiator::Config ki2c0Config{
+    .clock_frequency = 400'000,
     .sda_pin = I2C_BUS0_SDA,
     .scl_pin = I2C_BUS0_SCL,
 };
-constexpr pw::i2c::PicoInitiator::Config ki2c1Config{
-    .i2c_block = 1,
-    .baud_rate_bps = 400'000,
+constexpr pw::i2c::Rp2040Initiator::Config ki2c1Config{
+    .clock_frequency = 400'000,
     .sda_pin = I2C_BUS1_SDA,
     .scl_pin = I2C_BUS1_SCL,
 };
-pw::i2c::PicoInitiator i2c0_bus(ki2c0Config);
-pw::i2c::PicoInitiator i2c1_bus(ki2c1Config);
+pw::i2c::Rp2040Initiator i2c0_bus(ki2c0Config, i2c0);
+pw::i2c::Rp2040Initiator i2c1_bus(ki2c1Config, i2c1);
 
 pw::pi4ioe5v6416::Device io_expander(i2c1_bus);
 kudzu::icm42670p::Device imu(i2c0_bus);

third_party/pigweed

diff --git a/third_party/pigweed b/third_party/pigweed
index b919fb4..bb80314 160000
--- a/third_party/pigweed
+++ b/third_party/pigweed
@@ -1 +1 @@
-Subproject commit b919fb4ac9a67ea312b91422f06d05ac2e2fe182
+Subproject commit bb8031432ff42f751b846960871e7525c6c6ea80

third_party/pigweed-experimental

diff --git a/third_party/pigweed-experimental b/third_party/pigweed-experimental
index 72a8143..3660ff0 160000
--- a/third_party/pigweed-experimental
+++ b/third_party/pigweed-experimental
@@ -1 +1 @@
-Subproject commit 72a8143ae7043f453cfd3095d20962f9be774ec5
+Subproject commit 3660ff05f9624e8aaa301d13664fbf26bd0f05d7