libraries: Wire: Instantiate Wire following dts configuration

soburi · soburi · commit 83c6c0a2f330 · 2022-10-29T19:01:26.000+09:00
Instaintiate Wire with i2c device that defined in 'i2cs' array
under zephyr,user node.
If 'i2cs' array is not defined, tries to instantiate with
i2c device that labeled as 'arduino_i2c'.

As a result of apply new rule, the i2c_dev that declared in pinmap.h
is no more used, remove it.

Signed-off-by: TOKITA Hiroshi &lt;tokita.hiroshi@fujitsu.com&gt;
diff --git a/libraries/Wire/Wire.cpp b/libraries/Wire/Wire.cpp
@@ -104,4 +104,9 @@ void arduino::ZephyrI2C::flush() {}
 void arduino::ZephyrI2C::onReceive(voidFuncPtrParamInt cb) {}
 void arduino::ZephyrI2C::onRequest(voidFuncPtr cb) {}
 
-arduino::ZephyrI2C Wire(i2c_dev);
+#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), i2cs) && (DT_PROP_LEN(DT_PATH(zephyr_user), i2cs) > 0)
+arduino::ZephyrI2C Wire(DEVICE_DT_GET(DT_PHANDLE_BY_IDX(DT_PATH(zephyr_user), i2cs, 0)));
+/* If i2cs node is not defined, tries to use arduino_i2c */
+#elif DT_NODE_EXISTS(DT_NODELABEL(arduino_i2c))
+arduino::ZephyrI2C Wire(DEVICE_DT_GET(DT_NODELABEL(arduino_i2c)));
+#endif
diff --git a/libraries/Wire/Wire.h b/libraries/Wire/Wire.h
@@ -57,6 +57,10 @@ class ZephyrI2C : public HardwareI2C {
 
 } // namespace arduino
 
+#if DT_NODE_HAS_PROP(DT_PATH(zephyr_user), i2cs) &&                                                \
+		(DT_PROP_LEN(DT_PATH(zephyr_user), i2cs) > 0) ||                                   \
+	DT_NODE_EXISTS(DT_NODELABEL(arduino_i2c))
 extern arduino::ZephyrI2C Wire;
+#endif
 
 typedef arduino::ZephyrI2C TwoWire;
diff --git a/variants/arduino_mkrzero/arduino_mkrzero.overlay b/variants/arduino_mkrzero/arduino_mkrzero.overlay
@@ -45,6 +45,7 @@
 		io-channel-pins = <15 16 17 18 19 20 21>;
 
 		serials = <&sercom5>;
+		i2cs = <&sercom0>;
 	};
 };
 
diff --git a/variants/arduino_mkrzero/arduino_mkrzero_pinmap.h b/variants/arduino_mkrzero/arduino_mkrzero_pinmap.h
@@ -10,5 +10,3 @@
 #include <zephyr/drivers/i2c.h>
 
 #define LED_BUILTIN 22
-
-const static struct device *i2c_dev = DEVICE_DT_GET(DT_NODELABEL(sercom0));
diff --git a/variants/arduino_nano_33_ble/arduino_nano_33_ble.overlay b/variants/arduino_nano_33_ble/arduino_nano_33_ble.overlay
@@ -43,6 +43,7 @@
 		io-channel-pins = <14 15 16 17 18 19 20 21>;
 
 		serials = <&uart0>;
+		i2cs = <&arduino_nano_i2c>;
 	};
 };
 
diff --git a/variants/arduino_nano_33_ble/arduino_nano_33_ble_pinmap.h b/variants/arduino_nano_33_ble/arduino_nano_33_ble_pinmap.h
@@ -12,5 +12,3 @@
 #include <zephyr/device.h>
 
 #define LED_BUILTIN 13
-
-const static struct device *i2c_dev = DEVICE_DT_GET(DT_NODELABEL(i2c0));
diff --git a/variants/arduino_nano_33_ble_sense/arduino_nano_33_ble_sense.overlay b/variants/arduino_nano_33_ble_sense/arduino_nano_33_ble_sense.overlay
@@ -43,6 +43,7 @@
 		io-channel-pins = <14 15 16 17 18 19 20 21>;
 
 		serials = <&uart0>;
+		i2cs = <&arduino_nano_i2c>;
 	};
 };
 
diff --git a/variants/arduino_nano_33_ble_sense/arduino_nano_33_ble_sense_pinmap.h b/variants/arduino_nano_33_ble_sense/arduino_nano_33_ble_sense_pinmap.h
@@ -12,5 +12,3 @@
 #include <zephyr/device.h>
 
 #define LED_BUILTIN 13
-
-const static struct device *i2c_dev = DEVICE_DT_GET(DT_NODELABEL(i2c0));
diff --git a/variants/arduino_nano_33_iot/arduino_nano_33_iot.overlay b/variants/arduino_nano_33_iot/arduino_nano_33_iot.overlay
@@ -45,6 +45,7 @@
 		io-channel-pins = <14 15 16 17 18 19 20 21>;
 
 		serials = <&sercom5>;
+		i2cs = <&arduino_nano_i2c>;
 	};
 };
 
diff --git a/variants/arduino_nano_33_iot/arduino_nano_33_iot_pinmap.h b/variants/arduino_nano_33_iot/arduino_nano_33_iot_pinmap.h
@@ -12,6 +12,3 @@
 #include <zephyr/device.h>
 
 #define LED_BUILTIN 13
-
-const static struct device *i2c_dev =
-			DEVICE_DT_GET(DT_NODELABEL(arduino_nano_i2c));
diff --git a/variants/nrf52840dk_nrf52840/nrf52840dk_nrf52840_pinmap.h b/variants/nrf52840dk_nrf52840/nrf52840dk_nrf52840_pinmap.h
@@ -13,6 +13,4 @@
 
 #define LED_BUILTIN 22
 
-const static struct device *i2c_dev = DEVICE_DT_GET(DT_NODELABEL(arduino_i2c));
-
 #endif
