From patchwork Wed Apr 17 10:34:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Hecht X-Patchwork-Id: 2453041 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 424C83FC64 for ; Wed, 17 Apr 2013 11:34:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754826Ab3DQLeF (ORCPT ); Wed, 17 Apr 2013 07:34:05 -0400 Received: from mail-bk0-f54.google.com ([209.85.214.54]:62374 "EHLO mail-bk0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751327Ab3DQLeE (ORCPT ); Wed, 17 Apr 2013 07:34:04 -0400 Received: by mail-bk0-f54.google.com with SMTP id q16so723449bkw.13 for ; Wed, 17 Apr 2013 04:34:02 -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; bh=fKpXmbbDwkMv/V8tjOgirPR6KO3HLWAJXeqlNfoaQoA=; b=aLiVujyY6O2hFWqib1ma1yoPCNuCDhdqFVwftPahtqpLHfHk6oWaL255azNKFa/6gh gwy/zfM7LkcvjhTjCNjdSjSIEwmyPxATpQFy1MTjZE18Ysu2t28nVHIWJuW8K2FBbfGW fPTf119g/XvGg4sl7/F/COIAzH5OpNsQNgx48FVrgRHaISDwFJn/h/Qte67wHhsavw4J 4Zmp0Dc2WBj1tAYHT/HV8YuIiyVCtGYjuDWHuPeob/39ZbJyJy8KwslfjRyjj+PcIZxZ 3sD6748uieURWCyvufPn8Xz3/EzM99AvUkriwxedjFJ8DZ0vXziIzIsVYxWBP6pU3rOp OXDw== X-Received: by 10.205.114.11 with SMTP id ey11mr2093626bkc.104.1366198442800; Wed, 17 Apr 2013 04:34:02 -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.01 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 17 Apr 2013 04:34:02 -0700 (PDT) From: Bastian Hecht To: linux-sh@vger.kernel.org Cc: Magnus Damm , Laurent Pichart , Simon Horman , Kuninori Morimoto Subject: [PATCH v2 1/6] sh-pfc: r8a7740: Add SCIFA1 data group Date: Wed, 17 Apr 2013 12:34:01 +0200 Message-Id: <1366194847-9879-1-git-send-email-hechtb+renesas@gmail.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org Add SCIFA1 as preparation to switch to pinctrl in board files. Signed-off-by: Bastian Hecht Acked-by: Laurent Pinchart --- v2: same drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7740.c b/drivers/pinctrl/sh-pfc/pfc-r8a7740.c index d95040c..4753f54 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7740.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7740.c @@ -1999,6 +1999,14 @@ static const unsigned int mmc0_ctrl_1_pins[] = { static const unsigned int mmc0_ctrl_1_mux[] = { MMC1_CMD_PORT104_MARK, MMC1_CLK_PORT103_MARK, }; +/* - SCIFA1 ----------------------------------------------------------------- */ +static const unsigned int scifa1_data_pins[] = { + /* RXD, TXD */ + 195, 196, +}; +static const unsigned int scifa1_data_mux[] = { + SCIFA1_RXD_MARK, SCIFA1_TXD_MARK, +}; /* - SDHI0 ------------------------------------------------------------------ */ static const unsigned int sdhi0_data1_pins[] = { /* D0 */ @@ -2204,6 +2212,7 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { SH_PFC_PIN_GROUP(mmc0_data4_1), SH_PFC_PIN_GROUP(mmc0_data8_1), SH_PFC_PIN_GROUP(mmc0_ctrl_1), + SH_PFC_PIN_GROUP(scifa1_data), SH_PFC_PIN_GROUP(sdhi0_data1), SH_PFC_PIN_GROUP(sdhi0_data4), SH_PFC_PIN_GROUP(sdhi0_ctrl), @@ -2316,6 +2325,10 @@ static const char * const mmc0_groups[] = { "mmc0_ctrl_1", }; +static const char * const scifa1_groups[] = { + "scifa1_data", +}; + static const char * const sdhi0_groups[] = { "sdhi0_data1", "sdhi0_data4", @@ -2346,6 +2359,7 @@ static const struct sh_pfc_function pinmux_functions[] = { SH_PFC_FUNCTION(lcd0), SH_PFC_FUNCTION(lcd1), SH_PFC_FUNCTION(mmc0), + SH_PFC_FUNCTION(scifa1), SH_PFC_FUNCTION(sdhi0), SH_PFC_FUNCTION(sdhi1), SH_PFC_FUNCTION(sdhi2),