From patchwork Thu Jan 27 19:46:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerhard Engleder X-Patchwork-Id: 12727216 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3606EC433F5 for ; Thu, 27 Jan 2022 19:47:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=KSPIfRcJcKaJDB/+kOLxWoJ+NFOD73+CM4yOzxLNUt4=; b=Qz090FN0Coa6eS RtRiomkTC7EP8QtXBECsE4JYjaUlMkx7BYYYL/UAeUXgoOsFsPbhhiIbaTCKKyKfGXPMDMRcidc7V vCtDRDgyDgtrSga05zTA0d+S4VLcFej5VzEnCxWYQNuR4juS80vJLbl2qCSpxh3n4Atovwudeemcm UVAflEvY/pJvQH+A+Hl4QZugIqutwJxeFdcWclXa9dwE9HseUaJY0QgUr3KoTZg34vkC59sK+FnGg 9F3irs9ifRky6E+TatoHqu/ZbtD7afS9s7Y7auEsZNeH+g1g59NOSXaKFNaX4SnUsL9m17eQ7uqEH 2OwHRP5Qu/FI29KVGUMA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nDAit-00GyHJ-Kk; Thu, 27 Jan 2022 19:46:23 +0000 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nDAip-00GyGT-DD for linux-arm-kernel@lists.infradead.org; Thu, 27 Jan 2022 19:46:21 +0000 Received: by mail-wr1-x432.google.com with SMTP id u15so6712227wrt.3 for ; Thu, 27 Jan 2022 11:46:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=engleder-embedded-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qTQLwKbcOfCpl69jctdP/i+1vLMGaSRzKXBbPhXN1/I=; b=wr/ZPwI/XbHrzU54kyHj1ZFl8YGCpCtKSIFrmfpygsNrI84ns4t1gC5gRIeJhIi0Q6 q70CH3Mt6dQtwCEMHOclX+W8WvjUvHOiFGfUKm/0a87bPKm4kQF8qE89fn/QQNZjwgAN jLN6/o7XprMXMhq7olvCuGWoI6RYKP4u0DGm1KsWs+fg7kgAsKsBqSqUtNW17CmauFm3 6Pv1DuuXCfHPKvJm/3Zm1xBAhX5lcD2e/ho9crGXzKBYQxFzi6RjnJz5Krqg50kOOZfx Gxqv5hWvzhCTvAtxqL+2n+PR0P8i/BVDi1q0DsxcBlGSWANbcio57pyuia7+8In5OMAG KjKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qTQLwKbcOfCpl69jctdP/i+1vLMGaSRzKXBbPhXN1/I=; b=lxf5f8a/SoK0p8t4Cjc+GWkcC8hbX/mJwUGZNmgmEQduJtrvftuXBq/LaJvac4VkFv JaGO4FxC1RwgsbXdbQR3kv+XV435MBjs4E33OD3W3T/9tIHKx8HQHr8xdOphhZNCsetS ndtsz7JQI2UREs8TuvY+pCjdsacjydkX7DeXhliQr/1BPlrzYjAeezV83UVG/4cUZ6Pg 49yeIyK0JolQX2EGQK2LCUmLRZaXE+IcpqrJmKxqL+bWffB1gFoOO+Z9NMYTrOl8vfD0 904+Sk9CLABDEkr+X/Wmmv2V2FXniVTxdSQYqDZuRiMHnWnyw6JWZc3ckEWefaDLs+zy 8+0Q== X-Gm-Message-State: AOAM531FxKfHRFqo0qF3aIpU43FOhSoOQpQgFPZPBcNr4UmeG7tNDQQQ uA2Lm2GXWtbH4IlSSypkdVMgZA== X-Google-Smtp-Source: ABdhPJxs/gFo4n6gj/9hf/bpvavujHnl7FmrWvwLkgmEv18+sTQpKpTxSxLTSK0E+b+LTEIEQNlWOg== X-Received: by 2002:adf:f60f:: with SMTP id t15mr4143519wrp.33.1643312776825; Thu, 27 Jan 2022 11:46:16 -0800 (PST) Received: from hornet.engleder.at ([2001:871:23a:8366:6e3b:e5ff:fe2c:34c1]) by smtp.gmail.com with ESMTPSA id r2sm4428532wrz.99.2022.01.27.11.46.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jan 2022 11:46:16 -0800 (PST) From: Gerhard Engleder To: andriy.shevchenko@linux.intel.com, linus.walleij@linaro.org, michal.simek@xilinx.com Cc: linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Gerhard Engleder Subject: [PATCH] Revert "pinctrl: zynqmp: Unify pin naming" Date: Thu, 27 Jan 2022 20:46:02 +0100 Message-Id: <20220127194602.21987-1-gerhard@engleder-embedded.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220127_114619_615072_834552A2 X-CRM114-Status: GOOD ( 13.52 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Gerhard Engleder 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 --- drivers/pinctrl/pinctrl-zynqmp.c | 10 ++++------ 1 file 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;