Commit 500c77ee authored by Gerhard Engleder's avatar Gerhard Engleder Committed by Andy Shevchenko
Browse files

pinctrl: zynqmp: Revert "Unify pin naming" 



This reverts commit 54784ff2.

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: default avatarGerhard Engleder <gerhard@engleder-embedded.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
parent e12963c4

drivers/pinctrl/pinctrl-zynqmp.c

+4 −6
Original line number Diff line number Diff line
@@ -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;