From patchwork Thu Apr 4 13:45:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Hecht X-Patchwork-Id: 2392931 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 3A2453FD1A for ; Thu, 4 Apr 2013 13:45:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760437Ab3DDNpr (ORCPT ); Thu, 4 Apr 2013 09:45:47 -0400 Received: from mail-bk0-f43.google.com ([209.85.214.43]:39853 "EHLO mail-bk0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760428Ab3DDNpr (ORCPT ); Thu, 4 Apr 2013 09:45:47 -0400 Received: by mail-bk0-f43.google.com with SMTP id jm2so1523520bkc.2 for ; Thu, 04 Apr 2013 06:45:45 -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=2tWrmoYHCcDETfQ/RiWaOWWJ3Y0rASpba2rKgGhUm9Y=; b=gUy2FfIoH+wwCSelfjuA8wpSvcIZCDaAE9BO/FL2wfuoFEHozgX/hBQVU/wd3INssN vEIxRrYkqeA4kO2BqGWmzd+tBzOl35pXqfab8Jn/Z45OoxS1ltMjUvcXRDW2YzPKtmvd MGDxum1UBd0Hl5AdUYytqlmZgUxN/vpH/4/iWQcRrJoIJF0DpqIVjoCxqpFA7pd9pnHD T1vGqxhe3of8sjPo7CdTktJ9ahXklN7wU7H40Of4zNk4qk7/E9SLv1p+tJBx9ANC6p6i CuAy9QWkmq6RQ3YjGgPIckWwzrY2fa09XCh2w/PnM0CB1yq68EOgoR0C1S5Z4fE9wHR1 jxYA== X-Received: by 10.205.41.69 with SMTP id tt5mr4406855bkb.134.1365083145853; Thu, 04 Apr 2013 06:45:45 -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.44 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 04 Apr 2013 06:45:45 -0700 (PDT) From: Bastian Hecht To: linux-sh@vger.kernel.org Cc: Magnus Damm , Simon Horman , Laurent Pichart , Bastian Hecht Subject: [PATCH 1/6] sh-pfc: r8a7740: Add SCIFA1 data group Date: Thu, 4 Apr 2013 15:45:39 +0200 Message-Id: <1365083144-16085-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 --- drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7740.c b/drivers/pinctrl/sh-pfc/pfc-r8a7740.c index bbd87d2..6f62ab5 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7740.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7740.c @@ -1658,6 +1658,14 @@ static struct sh_pfc_pin pinmux_pins[] = { GPIO_PORT_ALL(), }; +/* - 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, +}; /* - LCD0 ------------------------------------------------------------------- */ static const unsigned int lcd0_data8_pins[] = { /* D[0:7] */ @@ -2054,6 +2062,7 @@ static const unsigned int sdhi2_wp_1_mux[] = { }; static const struct sh_pfc_pin_group pinmux_groups[] = { + SH_PFC_PIN_GROUP(scifa1_data), SH_PFC_PIN_GROUP(lcd0_data8), SH_PFC_PIN_GROUP(lcd0_data9), SH_PFC_PIN_GROUP(lcd0_data12), @@ -2103,7 +2112,12 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { SH_PFC_PIN_GROUP(sdhi2_wp_1), }; +static const char * const scifa1_groups[] = { + "scifa1_data", +}; + static const char * const lcd0_groups[] = { + "scifa1_data", "lcd0_data8", "lcd0_data9", "lcd0_data12", @@ -2169,6 +2183,7 @@ static const char * const sdhi2_groups[] = { }; static const struct sh_pfc_function pinmux_functions[] = { + SH_PFC_FUNCTION(scifa1), SH_PFC_FUNCTION(lcd0), SH_PFC_FUNCTION(lcd1), SH_PFC_FUNCTION(mmc0),