]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Revert "pinctrl: pinctrl-zynqmp: Add support for output-enable and bias-high-impedance"
authorSai Krishna Potthuri <sai.krishna.potthuri@amd.com>
Mon, 17 Oct 2022 13:03:02 +0000 (18:33 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 3 Nov 2022 15:00:24 +0000 (00:00 +0900)
commit 9989bc33c4894e0751679b91fc6eb585772487b9 upstream.

This reverts commit ad2bea79ef0144043721d4893eef719c907e2e63.

On systems with older PMUFW (Xilinx ZynqMP Platform Management Firmware)
using these pinctrl properties can cause system hang because there is
missing feature autodetection.
When this feature is implemented in the PMUFW, support for these two
properties should bring back.

Cc: stable@vger.kernel.org
Signed-off-by: Sai Krishna Potthuri <sai.krishna.potthuri@amd.com>
Acked-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/20221017130303.21746-2-sai.krishna.potthuri@amd.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/pinctrl/pinctrl-zynqmp.c

index 7d2fbf8a02cd667b2e3ef4161fa3544027b5eb0a..c98f35ad892173b0b1a2a37a16948b7541fdafd9 100644 (file)
@@ -412,10 +412,6 @@ static int zynqmp_pinconf_cfg_set(struct pinctrl_dev *pctldev,
 
                        break;
                case PIN_CONFIG_BIAS_HIGH_IMPEDANCE:
-                       param = PM_PINCTRL_CONFIG_TRI_STATE;
-                       arg = PM_PINCTRL_TRI_STATE_ENABLE;
-                       ret = zynqmp_pm_pinctrl_set_config(pin, param, arg);
-                       break;
                case PIN_CONFIG_MODE_LOW_POWER:
                        /*
                         * These cases are mentioned in dts but configurable
@@ -424,11 +420,6 @@ static int zynqmp_pinconf_cfg_set(struct pinctrl_dev *pctldev,
                         */
                        ret = 0;
                        break;
-               case PIN_CONFIG_OUTPUT_ENABLE:
-                       param = PM_PINCTRL_CONFIG_TRI_STATE;
-                       arg = PM_PINCTRL_TRI_STATE_DISABLE;
-                       ret = zynqmp_pm_pinctrl_set_config(pin, param, arg);
-                       break;
                default:
                        dev_warn(pctldev->dev,
                                 "unsupported configuration parameter '%u'\n",