From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93D55C43381 for ; Fri, 22 Mar 2019 13:08:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 620EB213F2 for ; Fri, 22 Mar 2019 13:08:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553260090; bh=vwP4nt3nm8H2W1cFWdXGJWuIwKSdvIBjllBo+fvlY7o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bfD/q/iWE7ZeZ9+lbTty5m+zbq4COaUfvRIqmhcyjcO3DJXS8PyMkGb55ExL3Mmy7 AjeiajNN+mEgb+ggi/YHcB5y/vLHn2v6uyj3W4GdtcQbCJ2eJnUQwAMoYpw7TH2WJ+ +ce8RnHpF4R57N+ofwiE1SzsbX9pfQYlW+finzeI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731017AbfCVNII (ORCPT ); Fri, 22 Mar 2019 09:08:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:36592 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730054AbfCVLfk (ORCPT ); Fri, 22 Mar 2019 07:35:40 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C8DA72183E; Fri, 22 Mar 2019 11:35:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553254539; bh=vwP4nt3nm8H2W1cFWdXGJWuIwKSdvIBjllBo+fvlY7o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zAkp19RrpOsr2q6M5xC5dKm24a0+Y+74hCfYbFLGnqZIHh1+lZbe4Gkic48Oh+ApA OikObo/W7HBxNHYm6w+sb+NtY3PqyxdMWa9zEpRkvNvhRnCt+oQ2r/bVjYk6w96DiY DjPJ21ZNoUssZrY0KhSqbXp0uc4pFAcMttdJ2ysg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Martin Blumenstingl , Linus Walleij , Sasha Levin Subject: [PATCH 4.4 167/230] pinctrl: meson: meson8b: fix the sdxc_a data 1..3 pins Date: Fri, 22 Mar 2019 12:15:05 +0100 Message-Id: <20190322111248.470493533@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111236.796964179@linuxfoundation.org> References: <20190322111236.796964179@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ [ 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 b505b87661f8..07c4153e6f3d 100644 --- a/drivers/pinctrl/meson/pinctrl-meson8b.c +++ b/drivers/pinctrl/meson/pinctrl-meson8b.c @@ -656,7 +656,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