From 1f8c83cfb7aadf69b3f8d744594d7a635e1f1a4d Mon Sep 17 00:00:00 2001 From: Muhammed Efe Cetin Date: Thu, 11 Sep 2025 14:32:16 +0300 Subject: [PATCH] rockchip64: current: fix some rk3588 boards stuck in initramfs stage --- ...evicetree-do-not-goto-err-when-probi.patch | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 patch/kernel/archive/rockchip64-6.12/general-revert-pinctrl-devicetree-do-not-goto-err-when-probi.patch diff --git a/patch/kernel/archive/rockchip64-6.12/general-revert-pinctrl-devicetree-do-not-goto-err-when-probi.patch b/patch/kernel/archive/rockchip64-6.12/general-revert-pinctrl-devicetree-do-not-goto-err-when-probi.patch new file mode 100644 index 000000000..4a367f8dd --- /dev/null +++ b/patch/kernel/archive/rockchip64-6.12/general-revert-pinctrl-devicetree-do-not-goto-err-when-probi.patch @@ -0,0 +1,44 @@ +From 6463e1b4a407055793eb9c1f664f779df8e36442 Mon Sep 17 00:00:00 2001 +From: Muhammed Efe Cetin +Date: Thu, 11 Sep 2025 02:47:34 +0300 +Subject: [PATCH] Revert "pinctrl: devicetree: do not goto err when probing + hogs in pinctrl_dt_to_map" + +This reverts commit 5b1b4cb46d9514bec053b392d2266f00e0d6ee19. +--- + drivers/pinctrl/devicetree.c | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +diff --git a/drivers/pinctrl/devicetree.c b/drivers/pinctrl/devicetree.c +index 0b7f74beb6a6..6a94ecd6a8de 100644 +--- a/drivers/pinctrl/devicetree.c ++++ b/drivers/pinctrl/devicetree.c +@@ -143,14 +143,10 @@ static int dt_to_map_one_config(struct pinctrl *p, + pctldev = get_pinctrl_dev_from_of_node(np_pctldev); + if (pctldev) + break; +- /* +- * Do not defer probing of hogs (circular loop) +- * +- * Return 1 to let the caller catch the case. +- */ ++ /* Do not defer probing of hogs (circular loop) */ + if (np_pctldev == p->dev->of_node) { + of_node_put(np_pctldev); +- return 1; ++ return -ENODEV; + } + } + of_node_put(np_pctldev); +@@ -269,8 +265,6 @@ int pinctrl_dt_to_map(struct pinctrl *p, struct pinctrl_dev *pctldev) + ret = dt_to_map_one_config(p, pctldev, statename, + np_config); + of_node_put(np_config); +- if (ret == 1) +- continue; + if (ret < 0) + goto err; + } +-- +2.51.0 +