diff options
| author | Gerhard Engleder <gerhard@engleder-embedded.com> | 2022-01-27 20:46:02 +0100 |
|---|---|---|
| committer | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2022-01-28 15:52:04 +0100 |
| commit | 500c77eed0feabddd5b3afb48e32c204614a8eab (patch) | |
| tree | 3e71d7529fa8825180fd4175f55eac036a6c4f84 /drivers/pinctrl/pinctrl-zynqmp.c | |
| parent | pinctrl: intel: Fix a glitch when updating IRQ flags on a preconfigured line (diff) | |
| download | linux-500c77eed0feabddd5b3afb48e32c204614a8eab.tar.xz linux-500c77eed0feabddd5b3afb48e32c204614a8eab.zip | |
pinctrl: zynqmp: Revert "Unify pin naming"
This reverts commit 54784ff24971ed5bd3f1056edce998148709d0a7.
This patch changes the pin names from "MIO%d" to "MIO-%d", but all dts
in arch/arm64/boot/dts/xilinx still use the old name. As a result my
ZCU104 has no output on serial terminal and is not reachable over
network.
Signed-off-by: Gerhard Engleder <gerhard@engleder-embedded.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Diffstat (limited to 'drivers/pinctrl/pinctrl-zynqmp.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl-zynqmp.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/pinctrl/pinctrl-zynqmp.c b/drivers/pinctrl/pinctrl-zynqmp.c index 42da6bd399ee..e14012209992 100644 --- a/drivers/pinctrl/pinctrl-zynqmp.c +++ b/drivers/pinctrl/pinctrl-zynqmp.c @@ -809,7 +809,6 @@ static int zynqmp_pinctrl_prepare_pin_desc(struct device *dev, unsigned int *npins) { struct pinctrl_pin_desc *pins, *pin; - char **pin_names; int ret; int i; @@ -821,14 +820,13 @@ static int zynqmp_pinctrl_prepare_pin_desc(struct device *dev, if (!pins) return -ENOMEM; - pin_names = devm_kasprintf_strarray(dev, ZYNQMP_PIN_PREFIX, *npins); - if (IS_ERR(pin_names)) - return PTR_ERR(pin_names); - for (i = 0; i < *npins; i++) { pin = &pins[i]; pin->number = i; - pin->name = pin_names[i]; + pin->name = devm_kasprintf(dev, GFP_KERNEL, "%s%d", + ZYNQMP_PIN_PREFIX, i); + if (!pin->name) + return -ENOMEM; } *zynqmp_pins = pins; |