From patchwork Thu Apr 4 13:45:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Hecht X-Patchwork-Id: 2392941 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 1CA223FD1A for ; Thu, 4 Apr 2013 13:45:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760439Ab3DDNps (ORCPT ); Thu, 4 Apr 2013 09:45:48 -0400 Received: from mail-bk0-f43.google.com ([209.85.214.43]:58048 "EHLO mail-bk0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760432Ab3DDNps (ORCPT ); Thu, 4 Apr 2013 09:45:48 -0400 Received: by mail-bk0-f43.google.com with SMTP id jm2so1548902bkc.30 for ; Thu, 04 Apr 2013 06:45:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=I5q8Q5xbeh/XyLen6Xvpc0nFTkQgDIumG83rJcLm8ok=; b=WZIXIu7yr+qk8kKoaouxffInukgy0By4Og84lGtgc3e/sdU5doXGiO/YD1+x9aYw+6 XAiJvIfcTs8d55yuTZpxJaOgaY4vCBqn8+9Rcd2k5/6TfvJRCm8xx5CJa6P0E7pw2uuM vsC/CrCfxibZcdugu8o0cR0D0CE7kF7S7hCuYU4k1Gs3rrSP8D0tpGRr2jC5B5r/fBTF rC9krfeGJkxbfF/5wvRrasHPm7BoyFNKHRxgeDyZDgg6MWqYmCBDNFNzRdmvzrYWpEZL 4VOhq/4nS8DJfOxP8YHxt0Vv9oOnDGar1hoD7RtGY+2GPY8krJh95YTcEJ0ZFzzWeTUR si0Q== X-Received: by 10.204.233.71 with SMTP id jx7mr4448768bkb.87.1365083147077; Thu, 04 Apr 2013 06:45:47 -0700 (PDT) Received: from localhost.localdomain (p4FD22916.dip.t-dialin.net. [79.210.41.22]) by mx.google.com with ESMTPS id jt9sm6074144bkb.18.2013.04.04.06.45.45 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 04 Apr 2013 06:45:46 -0700 (PDT) From: Bastian Hecht To: linux-sh@vger.kernel.org Cc: Magnus Damm , Simon Horman , Laurent Pichart , Bastian Hecht Subject: [PATCH 2/6] ARM: shmobile: Armadillo800EVA: Convert SCIFA1 to pinctrl Date: Thu, 4 Apr 2013 15:45:40 +0200 Message-Id: <1365083144-16085-2-git-send-email-hechtb+renesas@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1365083144-16085-1-git-send-email-hechtb+renesas@gmail.com> References: <1365083144-16085-1-git-send-email-hechtb+renesas@gmail.com> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org We use the new pinctrl framework now. Signed-off-by: Bastian Hecht --- arch/arm/mach-shmobile/board-armadillo800eva.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c index 81db74a..2914b6e 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c @@ -1036,6 +1036,9 @@ static struct platform_device *eva_devices[] __initdata = { }; static const struct pinctrl_map eva_pinctrl_map[] = { + /* SCIFA1 */ + PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.1", "pfc-r8a7740", + "scifa1_data", "scifa1"), /* LCD0 */ PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_lcdc_fb.0", "pfc-r8a7740", "lcd0_data24_0", "lcd0"), @@ -1109,10 +1112,6 @@ static void __init eva_init(void) r8a7740_pinmux_init(); r8a7740_meram_workaround(); - /* SCIFA1 */ - gpio_request(GPIO_FN_SCIFA1_RXD, NULL); - gpio_request(GPIO_FN_SCIFA1_TXD, NULL); - /* LCDC0 */ gpio_request(GPIO_FN_LCDC0_SELECT, NULL);