Merge pull request #394 from pillo79/remove-dynamic-pinctrl

loader: remove unnecessary PINCTRL_DYNAMIC

Author: pennam

cores/arduino/zephyrCommon.cpp

@@ -7,7 +7,6 @@
 #include <Arduino.h>
 #include "zephyrInternal.h"
 
-#ifdef CONFIG_PINCTRL_DYNAMIC
 // create an array of arduino_pins with functions to reinitialize pins if needed
 static const struct device *pinmux_array[DT_PROP_LEN(DT_PATH(zephyr_user), digital_pin_gpios)] = {
 	nullptr};
@@ -20,7 +19,6 @@ void _reinit_peripheral_if_needed(pin_size_t pin, const struct device *dev) {
 		}
 	}
 }
-#endif
 
 static const struct gpio_dt_spec arduino_pins[] = {
 	DT_FOREACH_PROP_ELEM_SEP(
@@ -224,9 +222,7 @@ void yield(void) {
  *  A high physical level will be interpreted as value 1
  */
 void pinMode(pin_size_t pinNumber, PinMode pinMode) {
-#ifdef CONFIG_PINCTRL_DYNAMIC
 	_reinit_peripheral_if_needed(pinNumber, NULL);
-#endif
 	if (pinMode == INPUT) { // input mode
 		gpio_pin_configure_dt(&arduino_pins[pinNumber], GPIO_INPUT | GPIO_ACTIVE_HIGH);
 	} else if (pinMode == INPUT_PULLUP) { // input with internal pull-up
@@ -330,9 +326,7 @@ void analogWrite(pin_size_t pinNumber, int value) {
 		return;
 	}
 
-#ifdef CONFIG_PINCTRL_DYNAMIC
 	_reinit_peripheral_if_needed(pinNumber, arduino_pwm[idx].dev);
-#endif
 	value = map(value, 0, 1 << _analog_write_resolution, 0, arduino_pwm[idx].period);
 
 	if (((uint32_t)value) > arduino_pwm[idx].period) {
@@ -358,9 +352,7 @@ void analogWrite(enum dacPins dacName, int value) {
 
 	// TODO: add reverse map to find pin name from DAC* define
 	// In the meantime, consider A0 == DAC0
-#ifdef CONFIG_PINCTRL_DYNAMIC
 	_reinit_peripheral_if_needed((pin_size_t)(dacName + A0), dac_dev);
-#endif
 	dac_channel_setup(dac_dev, &dac_ch_cfg[dacName]);
 
 	const int max_dac_value = 1U << dac_ch_cfg[dacName].resolution;
@@ -411,9 +403,8 @@ int analogRead(pin_size_t pinNumber) {
 		return -ENOTSUP;
 	}
 
-#ifdef CONFIG_PINCTRL_DYNAMIC
 	_reinit_peripheral_if_needed(pinNumber, arduino_adc[idx].dev);
-#endif
+
 	err = adc_channel_setup(arduino_adc[idx].dev, &arduino_adc[idx].channel_cfg);
 	if (err < 0) {
 		return err;

cores/arduino/zephyrInternal.h

@@ -14,9 +14,7 @@ extern "C" {
 
 void enableInterrupt(pin_size_t);
 void disableInterrupt(pin_size_t);
-#ifdef CONFIG_PINCTRL_DYNAMIC
 void _reinit_peripheral_if_needed(pin_size_t pin, const struct device *dev);
-#endif
 
 #ifdef __cplusplus
 } // extern "C"

cores/arduino/zephyrSerial.cpp

@@ -59,9 +59,7 @@ void arduino::ZephyrSerial::begin(unsigned long baud, uint16_t conf) {
 		.flow_ctrl = UART_CFG_FLOW_CTRL_NONE,
 	};
 
-#ifdef CONFIG_PINCTRL_DYNAMIC
 	uart->ops.init(uart);
-#endif
 
 	uart_configure(uart, &config);
 	uart_irq_callback_user_data_set(uart, arduino::ZephyrSerial::IrqDispatch, this);

libraries/SPI/SPI.cpp

@@ -115,9 +115,7 @@ void arduino::ZephyrSPI::detachInterrupt() {
 }
 
 void arduino::ZephyrSPI::begin() {
-#ifdef CONFIG_PINCTRL_DYNAMIC
 	spi_dev->ops.init(spi_dev);
-#endif
 }
 
 void arduino::ZephyrSPI::end() {

libraries/Wire/Wire.cpp

@@ -57,9 +57,7 @@ arduino::ZephyrI2C::ZephyrI2C(const struct device *i2c) : i2c_cfg({0}), i2c_dev(
 }
 
 void arduino::ZephyrI2C::begin() {
-#ifdef CONFIG_PINCTRL_DYNAMIC
 	i2c_dev->ops.init(i2c_dev);
-#endif
 }
 
 void arduino::ZephyrI2C::begin(uint8_t slaveAddr) {

loader/prj.conf

@@ -27,7 +27,6 @@ CONFIG_LLEXT_EDK_FORMAT_TAR_ZSTD=y
 CONFIG_GPIO=y
 CONFIG_GPIO_GET_DIRECTION=y
 CONFIG_PINCTRL=y
-CONFIG_PINCTRL_DYNAMIC=y
 CONFIG_DEVICE_DEINIT_SUPPORT=y
 CONFIG_I2C=y
 CONFIG_SPI=y