From patchwork Thu Apr 30 14:18:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Hecht X-Patchwork-Id: 6303921 X-Patchwork-Delegate: geert@linux-m68k.org 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E20819F373 for ; Thu, 30 Apr 2015 14:19:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0616C201EF for ; Thu, 30 Apr 2015 14:19:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7BE7D201FA for ; Thu, 30 Apr 2015 14:19:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751776AbbD3OTR (ORCPT ); Thu, 30 Apr 2015 10:19:17 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:37298 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751774AbbD3OTP (ORCPT ); Thu, 30 Apr 2015 10:19:15 -0400 Received: by widdi4 with SMTP id di4so19800803wid.0 for ; Thu, 30 Apr 2015 07:19:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=KFpGH9jE93rIKzq/xgvjaxt7EUMBs5UiGL7h1gi2o/k=; b=JmXYFrx9ClzPNJchvor9YOShju8BjLBAjbi3kli0DfcNKOKd62/jc0d4Tcqvl2GbMA tyDp2QVfgXjtcCDnSCwUpcb7EmsCE6CAWt+/s8otNea58mEU4svAC/lrnVojJQ4Fc7cc JEkDCe50ljLx511F2DE/EoxLj3419aepeaEoAQrbIZZUgF7fgRziOBKfv6Zv4Wv6G02+ /tmc3ARxI7hmC0S7iI1ekIeTZ+QY1dNZ8/shv1usgpL8gDyqt0LhkNPKx8z9Tv462Tp6 c3wiJWix3UcwlZaPaAJfPdzLoRsQLD9jSR+2Og88d5bEqZgDSlb2CDek2oLm52CbM29L zeSg== X-Received: by 10.180.20.12 with SMTP id j12mr4626822wie.4.1430403554492; Thu, 30 Apr 2015 07:19:14 -0700 (PDT) Received: from groucho.site ([46.166.186.249]) by mx.google.com with ESMTPSA id z13sm3508122wjr.44.2015.04.30.07.19.13 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Apr 2015 07:19:13 -0700 (PDT) From: Ulrich Hecht To: geert@linux-m68k.org, horms@verge.net.au, linux-sh@vger.kernel.org Cc: magnus.damm@gmail.com, laurent.pinchart+renesas@ideasonboard.com, kuninori.morimoto.gx@renesas.com, linus.walleij@linaro.org, Ulrich Hecht , Hisashi Nakamura Subject: [PATCH v2 04/15] pinctrl: sh-pfc: Add r8a7793 pinmux info Date: Thu, 30 Apr 2015 16:18:53 +0200 Message-Id: <1430403544-26742-5-git-send-email-ulrich.hecht+renesas@gmail.com> X-Mailer: git-send-email 2.3.5 In-Reply-To: <1430403544-26742-1-git-send-email-ulrich.hecht+renesas@gmail.com> References: <1430403544-26742-1-git-send-email-ulrich.hecht+renesas@gmail.com> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 Adds the r8a7793 pinmux info to the PFC driver. Signed-off-by: Hisashi Nakamura [uli: minor reformat to fit mainline, fixed typos, split] Signed-off-by: Ulrich Hecht --- drivers/pinctrl/sh-pfc/core.c | 6 ++++++ drivers/pinctrl/sh-pfc/core.h | 1 + drivers/pinctrl/sh-pfc/pfc-r8a7793.c | 19 +++++++++++++++++++ 3 files changed, 26 insertions(+) diff --git a/drivers/pinctrl/sh-pfc/core.c b/drivers/pinctrl/sh-pfc/core.c index 7b2c949..21326de 100644 --- a/drivers/pinctrl/sh-pfc/core.c +++ b/drivers/pinctrl/sh-pfc/core.c @@ -481,6 +481,12 @@ static const struct of_device_id sh_pfc_of_table[] = { .data = &r8a7791_pinmux_info, }, #endif +#ifdef CONFIG_PINCTRL_PFC_R8A7793 + { + .compatible = "renesas,pfc-r8a7793", + .data = &r8a7793_pinmux_info, + }, +#endif #ifdef CONFIG_PINCTRL_PFC_SH73A0 { .compatible = "renesas,pfc-sh73a0", diff --git a/drivers/pinctrl/sh-pfc/core.h b/drivers/pinctrl/sh-pfc/core.h index 6dc8a6f..b151b77 100644 --- a/drivers/pinctrl/sh-pfc/core.h +++ b/drivers/pinctrl/sh-pfc/core.h @@ -71,6 +71,7 @@ extern const struct sh_pfc_soc_info r8a7778_pinmux_info; extern const struct sh_pfc_soc_info r8a7779_pinmux_info; extern const struct sh_pfc_soc_info r8a7790_pinmux_info; extern const struct sh_pfc_soc_info r8a7791_pinmux_info; +extern const struct sh_pfc_soc_info r8a7793_pinmux_info; extern const struct sh_pfc_soc_info sh7203_pinmux_info; extern const struct sh_pfc_soc_info sh7264_pinmux_info; extern const struct sh_pfc_soc_info sh7269_pinmux_info; diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7793.c b/drivers/pinctrl/sh-pfc/pfc-r8a7793.c index 0b23346..5037432 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7793.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7793.c @@ -6012,3 +6012,22 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = { }, { }, }; + +const struct sh_pfc_soc_info r8a7793_pinmux_info = { + .name = "r8a77930_pfc", + .unlock_reg = 0xe6060000, /* PMMR */ + + .function = { PINMUX_FUNCTION_BEGIN, PINMUX_FUNCTION_END }, + + .pins = pinmux_pins, + .nr_pins = ARRAY_SIZE(pinmux_pins), + .groups = pinmux_groups, + .nr_groups = ARRAY_SIZE(pinmux_groups), + .functions = pinmux_functions, + .nr_functions = ARRAY_SIZE(pinmux_functions), + + .cfg_regs = pinmux_config_regs, + + .gpio_data = pinmux_data, + .gpio_data_size = ARRAY_SIZE(pinmux_data), +};