Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp729604ybl; Fri, 24 Jan 2020 08:30:51 -0800 (PST) X-Google-Smtp-Source: APXvYqwAEdvSnqYQQjH4C+GFmOJo3dKdIYSOBm4BtVlgQFcDzU0BAQf7+j2MKgekmX6r8vTI6I5n X-Received: by 2002:a9d:6b12:: with SMTP id g18mr3183164otp.211.1579883451353; Fri, 24 Jan 2020 08:30:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579883451; cv=none; d=google.com; s=arc-20160816; b=y+gGhpTmAPBYpg+AolQKbpe0XNCmRdgA6VRur6XPKrYvLilKw3iObinN6YqcBDyW9O NlWaMNBQRmRVSAigky5UMW93Bd2djt/zDvqQ5D0nZ+xHW84xJX3gSq7A5NgLBdUvK/lQ 5tLj4h+qJpmxptWC2C6O1ScMXh9gz8EX0L9DGhSGUM0a4Ps/8pZXo9z7DTB/SA5Owrc0 dfKvfKFptoOGFD+xS1a27jNaQD8LUcCk7Dkr01mJA37n79NRZhsFufEZWldmNpHNiuQV RdOA0RbqFU4vnJSK5cBKSeABVvemD3/E0nYx+KLSMXTFBs0sWDIhAvL6lXQ5sWyNNWXL W/cA== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=PKK3SYch5udm/OB6Q9p7EI1k1YjLL/yx/Z7+Pxh76v4=; b=Vf20vWVxJ77YAQ5kgA2XG2tXpPDMu2HJq0I69TTC2y9A3DjpLarydoqvTtX6hOzi4T 6Sr0Kx5yUcZ1ZDWKlSMzXpthwibB+/K/CS8e6CJj1mwHovJWy0AtfW1NO69WkRYKhooR +t6lSlBqvjq0WYUBUFeY8ZQNDud4m3iOWOiQK7kLAeH01thvypx5za9OePSnx5Hme/cY iXqzTYmKpQhcJC9Lji1yz9Px5r7/I1HiCjnsU4+JZVSvsJ7qyvEwhotR6E7Q+k9nnK68 T0w4tM0E73IwyFsUVKAHK2BIAJOJN1KqVcExPowwg9hkoqvfKa0YDSw9s5gcEawANew4 b5jQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Td4dqvY5; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m8si13334oim.180.2020.01.24.08.30.38; Fri, 24 Jan 2020 08:30:51 -0800 (PST) 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=Td4dqvY5; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388452AbgAXLDy (ORCPT + 99 others); Fri, 24 Jan 2020 06:03:54 -0500 Received: from mail.kernel.org ([198.145.29.99]:37762 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388428AbgAXLDv (ORCPT ); Fri, 24 Jan 2020 06:03:51 -0500 Received: from localhost (ip-213-127-102-57.ip.prioritytelecom.net [213.127.102.57]) (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 135812071A; Fri, 24 Jan 2020 11:03:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579863830; bh=7VSQKbGMMscl4B1bdBXn6qoEVc6g38iNuhlh4ppHep0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Td4dqvY5wlZzg9RfHPSwx62prMWXbCU4Co/0no+KtjdzsAko0IHs7eAb9lS4B80N1 gQ4QG9rpw9EBoWbwuaWT87W3e64TSHx2KGWFSoR2ZepHVAyVVXXPtN/vXMJ3YT3ahl 9PH/LUOSK7u7adEDTKhIpUAl/QKP1uTHhy9aLnbE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Geert Uytterhoeven , Simon Horman , Sasha Levin Subject: [PATCH 4.19 087/639] pinctrl: sh-pfc: r8a7791: Remove bogus ctrl marks from qspi_data4_b group Date: Fri, 24 Jan 2020 10:24:17 +0100 Message-Id: <20200124093058.245785019@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124093047.008739095@linuxfoundation.org> References: <20200124093047.008739095@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Geert Uytterhoeven [ Upstream commit 884fa25fb6e5e63ab970d612a628313bb68f37cc ] The qspi_data4_b_mux[] array contains pin marks for the clock and chip select pins. The qspi_data4_b_pins[] array rightfully does not contain the corresponding pin numbers, as the control pins are provided by a separate group (qspi_ctrl_b). Fixes: 2d0c386f135e4186 ("pinctrl: sh-pfc: r8a7791: Add QSPI pin groups") Signed-off-by: Geert Uytterhoeven Reviewed-by: Simon Horman Signed-off-by: Sasha Levin --- drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c index 5811784d88cb9..f5b4255570b28 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c @@ -3220,8 +3220,7 @@ static const unsigned int qspi_data4_b_pins[] = { RCAR_GP_PIN(6, 4), }; static const unsigned int qspi_data4_b_mux[] = { - SPCLK_B_MARK, MOSI_IO0_B_MARK, MISO_IO1_B_MARK, - IO2_B_MARK, IO3_B_MARK, SSL_B_MARK, + MOSI_IO0_B_MARK, MISO_IO1_B_MARK, IO2_B_MARK, IO3_B_MARK, }; /* - SCIF0 ------------------------------------------------------------------ */ static const unsigned int scif0_data_pins[] = { -- 2.20.1