I2C configures on H20

Author: tannewt

ports/zephyr-cp/boards/nordic/nrf54h20dk/autogen_board_info.toml

@@ -89,7 +89,7 @@ sharpdisplay = false
 socketpool = false
 spitarget = false
 ssl = false
-storage = false
+storage = true # Zephyr board has flash
 struct = true
 supervisor = false
 synthio = false
@@ -110,7 +110,7 @@ vectorio = false
 warnings = false
 watchdog = false
 wifi = false
-zephyr_i2c = false
+zephyr_i2c = true # Zephyr board has zephyr_i2c
 zephyr_kernel = false
 zephyr_serial = true # Zephyr board has zephyr_serial
 zlib = false

ports/zephyr-cp/boards/nrf54h20dk_nrf54h20_cpuapp.conf

@@ -0,0 +1 @@
+CONFIG_FLASH_MSPI_NOR_LAYOUT_PAGE_SIZE=4096

ports/zephyr-cp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

@@ -0,0 +1,45 @@
+&gpio6 {
+	status = "okay";
+	zephyr,pm-device-runtime-auto;
+};
+
+&exmif {
+	status = "okay";
+	zephyr,pm-device-runtime-auto;
+};
+
+&mx25uw63 {
+	status = "okay";
+};
+
+/*
+ * SDA = P2.11
+ * SCL = P2.10
+ */
+
+&pinctrl {
+	i2c130_default: i2c130_default {
+		group1 {
+			psels = <NRF_PSEL(TWIM_SDA, 2, 11)>,
+				<NRF_PSEL(TWIM_SCL, 2, 10)>;
+		};
+	};
+
+	i2c130_sleep: i2c130_sleep {
+		group1 {
+			psels = <NRF_PSEL(TWIM_SDA, 2, 11)>,
+				<NRF_PSEL(TWIM_SCL, 2, 10)>;
+			low-power-enable;
+		};
+	};
+};
+
+&i2c130 {
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	pinctrl-0 = <&i2c130_default>;
+	pinctrl-1 = <&i2c130_sleep>;
+	pinctrl-names = "default", "sleep";
+	zephyr,concat-buf-size = <256>;
+	memory-regions = <&cpuapp_dma_region>;
+	status = "okay";
+};

ports/zephyr-cp/boards/nucleo_n657x0_q.overlay

@@ -1,3 +0,0 @@
-&mx25um51245g {
-    /delete-node/ partitions;
-};

ports/zephyr-cp/common-hal/zephyr_i2c/I2C.c

@@ -10,6 +10,7 @@
 
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/device.h>
+#include <zephyr/kernel.h>
 
 void common_hal_zephyr_i2c_i2c_construct(zephyr_i2c_i2c_obj_t *self,
     const struct device *i2c_device, uint32_t frequency, uint32_t timeout) {
@@ -21,17 +22,20 @@ void common_hal_zephyr_i2c_i2c_construct(zephyr_i2c_i2c_obj_t *self,
     // Configure I2C speed
     uint32_t i2c_cfg = I2C_MODE_CONTROLLER;
     if (frequency <= 100000) {
-        i2c_cfg |= I2C_SPEED_STANDARD;
+        i2c_cfg |= I2C_SPEED_SET(I2C_SPEED_STANDARD);
     } else if (frequency <= 400000) {
-        i2c_cfg |= I2C_SPEED_FAST;
+        i2c_cfg |= I2C_SPEED_SET(I2C_SPEED_FAST);
     } else if (frequency <= 1000000) {
-        i2c_cfg |= I2C_SPEED_FAST_PLUS;
+        i2c_cfg |= I2C_SPEED_SET(I2C_SPEED_FAST_PLUS);
     } else {
-        i2c_cfg |= I2C_SPEED_HIGH;
+        i2c_cfg |= I2C_SPEED_SET(I2C_SPEED_HIGH);
     }
 
     int ret = i2c_configure(i2c_device, i2c_cfg);
     if (ret != 0) {
+        printk("Device: %s\n", i2c_device->name);
+        printk("Device address: %08x\n", i2c_device);
+        printk("I2C configuration failed: %d\n", ret);
         mp_raise_OSError_msg(MP_ERROR_TEXT("I2C configuration failed"));
     }
 }

ports/zephyr-cp/cptools/zephyr2cp.py

@@ -12,6 +12,8 @@
 # GPIO flags defined here: include/zephyr/dt-bindings/gpio/gpio.h
 GPIO_ACTIVE_LOW = 1 << 0
 
+MINIMUM_RAM_SIZE = 1024
+
 MANUAL_COMPAT_TO_DRIVER = {
     "renesas_ra_nv_flash": "flash",
     "nordic_nrf_uarte": "serial",
@@ -266,10 +268,15 @@ def zephyr_dts_to_cp_board(portdir, builddir, zephyrbuilddir):  # noqa: C901
         if "compatible" in node.props:
             compatible = node.props["compatible"].to_strings()
         logger.debug(f"{node.name}: {status}")
+        logger.debug(f"compatible: {compatible}")
         chosen = None
         if node in path2chosen:
             chosen = path2chosen[node]
             logger.debug(f" chosen: {chosen}")
+            if not compatible and chosen == "zephyr,sram":
+                # The designated sram region may not have any compatible properties,
+                # so we assume it is compatible with mmio
+                compatible.append("mmio")
         for c in compatible:
             underscored = c.replace(",", "_").replace("-", "_")
             driver = COMPAT_TO_DRIVER.get(underscored, None)
@@ -296,7 +303,8 @@ def zephyr_dts_to_cp_board(portdir, builddir, zephyrbuilddir):  # noqa: C901
                 info = (node.labels[0], start, end, size, node.path)
                 if chosen == "zephyr,sram":
                     rams.insert(0, info)
-                elif status == "okay":
+                elif status == "okay" and size > MINIMUM_RAM_SIZE:
+                    logger.debug(f"Adding RAM info: {info}")
                     rams.append(info)
             if not driver:
                 driver = MANUAL_COMPAT_TO_DRIVER.get(underscored, None)

ports/zephyr-cp/supervisor/flash.c

@@ -111,6 +111,10 @@ void supervisor_flash_init(void) {
         const struct device *d = flashes[i];
 
         printk("flash %p %s\n", d, d->name);
+        if (!device_is_ready(d)) {
+            printk("  not ready\n");
+            continue;
+        }
         if (covered_by_areas[i]) {
             printk("  covered by flash area\n");
             continue;