From patchwork Tue Dec 10 18:20:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valentine Barshak X-Patchwork-Id: 3319701 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 437CB9F1F0 for ; Tue, 10 Dec 2013 18:20:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 309D9205FA for ; Tue, 10 Dec 2013 18:20:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0AD55205F1 for ; Tue, 10 Dec 2013 18:20:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755440Ab3LJSUd (ORCPT ); Tue, 10 Dec 2013 13:20:33 -0500 Received: from mail-la0-f41.google.com ([209.85.215.41]:49909 "EHLO mail-la0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753124Ab3LJSUc (ORCPT ); Tue, 10 Dec 2013 13:20:32 -0500 Received: by mail-la0-f41.google.com with SMTP id eo20so2993832lab.0 for ; Tue, 10 Dec 2013 10:20:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0qiHTx2IF+Tl9imi2L+EjCSQHfzDVKvDp0m88wJCvAE=; b=e2TySUX/9Cpw2C7+GxswEYKAQyWSbkZc4Rm7prbWtm1PDUVMBJbcGc7rdyDCDqktFT phShDpWQoYGyQdJSujHEf2yLFNF99H3piLBRWw9ZpbKUoI8bRPXIXjXPqL3AQNc4Musw JDr82h7XnagXwDFI/ypTouMaBwUGF0p4YS2SVRz0vFMD4iq2pqvJS29fLDLBCHplx/6e dD0wT/uWQNS3LH38gmKJ/N5EMl6eK/DRPQm3e9p9YFq+BUARMZvrtAHJPnY9p0D2kpva eLyr27sBDMaMeANIt5dwgTwYKSwGHHAFMRSCP5pFobzQ8YsMvBZayUMAqEfzL/hmhnvX btzw== X-Gm-Message-State: ALoCoQnf0U0/2xCtmwECzuy4Y+KK44DezpgWQUkz7Mcbmnv3cqe0iUDg8ktoPWH8/7Va68DpN/U/ X-Received: by 10.152.10.10 with SMTP id e10mr6043444lab.56.1386699631477; Tue, 10 Dec 2013 10:20:31 -0800 (PST) Received: from black.localnet ([93.100.122.208]) by mx.google.com with ESMTPSA id t9sm23347052lat.1.2013.12.10.10.20.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Dec 2013 10:20:30 -0800 (PST) From: Valentine Barshak To: linux-sh@vger.kernel.org Cc: Simon Horman , Magnus Damm , Kuninori Morimoto , Laurent Pinchart Subject: [PATCH 2/5] pinctrl: sh-pfc: pfc-r8a7790: Group VIN0 HSYNC and VSYNC together Date: Tue, 10 Dec 2013 22:20:23 +0400 Message-Id: <1386699626-15803-3-git-send-email-valentine.barshak@cogentembedded.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1386699626-15803-1-git-send-email-valentine.barshak@cogentembedded.com> References: <1386699626-15803-1-git-send-email-valentine.barshak@cogentembedded.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=-7.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 This groups VIN0 HSYNC and VSYNC pins together since one cannot be used without another. Signed-off-by: Valentine Barshak --- drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c index 21d41f8..fa4d7093 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c @@ -3045,16 +3045,12 @@ static const unsigned int vin0_data_b_mux[] = { VI0_DATA3_VI0_B3_MARK, VI0_DATA4_VI0_B4_MARK, VI0_DATA5_VI0_B5_MARK, VI0_DATA6_VI0_B6_MARK, VI0_DATA7_VI0_B7_MARK, }; -static const unsigned int vin0_hsync_pins[] = { - RCAR_GP_PIN(0, 12), +static const unsigned int vin0_sync_pins[] = { + RCAR_GP_PIN(0, 12), /* HSYNC */ + RCAR_GP_PIN(0, 13), /* VSYNC */ }; -static const unsigned int vin0_hsync_mux[] = { +static const unsigned int vin0_sync_mux[] = { VI0_HSYNC_N_MARK, -}; -static const unsigned int vin0_vsync_pins[] = { - RCAR_GP_PIN(0, 13), -}; -static const unsigned int vin0_vsync_mux[] = { VI0_VSYNC_N_MARK, }; static const unsigned int vin0_field_pins[] = { @@ -3269,8 +3265,7 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { SH_PFC_PIN_GROUP(vin0_data_g), SH_PFC_PIN_GROUP(vin0_data_r), SH_PFC_PIN_GROUP(vin0_data_b), - SH_PFC_PIN_GROUP(vin0_hsync), - SH_PFC_PIN_GROUP(vin0_vsync), + SH_PFC_PIN_GROUP(vin0_sync), SH_PFC_PIN_GROUP(vin0_field), SH_PFC_PIN_GROUP(vin0_clkenb), SH_PFC_PIN_GROUP(vin0_clk), @@ -3556,8 +3551,7 @@ static const char * const vin0_groups[] = { "vin0_data_g", "vin0_data_r", "vin0_data_b", - "vin0_hsync", - "vin0_vsync", + "vin0_sync", "vin0_field", "vin0_clkenb", "vin0_clk",