From patchwork Mon Sep 2 03:33:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 2852655 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 4AB179F664 for ; Mon, 2 Sep 2013 03:33:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7F23B202A1 for ; Mon, 2 Sep 2013 03:33:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 84B0C20290 for ; Mon, 2 Sep 2013 03:33:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758137Ab3IBDdx (ORCPT ); Sun, 1 Sep 2013 23:33:53 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:35599 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755458Ab3IBDdv (ORCPT ); Sun, 1 Sep 2013 23:33:51 -0400 Received: by mail-pa0-f41.google.com with SMTP id bj1so4660354pad.14 for ; Sun, 01 Sep 2013 20:33:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:sender:message-id:from:to:cc:subject:mime-version:content-type; bh=XQVjh3/3gTtphLReGWV3PDRhXzHHUsr+9PrAEisHSYg=; b=pwalalRpCurvv0S55Z/BtO413ycTxUp8EJuP9ZI7UzuUjR1h5u7BplMGM8iOpQou21 5203ZS4/8oLTNAY4fgBQC/g9c9g8kiPGm2uTu2ISdKoU76ODk1X6K/681+WTpzTPs8sh D718TxtDjKL9D+WJHruIivvP+YIA5rHwyY6W5GP+abin6QooMHKNHvOrazIeP4llLB0h M4xeohWXzK4joKsRNDLEAy1P8ldzeq4mXiLq03BEjKPUiz+8Z8lphhbzAAGdT2LxoF0I UyGDv/cES6HXgeRxJMmyR66ku9y7rrSa/bGWkCigeei9GWhBuj7ogjE87+uzCulPqck1 MiEw== X-Received: by 10.68.254.226 with SMTP id al2mr698450pbd.157.1378092830917; Sun, 01 Sep 2013 20:33:50 -0700 (PDT) Received: from morimoto-Dell-XPS420.gmail.com (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPSA id om2sm12774376pbc.30.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 01 Sep 2013 20:33:49 -0700 (PDT) Date: Sun, 01 Sep 2013 20:33:49 -0700 (PDT) Message-ID: <87fvtnsxr9.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Simon , Laurent Cc: Magnus , Linux-SH , Kuninori Morimoto Subject: [PATCH] ARM: shmobile: armadillo: fixup ether pinctrol naming MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-9.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 e5c9b4cd665106d9b5397114ea81a53059410b6a (sh_eth: get R8A7740 support out of #ifdef) exchanged sh-eth driver name to r8a7740-gether, but, eva_pinctrl_map[] didn't follow it. This patch fixes it. Signed-off-by: Kuninori Morimoto Acked-by: Laurent Pinchart --- arch/arm/mach-shmobile/board-armadillo800eva.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c index c5be60d..33f219e 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c @@ -1069,9 +1069,9 @@ static const struct pinctrl_map eva_pinctrl_map[] = { PIN_MAP_MUX_GROUP_DEFAULT("asoc-simple-card.1", "pfc-r8a7740", "fsib_mclk_in", "fsib"), /* GETHER */ - PIN_MAP_MUX_GROUP_DEFAULT("sh-eth", "pfc-r8a7740", + PIN_MAP_MUX_GROUP_DEFAULT("r8a7740-gether", "pfc-r8a7740", "gether_mii", "gether"), - PIN_MAP_MUX_GROUP_DEFAULT("sh-eth", "pfc-r8a7740", + PIN_MAP_MUX_GROUP_DEFAULT("r8a7740-gether", "pfc-r8a7740", "gether_int", "gether"), /* HDMI */ PIN_MAP_MUX_GROUP_DEFAULT("sh-mobile-hdmi", "pfc-r8a7740",