From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Patrick Rudolph <patrick.rudolph@9elements.com>,
Linus Walleij <linus.walleij@linaro.org>,
Sasha Levin <sashal@kernel.org>,
linux-gpio@vger.kernel.org
Subject: [PATCH AUTOSEL 6.6 36/39] pinctrl: cy8c95x0: Fix regression
Date: Mon, 25 Dec 2023 19:19:26 -0500 [thread overview]
Message-ID: <20231226002021.4776-36-sashal@kernel.org> (raw)
In-Reply-To: <20231226002021.4776-1-sashal@kernel.org>
From: Patrick Rudolph <patrick.rudolph@9elements.com>
[ Upstream commit 04dfca968cf7349773126340991b68a83378aca2 ]
Commit 1fa3df901f2c ("pinctrl: cy8c95x0: Remove custom ->set_config()")
removed support for PIN_CONFIG_INPUT_ENABLE and
PIN_CONFIG_OUTPUT.
Add the following options to restore functionality:
- PIN_CONFIG_INPUT_ENABLE
- PIN_CONFIG_OUTPUT_ENABLE
Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Link: https://lore.kernel.org/r/20231219125120.4028862-2-patrick.rudolph@9elements.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/pinctrl/pinctrl-cy8c95x0.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/pinctrl/pinctrl-cy8c95x0.c b/drivers/pinctrl/pinctrl-cy8c95x0.c
index 993b30ebc6841..280d7ebd50b71 100644
--- a/drivers/pinctrl/pinctrl-cy8c95x0.c
+++ b/drivers/pinctrl/pinctrl-cy8c95x0.c
@@ -307,6 +307,9 @@ static const char * const cy8c95x0_groups[] = {
"gp77",
};
+static int cy8c95x0_pinmux_direction(struct cy8c95x0_pinctrl *chip,
+ unsigned int pin, bool input);
+
static inline u8 cypress_get_port(struct cy8c95x0_pinctrl *chip, unsigned int pin)
{
/* Account for GPORT2 which only has 4 bits */
@@ -726,6 +729,7 @@ static int cy8c95x0_gpio_set_pincfg(struct cy8c95x0_pinctrl *chip,
u8 port = cypress_get_port(chip, off);
u8 bit = cypress_get_pin_mask(chip, off);
unsigned long param = pinconf_to_config_param(config);
+ unsigned long arg = pinconf_to_config_argument(config);
unsigned int reg;
int ret;
@@ -764,6 +768,12 @@ static int cy8c95x0_gpio_set_pincfg(struct cy8c95x0_pinctrl *chip,
case PIN_CONFIG_MODE_PWM:
reg = CY8C95X0_PWMSEL;
break;
+ case PIN_CONFIG_OUTPUT_ENABLE:
+ ret = cy8c95x0_pinmux_direction(chip, off, !arg);
+ goto out;
+ case PIN_CONFIG_INPUT_ENABLE:
+ ret = cy8c95x0_pinmux_direction(chip, off, arg);
+ goto out;
default:
ret = -ENOTSUPP;
goto out;
--
2.43.0
next prev parent reply other threads:[~2023-12-26 0:21 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-26 0:18 [PATCH AUTOSEL 6.6 01/39] Input: psmouse - enable Synaptics InterTouch for ThinkPad L14 G1 Sasha Levin
2023-12-26 0:18 ` [PATCH AUTOSEL 6.6 02/39] reset: hisilicon: hi6220: fix Wvoid-pointer-to-enum-cast warning Sasha Levin
2023-12-26 0:18 ` [PATCH AUTOSEL 6.6 03/39] Input: atkbd - skip ATKBD_CMD_GETID in translated mode Sasha Levin
2023-12-26 0:18 ` [PATCH AUTOSEL 6.6 04/39] Input: i8042 - add nomux quirk for Acer P459-G2-M Sasha Levin
2023-12-26 0:18 ` [PATCH AUTOSEL 6.6 05/39] Input: amimouse - convert to platform remove callback returning void Sasha Levin
2023-12-26 0:18 ` [PATCH AUTOSEL 6.6 06/39] pinctrl: amd: Mask non-wake source pins with interrupt enabled at suspend Sasha Levin
2023-12-26 0:18 ` [PATCH AUTOSEL 6.6 07/39] spi: cadence: revert "Add SPI transfer delays" Sasha Levin
2023-12-26 0:18 ` [PATCH AUTOSEL 6.6 08/39] ASoC: cs35l45: Use modern pm_ops Sasha Levin
2023-12-26 0:18 ` [PATCH AUTOSEL 6.6 09/39] ASoC: cs35l45: Prevent IRQ handling when suspending/resuming Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 10/39] ASoC: cs35l45: Prevents spinning during runtime suspend Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 11/39] s390/scm: fix virtual vs physical address confusion Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 12/39] ARC: fix spare error Sasha Levin
2023-12-26 0:19 ` Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 13/39] ARC: fix smatch warning Sasha Levin
2023-12-26 0:19 ` Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 14/39] wifi: iwlwifi: pcie: avoid a NULL pointer dereference Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 15/39] Input: xpad - add Razer Wolverine V2 support Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 16/39] driver core: Add a guard() definition for the device_lock() Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 17/39] kselftest: alsa: fixed a print formatting warning Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 18/39] HID: nintendo: fix initializer element is not constant error Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 19/39] platform/x86: thinkpad_acpi: fix for incorrect fan reporting on some ThinkPad systems Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 20/39] platform/x86/amd/pmc: Move platform defines to header Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 21/39] platform/x86/amd/pmc: Only run IRQ1 firmware version check on Cezanne Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 22/39] platform/x86/amd/pmc: Move keyboard wakeup disablement detection to pmc-quirks Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 23/39] platform/x86/amd/pmc: Disable keyboard wakeup on AMD Framework 13 Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 24/39] ASoC: Intel: bytcr_rt5640: Add quirk for the Medion Lifetab S10346 Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 25/39] ASoC: Intel: bytcr_rt5640: Add new swapped-speakers quirk Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 26/39] ALSA: hda/realtek: Add quirks for ASUS Zenbook 2022 Models Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 27/39] dm audit: fix Kconfig so DM_AUDIT depends on BLK_DEV_DM Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 28/39] HID: nintendo: Prevent divide-by-zero on code Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 29/39] smb: client: fix potential OOB in smb2_dump_detail() Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 30/39] Revert "nvme-fc: fix race between error recovery and creating association" Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 31/39] i2c: rk3x: fix potential spinlock recursion on poll Sasha Levin
2023-12-26 0:19 ` Sasha Levin
2023-12-26 0:19 ` Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 32/39] drm/amdkfd: svm range always mapped flag not working on APU Sasha Levin
2023-12-26 0:19 ` Sasha Levin
2023-12-26 0:19 ` Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 33/39] drm/amd/display: Add case for dcn35 to support usb4 dmub hpd event Sasha Levin
2023-12-26 0:19 ` Sasha Levin
2023-12-26 0:19 ` Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 34/39] drm/amd/display: get dprefclk ss info from integration info table Sasha Levin
2023-12-26 0:19 ` Sasha Levin
2023-12-26 0:19 ` Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 35/39] pinctrl: cy8c95x0: Fix typo Sasha Levin
2023-12-26 0:19 ` Sasha Levin [this message]
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 37/39] pinctrl: cy8c95x0: Fix get_pincfg Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 38/39] posix-timers: Get rid of [COMPAT_]SYS_NI() uses Sasha Levin
2023-12-26 0:19 ` Sasha Levin
2023-12-26 0:19 ` Sasha Levin
2023-12-26 0:19 ` [PATCH AUTOSEL 6.6 39/39] ida: Fix crash in ida_free when the bitmap is empty Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231226002021.4776-36-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=patrick.rudolph@9elements.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.