From patchwork Wed Apr 17 10:34:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Hecht X-Patchwork-Id: 2453051 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 AFE693FC64 for ; Wed, 17 Apr 2013 11:34:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751327Ab3DQLeG (ORCPT ); Wed, 17 Apr 2013 07:34:06 -0400 Received: from mail-bk0-f52.google.com ([209.85.214.52]:55767 "EHLO mail-bk0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751821Ab3DQLeF (ORCPT ); Wed, 17 Apr 2013 07:34:05 -0400 Received: by mail-bk0-f52.google.com with SMTP id it16so713792bkc.39 for ; Wed, 17 Apr 2013 04:34:03 -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=sVsESkQ24DKD0ddasTBEbOoIOjDTol8cb8mj8t8QxcM=; b=rX9hN+gnfIARdZp61snwXpToVDqwyE911kfXLf6eJ4pLwNf0L+1lYhiv4IJJO1qECw /4EELvdWnRIl7zlNiMuX0uDkfjnVX8DDXQ9N/rZEGjbRytRpMgvxZZDVo9QqXwjXXG0l gsOYqCX8eUxn8667vv+42Njm7j7RCnYKxxXDlXNOxn59hs/h8Ck+TSlmXlF0mpk13NrH VfzIJpk8DGxXIl4l54ATurzuQt3E9FLxGPqKjyWLJH/5zEpF37bL9wiGRh1YEyocnieU 0ymwe6m9QT3RZlQi4NwgdtpGYohjDibU0UutUyNJgOZqvdQzTo8kvpuOkFN957Ki0oDq tMdw== X-Received: by 10.204.199.70 with SMTP id er6mr2088972bkb.122.1366198443736; Wed, 17 Apr 2013 04:34:03 -0700 (PDT) Received: from localhost.localdomain (g229254233.adsl.alicedsl.de. [92.229.254.233]) by mx.google.com with ESMTPS id ej2sm1993713bkb.14.2013.04.17.04.34.02 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 17 Apr 2013 04:34:03 -0700 (PDT) From: Bastian Hecht To: linux-sh@vger.kernel.org Cc: Magnus Damm , Laurent Pichart , Simon Horman , Kuninori Morimoto Subject: [PATCH v2 2/6] ARM: shmobile: Armadillo800EVA: Convert SCIFA1 to pinctrl Date: Wed, 17 Apr 2013 12:34:02 +0200 Message-Id: <1366194847-9879-2-git-send-email-hechtb+renesas@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1366194847-9879-1-git-send-email-hechtb+renesas@gmail.com> References: <1366194847-9879-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 Acked-by: Laurent Pinchart --- v2: same 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..bf4c3d2 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c @@ -1048,6 +1048,9 @@ static const struct pinctrl_map eva_pinctrl_map[] = { "mmc0_data8_1", "mmc0"), PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.0", "pfc-r8a7740", "mmc0_ctrl_1", "mmc0"), + /* SCIFA1 */ + PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.1", "pfc-r8a7740", + "scifa1_data", "scifa1"), /* SDHI0 */ PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7740", "sdhi0_data4", "sdhi0"), @@ -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);