From patchwork Tue Jun 11 11:42:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2702641 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id A33FF40079 for ; Tue, 11 Jun 2013 11:42:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754700Ab3FKLm0 (ORCPT ); Tue, 11 Jun 2013 07:42:26 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:58366 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754677Ab3FKLmY (ORCPT ); Tue, 11 Jun 2013 07:42:24 -0400 Received: from axis700.grange (dslb-178-001-148-081.pools.arcor-ip.net [178.1.148.81]) by mrelayeu.kundenserver.de (node=mrbap3) with ESMTP (Nemesis) id 0Lkxnh-1UBvgd1Vrx-00ajjY; Tue, 11 Jun 2013 13:42:18 +0200 Received: by axis700.grange (Postfix, from userid 1000) id 06EF640BB5; Tue, 11 Jun 2013 13:42:18 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id 0434740BB4; Tue, 11 Jun 2013 13:42:18 +0200 (CEST) Date: Tue, 11 Jun 2013 13:42:17 +0200 (CEST) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: Simon Horman cc: linux-sh@vger.kernel.org, Laurent Pinchart , Magnus Damm Subject: [PATCH] pinctrl: r8a7790: fix two pin numbers Message-ID: MIME-Version: 1.0 X-Provags-ID: V02:K0:fIzv48aSQz6oBF7nG5ofjm9hFLuQzIOSzaZQ+vtVadS UGql+lVcLXYa6r4S9FozWFElYvnWHXkmWWYQLLLMVpE6fLexMK 7jlEhAOBUiL8MzfxMgAk9CioCaaIMPWtyu0gk0HM+kdMVC1LYk jUTLCW+2scI9P1CZbbhWDl7UgpF3JD9fArXvjMQmOCMPaUgGU+ BR48VpKaYNCWV/DGEroTGoxtbT35p//COvJRI5JMsTUm0smRsE 7SJFv0XG1NB1cfdEx5NAaBG9tGrq+uSLPy50g3LBzo2HYmksZR nFNNqG0vwcXWFLUPJaAgEcNbX0y6yLkaFnc+cAqPOi5JemBR+i LjejMogryk5xN3WWIxX81XBPrU7vDQpwKxT+ent3A/HnsH6AC3 JnkcafR5/Cieg== Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org Fix two erroneous MMCIF1 pin numbers on r8a7790. Signed-off-by: Guennadi Liakhovetski Acked-by: Laurent Pinchart --- Hi Simon You merged my earlier patch "pinctrl: r8a7790: add pinmux data for MMCIF and SDHI interfaces" whereas Laurent pointed out 2 wrong pin numbers in that version and I was supposed to fix them... Would it be possible to merge this fix with that original patch or could you apply it on top? Thanks Guennadi drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c index 85d77a4..1d4a5f7 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c @@ -2371,8 +2371,7 @@ static const unsigned int tpu0_to3_pins[] = { static const unsigned int tpu0_to3_mux[] = { TPU0TO3_MARK, }; - -/* - MMCIF ------------------------------------------------------------------ */ +/* - MMCIF0 ----------------------------------------------------------------- */ static const unsigned int mmc0_data1_pins[] = { /* D[0] */ RCAR_GP_PIN(3, 18), @@ -2406,7 +2405,7 @@ static const unsigned int mmc0_ctrl_pins[] = { static const unsigned int mmc0_ctrl_mux[] = { MMC0_CLK_MARK, MMC0_CMD_MARK, }; - +/* - MMCIF1 ----------------------------------------------------------------- */ static const unsigned int mmc1_data1_pins[] = { /* D[0] */ RCAR_GP_PIN(3, 26), @@ -2427,7 +2426,7 @@ static const unsigned int mmc1_data8_pins[] = { RCAR_GP_PIN(3, 26), RCAR_GP_PIN(3, 27), RCAR_GP_PIN(3, 28), RCAR_GP_PIN(3, 29), RCAR_GP_PIN(3, 30), RCAR_GP_PIN(3, 31), - RCAR_GP_PIN(3, 13), RCAR_GP_PIN(3, 14), + RCAR_GP_PIN(3, 14), RCAR_GP_PIN(3, 15), }; static const unsigned int mmc1_data8_mux[] = { MMC1_D0_MARK, MMC1_D1_MARK, MMC1_D2_MARK, MMC1_D3_MARK, @@ -2440,8 +2439,7 @@ static const unsigned int mmc1_ctrl_pins[] = { static const unsigned int mmc1_ctrl_mux[] = { MMC1_CLK_MARK, MMC1_CMD_MARK, }; - -/* - SDHI ------------------------------------------------------------------- */ +/* - SDHI0 ------------------------------------------------------------------ */ static const unsigned int sdhi0_data1_pins[] = { /* D0 */ RCAR_GP_PIN(3, 2), @@ -2477,7 +2475,7 @@ static const unsigned int sdhi0_wp_pins[] = { static const unsigned int sdhi0_wp_mux[] = { SD0_WP_MARK, }; - +/* - SDHI1 ------------------------------------------------------------------ */ static const unsigned int sdhi1_data1_pins[] = { /* D0 */ RCAR_GP_PIN(3, 10), @@ -2513,7 +2511,7 @@ static const unsigned int sdhi1_wp_pins[] = { static const unsigned int sdhi1_wp_mux[] = { SD1_WP_MARK, }; - +/* - SDHI2 ------------------------------------------------------------------ */ static const unsigned int sdhi2_data1_pins[] = { /* D0 */ RCAR_GP_PIN(3, 18), @@ -2549,7 +2547,7 @@ static const unsigned int sdhi2_wp_pins[] = { static const unsigned int sdhi2_wp_mux[] = { SD2_WP_MARK, }; - +/* - SDHI3 ------------------------------------------------------------------ */ static const unsigned int sdhi3_data1_pins[] = { /* D0 */ RCAR_GP_PIN(3, 26),