Received: by 2002:ac0:950c:0:0:0:0:0 with SMTP id f12csp3244319imc; Wed, 13 Mar 2019 12:34:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqzmkFFpjBRMKD7zURczm4FwRlL0oxOabvdRgvN+8I/dnYOoZRChZ/i1/XecElPeG3DA0lfM X-Received: by 2002:a62:ab04:: with SMTP id p4mr45386998pff.142.1552505653204; Wed, 13 Mar 2019 12:34:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552505653; cv=none; d=google.com; s=arc-20160816; b=TBavr6ybAprr6e3xP2UNOM2paL3QMBmaRDn0/3yijwBfLJQg7XkZFFT5qXyCAOxwZM 64YfunEO7S9nQXfU9o6pD9JDi30wUmaSmvqUeMNAXL7wTr5aUPq0GTuJxL2HyjRqqYR/ mzuwYoYwuVs2bxaZUc1JrORmwvMDyMue8KWTAO2Ayoh9uhaJwVfXRWK9mtvj37oMBCfk sbvPlg1pIPZbsZs+dRp92RJJj4844fx1o9JlmOcTtSQmbzFqB3xg6E80IDOLqgH0G6tB XpcXc0aMuduu8P88XhSuiCcINt6XpsHuH0TmtL9GmS7nMlYzHrfAi1m+rQdlXt6qj7Jc RLgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=viDgKEfY7nQUcplNoiThxEs3gTPd5K2M50lkWN4INiQ=; b=GaxXRVJRE+tNpA/V0cHOsLzq4pjrV+okz9Ry+UpLdnyhyNK7F0Rf2F8rrKY6sgHtoK 3nk+q1k5lX/nuw1cM5hdUicVRCunsDKk6bACR10OuPOaz4x/uNWvfJkKcoUvlBVzRb5l Iy3XSPrsf0osMwAAdf+2duiH/MwBQ5PntMLez6DOlLoMJ8zv+lGK259UwvNFgXihdT20 +hpmEJDm6BtMz0YILjG9+vm+LtXfPiRPGUpGBcik4x8fAUI2YnYLidMbfDqKsMNKbeeA 95pXvyCw14aP2IVwdalIPfYwsNCIbtRVkw0oCF1DSXcbN1ebwZzN7VBZta07n34TOzr1 kGVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=i5v8dJjd; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x17si10696835pgg.431.2019.03.13.12.33.57; Wed, 13 Mar 2019 12:34:13 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=i5v8dJjd; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727295AbfCMTLC (ORCPT + 99 others); Wed, 13 Mar 2019 15:11:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:41570 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727218AbfCMTK7 (ORCPT ); Wed, 13 Mar 2019 15:10:59 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9ACF221855; Wed, 13 Mar 2019 19:10:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552504258; bh=oy3dvynanRjImHK2flmvaHnoYG6sbJAJOPDGEKGTCBg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i5v8dJjdLevXNmBgS+EklZJDlKRPGjojiEmkC8k5YFslr0CDDkYqZ7yNGC6sA51pR FtcDPJlslENW4QhZxLo4X5AmjenRRocmZjOTZPMsBHPQG2/N9wylzw7CCHVbil7+eW qhdcxL6eAdNBWuOtlFbDxXQlNBn5imEMHDspw+xc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Martin Blumenstingl , Linus Walleij , Sasha Levin , linux-gpio@vger.kernel.org, linux-amlogic@lists.infradead.org Subject: [PATCH AUTOSEL 4.20 17/60] pinctrl: meson: meson8b: fix the sdxc_a data 1..3 pins Date: Wed, 13 Mar 2019 15:09:38 -0400 Message-Id: <20190313191021.158171-17-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190313191021.158171-1-sashal@kernel.org> References: <20190313191021.158171-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Martin Blumenstingl [ Upstream commit c17abcfa93bf0be5e48bb011607d237ac2bfc839 ] Fix the mismatch between the "sdxc_d13_1_a" pin group definition from meson8b_cbus_groups and the entry in sdxc_a_groups ("sdxc_d0_13_1_a"). This makes it possible to use "sdxc_d13_1_a" in device-tree files to route the MMC data 1..3 pins to GPIOX_1..3. Fixes: 0fefcb6876d0d6 ("pinctrl: Add support for Meson8b") Signed-off-by: Martin Blumenstingl Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- drivers/pinctrl/meson/pinctrl-meson8b.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pinctrl/meson/pinctrl-meson8b.c b/drivers/pinctrl/meson/pinctrl-meson8b.c index 91cffc051055..ead4beb5f55f 100644 --- a/drivers/pinctrl/meson/pinctrl-meson8b.c +++ b/drivers/pinctrl/meson/pinctrl-meson8b.c @@ -665,7 +665,7 @@ static const char * const sd_a_groups[] = { static const char * const sdxc_a_groups[] = { "sdxc_d0_0_a", "sdxc_d13_0_a", "sdxc_d47_a", "sdxc_clk_a", - "sdxc_cmd_a", "sdxc_d0_1_a", "sdxc_d0_13_1_a" + "sdxc_cmd_a", "sdxc_d0_1_a", "sdxc_d13_1_a" }; static const char * const pcm_a_groups[] = { -- 2.19.1