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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 B583EC2D0DB for ; Tue, 28 Jan 2020 14:07:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8898C24690 for ; Tue, 28 Jan 2020 14:07:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580220455; bh=47QHAQnMJQqtu79/a918FFjScaQhZItkcHHd8vbO/LE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kvS6z8J6L9z04ANt/ljWbltvaCk6YIZy4OsbuYmRdWS+pdaNCx2ow4G0ioUJqSNf2 f+jr3s4EevxYcm3GZngMHrkBuHwjyfdsItH1XrH1zpJn9RNrRtnDbjZ2KNnwjz15yI f1bJRkeQXi4yvdKUmoRhNCerGCm9IXkJHl1NCU1o= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727521AbgA1OHe (ORCPT ); Tue, 28 Jan 2020 09:07:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:55238 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728034AbgA1OHc (ORCPT ); Tue, 28 Jan 2020 09:07:32 -0500 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 7F51422522; Tue, 28 Jan 2020 14:07:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580220452; bh=47QHAQnMJQqtu79/a918FFjScaQhZItkcHHd8vbO/LE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gHezmCEMaAWFzH7+wQE6rzwvuwAo+eYKc+tKXY0GgipITAyZcr6SoeGT0xbbaF7Ry uSh0fb5uLCDlF0OX3ipueG/YPhFLGXfTWNKzfiPXUMVEb31nW5dU+ADeBAnLpfd9Y6 2pWlK8cNHa8JAervXAFdXWdaNpv0e1XqjsvA0sQ8= 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.4 013/183] pinctrl: sh-pfc: r8a7791: Remove bogus ctrl marks from qspi_data4_b group Date: Tue, 28 Jan 2020 15:03:52 +0100 Message-Id: <20200128135831.084074125@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200128135829.486060649@linuxfoundation.org> References: <20200128135829.486060649@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 42ffa8708abc6..4fbd6d8067196 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c @@ -3059,8 +3059,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