Skip to contentSkip to conversation

sandbox: Fix pinmux warnings with non-test devicetrees

PATCH Superseded Sean Anderson 2 participants 2 messages Aug 16, 2024

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 sandbox: Fix pinmux warnings with non-test devicetrees

The sandbox pinmux driver is used in the non-test devicetree as well as the test one. I didn't realize this when I modified the driver for tests, and so broke the regular use case (which only resulted in warnings). First, making the pinmux and the UART group available in all boot phases to avoid ENODEV errors. Then, convert the pin groups and functions to the new style, adding onewire group as well.

Fixes 7f0f1806e3a ("test: pinmux: Add test for pin muxing")
Closes https://source.denx.de/u-boot/u-boot/-/issues/2 Please enter the commit message for your changes. Lines starting

---

Changes in v2:
- Only add the pinctrl node pre-relocation, as SPL/VPL try to run dtoc on all nodes included in their device trees.

 arch/sandbox/dts/sandbox.dtsi                | 14 ++++++++------
 drivers/pinctrl/pinctrl-sandbox.c            |  4 +++-
 include/dt-bindings/pinctrl/sandbox-pinmux.h |  1 +
 3 files changed, 12 insertions(+), 7 deletions(-)
arch/sandbox/dts/sandbox.dtsi +8 -6
index c93ce712894..8a115c503dc 100644
@@ -231,23 +231,25 @@
 	};
 
 	pinctrl {
+		bootph-some-ram;
 		compatible = "sandbox,pinctrl";
 		status = "okay";
 
 		pinctrl_i2c0: i2c0 {
-			groups = "i2c";
-			function = "i2c";
+			groups = "I2C_UART";
+			function = "I2C";
 			bias-pull-up;
 		};
 
 		pinctrl_serial0: uart0 {
-			groups = "serial_a";
-			function = "serial";
+			bootph-some-ram;
+			groups = "I2C_UART";
+			function = "UART";
 		};
 
 		pinctrl_onewire0: onewire0 {
-			groups = "w1";
-			function = "w1";
+			pins = "P8";
+			function = "ONEWIRE";
 			bias-pull-up;
 		};
 	};
drivers/pinctrl/pinctrl-sandbox.c +3 -1
index a5d056643a0..f6921b56ceb 100644
@@ -42,7 +42,7 @@ static const char * const sandbox_pins_muxing[][2] = {
 	{ "GPIO0", "SPI CS0" },
 	{ "GPIO1", "SPI CS1" },
 	{ "GPIO2", "PWM0" },
-	{ "GPIO3", "PWM1" },
+	{ "GPIO3", "ONEWIRE" },
 };
 
 #define SANDBOX_GROUP_I2C_UART 0
@@ -63,6 +63,7 @@ static const char * const sandbox_functions[] = {
 	FUNC(GPIO),
 	FUNC(CS),
 	FUNC(PWM),
+	FUNC(ONEWIRE),
 #undef FUNC
 };
 
@@ -166,6 +167,7 @@ static int sandbox_pinmux_set(struct udevice *dev, unsigned pin_selector,
 		break;
 	case SANDBOX_PINMUX_CS:
 	case SANDBOX_PINMUX_PWM:
+	case SANDBOX_PINMUX_ONEWIRE:
 		mux = BIT(pin_selector);
 		break;
 	default:
include/dt-bindings/pinctrl/sandbox-pinmux.h +1 -0
index 891af072e52..21c5a1762ab 100644
@@ -13,6 +13,7 @@
 #define SANDBOX_PINMUX_GPIO 4
 #define SANDBOX_PINMUX_CS   5
 #define SANDBOX_PINMUX_PWM  6
+#define SANDBOX_PINMUX_ONEWIRE 7
 
 #define SANDBOX_PINMUX(pin, func) ((func) << 16 | (pin))
 
Signature · 1 line
2.37.1
#1 lore raw

Hi Sean,

Quoted 10 lines · Sean Anderson

The sandbox pinmux driver is used in the non-test devicetree as well as the test one. I didn't realize this when I modified the driver for tests, and so broke the regular use case (which only resulted in warnings). First, making the pinmux and the UART group available in all boot phases to avoid ENODEV errors. Then, convert the pin groups and functions to the new style, adding onewire group as well.

Fixes 7f0f1806e3a ("test: pinmux: Add test for pin muxing")
Closes https://source.denx.de/u-boot/u-boot/-/issues/2 Please enter the commit message for your changes. Lines starting

Something strange there ^

Quoted 4 lines

---

Quoted 8 lines

Changes in v2:
- Only add the pinctrl node pre-relocation, as SPL/VPL try to run dtoc on all nodes included in their device trees.

 arch/sandbox/dts/sandbox.dtsi                | 14 ++++++++------
 drivers/pinctrl/pinctrl-sandbox.c            |  4 +++-
 include/dt-bindings/pinctrl/sandbox-pinmux.h |  1 +
 3 files changed, 12 insertions(+), 7 deletions(-)

Regards,
Simon