From patchwork Mon Jul 28 22:12:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 4637671 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C74F09F38C for ; Mon, 28 Jul 2014 22:12:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CAA552018B for ; Mon, 28 Jul 2014 22:12:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EC2C420173 for ; Mon, 28 Jul 2014 22:12:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751702AbaG1WM5 (ORCPT ); Mon, 28 Jul 2014 18:12:57 -0400 Received: from mail-la0-f53.google.com ([209.85.215.53]:55160 "EHLO mail-la0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751650AbaG1WM4 (ORCPT ); Mon, 28 Jul 2014 18:12:56 -0400 Received: by mail-la0-f53.google.com with SMTP id gl10so5827611lab.40 for ; Mon, 28 Jul 2014 15:12:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:to:subject:cc:from:organization:date :mime-version:content-type:content-transfer-encoding:message-id; bh=jezTL0UjP0ArMRWbvn7xggNcKjqj9/NbzRGqXV+NuAI=; b=Ui0Vpcsyo6HhGaZPfxPwJmCx3Vbt8k+el8d7Y4QzBUmmD0IL4ykAzEo0Fmi+87PoIe XkOyqsOVACsBCI4qvIvkorC3hV7UgDR5Z314Gt31Fh5EwL/pqk/Ak0tNAqwJt7EoMcin 8NOWgZYZuAyYYlW7yf0BS/OOFc8RW1w/fO9ywPCsGjOsEYQGezKtBjv8OeH9ZAfNOqZl daCv/kX0dMNdqwUL/m6Mel4QksbHQ93gxdiSPtk1dBghE3wL4QXxYQDNw0IFf4J5VsqA N7EgHmLlNRMNfq9JDYthn0eiV8k/Qx68GXzGVk53AORAfF0ch9RlAEzIluDCHo/rap6H dzXg== X-Gm-Message-State: ALoCoQkRTRcJvyQvx1D1ilgKIhQ7LfHiYTEWhqbhMYb7BLLfk4711CpX8G12VF/DnkIgOqitMo1j X-Received: by 10.112.128.232 with SMTP id nr8mr35644896lbb.58.1406585574969; Mon, 28 Jul 2014 15:12:54 -0700 (PDT) Received: from wasted.cogentembedded.com (ppp22-185.pppoe.mtu-net.ru. [81.195.22.185]) by mx.google.com with ESMTPSA id ut18sm32633680lbb.38.2014.07.28.15.12.53 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 28 Jul 2014 15:12:54 -0700 (PDT) To: linus.walleij@linaro.org, linux-sh@vger.kernel.org Subject: [PATCH] sh-pfc: r8a7791: fix CAN pin groups Cc: laurent.pinchart@ideasonboard.com, vksavl@gmail.com From: Sergei Shtylyov Organization: Cogent Embedded Date: Tue, 29 Jul 2014 02:12:55 +0400 MIME-Version: 1.0 Message-Id: <201407290212.55656.sergei.shtylyov@cogentembedded.com> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP I had made last-minute changes before submitting the patch "sh-pfc: r8a7791: add CAN pin groups"; now I'm seeing that they weren't complete: I had missed update to the pin group names in pin[01]_groups[]. Drop the "_a" suffixes there. Signed-off-by: Sergei Shtylyov Acked-by: Laurent Pinchart --- The patch is against the 'devel' branch of Linus W.'s 'linux-pinctrl.git' repo. drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-pinctrl/drivers/pinctrl/sh-pfc/pfc-r8a7791.c =================================================================== --- linux-pinctrl.orig/drivers/pinctrl/sh-pfc/pfc-r8a7791.c +++ linux-pinctrl/drivers/pinctrl/sh-pfc/pfc-r8a7791.c @@ -4509,24 +4509,24 @@ static const char * const audio_clk_grou }; static const char * const can0_groups[] = { - "can0_data_a", + "can0_data", "can0_data_b", "can0_data_c", "can0_data_d", "can0_data_e", "can0_data_f", - "can_clk_a", + "can_clk", "can_clk_b", "can_clk_c", "can_clk_d", }; static const char * const can1_groups[] = { - "can1_data_a", + "can1_data", "can1_data_b", "can1_data_c", "can1_data_d", - "can_clk_a", + "can_clk", "can_clk_b", "can_clk_c", "can_clk_d",