leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pinctrl: zynqmp: Revert "Unify pin naming"

Browse Source 
This reverts commit 54784ff249.

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>
This commit is contained in:
Gerhard Engleder 2022-01-27 20:46:02 +01:00 committed by Andy Shevchenko
parent e12963c453
commit 500c77eed0
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/pinctrl/pinctrl-zynqmp.c
View File

@ -809,7 +809,6 @@ static int zynqmp_pinctrl_prepare_pin_desc(struct device *dev,
unsigned int *npins) unsigned int *npins)
{ {
struct pinctrl_pin_desc *pins, *pin; struct pinctrl_pin_desc *pins, *pin;
char **pin_names;
int ret; int ret;
int i; int i;
@ -821,14 +820,13 @@ static int zynqmp_pinctrl_prepare_pin_desc(struct device *dev,
if (!pins) if (!pins)
return -ENOMEM; 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++) { for (i = 0; i < *npins; i++) {
pin = &pins[i]; pin = &pins[i];
pin->number = 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; *zynqmp_pins = pins;