Skip to content

pinctrl: Fix early return in sky1_pinconf_group_dbg_show #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
USAVault wants to merge 3 commits into
base: main
Choose a base branch
from
Open

pinctrl: Fix early return in sky1_pinconf_group_dbg_show #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f81f9b
Fix early return in sky1_pinconf_group_dbg_show
Jul 15, 2026
08c27f0
Update patch metadata line counts (+N/-N)
Jul 15, 2026
8850d86
Update patch metadata line counts (+N/-N)
Jul 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion patches-6.18/00485-pinctrl-sky1-add-acpi-support.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ diff --git a/drivers/pinctrl/cix/pinctrl-sky1-base.c b/drivers/pinctrl/cix/pinct
index 111111111111..222222222222 100644
--- a/drivers/pinctrl/cix/pinctrl-sky1-base.c
+++ b/drivers/pinctrl/cix/pinctrl-sky1-base.c
@@ -1,503 +1,711 @@
@@ -1,503 +1,715 @@
// SPDX-License-Identifier: GPL-2.0+
//
// Author: Jerry Zhu <Jerry.Zhu@cixtech.com>
Expand Down Expand Up @@ -594,6 +594,9 @@ index 111111111111..222222222222 100644
{
- return ARRAY_SIZE(sky1_gpio_functions);
+ struct sky1_pinctrl *spctl = pinctrl_dev_get_drvdata(pctldev);
+
+ if (spctl->pin_regs[pin_id] == -1)
+ return -EINVAL;
+ *config = readl(spctl->base + spctl->pin_regs[pin_id]);
+
+ return 0;
Expand Down Expand Up @@ -675,6 +678,7 @@ index 111111111111..222222222222 100644
+
+ name = pin_get_name(pctldev, pin_id);
+ ret = sky1_pinconf_get(pctldev, pin_id, &config);
+ if (ret)
+ return;
+ seq_printf(s, " %s: 0x%lx\n", name, config);
+ }
Expand Down
6 changes: 5 additions & 1 deletion patches-7.0/0048-pinctrl-sky1-add-acpi-support.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ diff --git a/drivers/pinctrl/cix/pinctrl-sky1-base.c b/drivers/pinctrl/cix/pinct
index 111111111111..222222222222 100644
--- a/drivers/pinctrl/cix/pinctrl-sky1-base.c
+++ b/drivers/pinctrl/cix/pinctrl-sky1-base.c
@@ -1,503 +1,711 @@
@@ -1,503 +1,715 @@
// SPDX-License-Identifier: GPL-2.0+
//
// Author: Jerry Zhu <Jerry.Zhu@cixtech.com>
Expand Down Expand Up @@ -594,6 +594,9 @@ index 111111111111..222222222222 100644
{
- return ARRAY_SIZE(sky1_gpio_functions);
+ struct sky1_pinctrl *spctl = pinctrl_dev_get_drvdata(pctldev);
+
+ if (spctl->pin_regs[pin_id] == -1)
+ return -EINVAL;
+ *config = readl(spctl->base + spctl->pin_regs[pin_id]);
+
+ return 0;
Expand Down Expand Up @@ -675,6 +678,7 @@ index 111111111111..222222222222 100644
+
+ name = pin_get_name(pctldev, pin_id);
+ ret = sky1_pinconf_get(pctldev, pin_id, &config);
+ if (ret)
+ return;
+ seq_printf(s, " %s: 0x%lx\n", name, config);
+ }
Expand Down
6 changes: 5 additions & 1 deletion patches-7.1/0048-pinctrl-sky1-add-acpi-support.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ diff --git a/drivers/pinctrl/cix/pinctrl-sky1-base.c b/drivers/pinctrl/cix/pinct
index 111111111111..222222222222 100644
--- a/drivers/pinctrl/cix/pinctrl-sky1-base.c
+++ b/drivers/pinctrl/cix/pinctrl-sky1-base.c
@@ -1,503 +1,711 @@
@@ -1,503 +1,715 @@
// SPDX-License-Identifier: GPL-2.0+
//
// Author: Jerry Zhu <Jerry.Zhu@cixtech.com>
Expand Down Expand Up @@ -594,6 +594,9 @@ index 111111111111..222222222222 100644
{
- return ARRAY_SIZE(sky1_gpio_functions);
+ struct sky1_pinctrl *spctl = pinctrl_dev_get_drvdata(pctldev);
+
+ if (spctl->pin_regs[pin_id] == -1)
+ return -EINVAL;
+ *config = readl(spctl->base + spctl->pin_regs[pin_id]);
+
+ return 0;
Expand Down Expand Up @@ -675,6 +678,7 @@ index 111111111111..222222222222 100644
+
+ name = pin_get_name(pctldev, pin_id);
+ ret = sky1_pinconf_get(pctldev, pin_id, &config);
+ if (ret)
+ return;
+ seq_printf(s, " %s: 0x%lx\n", name, config);
+ }
Expand Down