From patchwork Thu Oct 16 17:11:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soren Brinkmann X-Patchwork-Id: 5092961 Return-Path: X-Original-To: patchwork-linux-arm@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 DD1D69F30B for ; Thu, 16 Oct 2014 17:16:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 15429201ED for ; Thu, 16 Oct 2014 17:16:21 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 65250201EC for ; Thu, 16 Oct 2014 17:16:16 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XeocM-0007ri-8X; Thu, 16 Oct 2014 17:13:38 +0000 Received: from mail-pd0-x22b.google.com ([2607:f8b0:400e:c02::22b]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XeobH-0007IP-LE for linux-arm-kernel@lists.infradead.org; Thu, 16 Oct 2014 17:12:32 +0000 Received: by mail-pd0-f171.google.com with SMTP id ft15so3597269pdb.30 for ; Thu, 16 Oct 2014 10:12:10 -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=lBJ7ImkQc+bRnml+ebrlhzOOBjetZbnpGOLnPm7PILc=; b=klnXki+Y21X6ntMcxDEOCdgSLQT3U4iztL2n01fQuoXzNHCn9G+o6EwTyWtgjpcKO+ Z6/AISzy5v3D5bYWSoFGxZNyOAaZ3eAVxsJgKPswadasBBFLZKWtJSyp4Hut+Y8jobm4 f/eOWB6QHvir2meAj+Rjkhym09IncLzH30wJ9rPGplz4aAWuHY9PEzT8M3sBRD+3WCPE 3e5VwG1r5g0sRiwG51KKXSiKgzaytPb+Dp5khf6kgscpbr4drEV4j8AS89pQjjWE4cEa XyNGSSMaGrf7A9hm5jqBr+BXE3KLpwhR+uW4d+giiFEtRds8/ElpeDbWsfHoeF0G08lI +VSw== X-Received: by 10.70.19.101 with SMTP id d5mr2624546pde.79.1413479530261; Thu, 16 Oct 2014 10:12:10 -0700 (PDT) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id xf9sm20450708pab.2.2014.10.16.10.12.08 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 16 Oct 2014 10:12:09 -0700 (PDT) From: Soren Brinkmann To: Linus Walleij Subject: [PATCH RFC v2 4/8] pinctrl: zynq: Support IO standard property Date: Thu, 16 Oct 2014 10:11:31 -0700 Message-Id: <1413479495-14206-5-git-send-email-soren.brinkmann@xilinx.com> X-Mailer: git-send-email 2.1.2.1.g5e69ed6 In-Reply-To: <1413479495-14206-1-git-send-email-soren.brinkmann@xilinx.com> References: <1413479495-14206-1-git-send-email-soren.brinkmann@xilinx.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141016_101231_746882_A5A1A770 X-CRM114-Status: GOOD ( 10.16 ) X-Spam-Score: -0.7 (/) Cc: linux-arm-kernel@lists.infradead.org, Steffen Trumtrar , Michal Simek , =?UTF-8?q?S=C3=B6ren=20Brinkmann?= , linux-kernel@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=no 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 Signed-off-by: Soren Brinkmann --- drivers/pinctrl/pinctrl-zynq.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/drivers/pinctrl/pinctrl-zynq.c b/drivers/pinctrl/pinctrl-zynq.c index a32fac61cba0..f3fce76c8390 100644 --- a/drivers/pinctrl/pinctrl-zynq.c +++ b/drivers/pinctrl/pinctrl-zynq.c @@ -883,6 +883,18 @@ static const struct pinmux_ops zynq_pinmux_ops = { #define ZYNQ_PINCONF_SPEED BIT(8) #define ZYNQ_PINCONF_PULLUP BIT(12) +#define ZYNQ_PINCONF_IOTYPE_SHIFT 9 +#define ZYNQ_PINCONF_IOTYPE_MASK (7 << ZYNQ_PINCONF_IOTYPE_SHIFT) + +enum zynq_io_standards { + zynq_iostd_min, + zynq_iostd_lvcmos18, + zynq_iostd_lvcmos25, + zynq_iostd_lvcmos33, + zynq_iostd_hstl, + zynq_iostd_max +}; + static int zynq_pinconf_cfg_get(struct pinctrl_dev *pctldev, unsigned pin, unsigned long *config) @@ -918,6 +930,10 @@ static int zynq_pinconf_cfg_get(struct pinctrl_dev *pctldev, case PIN_CONFIG_SLEW_RATE: arg = !!(reg & ZYNQ_PINCONF_SPEED); break; + case PIN_CONFIG_IOSTANDARD: + arg = reg & ZYNQ_PINCONF_IOTYPE_MASK; + arg >>= ZYNQ_PINCONF_IOTYPE_SHIFT; + break; default: return -ENOTSUPP; } @@ -969,6 +985,15 @@ static int zynq_pinconf_cfg_set(struct pinctrl_dev *pctldev, reg &= ~ZYNQ_PINCONF_SPEED; break; + case PIN_CONFIG_IOSTANDARD: + if (arg <= zynq_iostd_min || arg >= zynq_iostd_max) { + dev_warn(pctldev->dev, + "unsupported IO standard '%u'\n", + param); + break; + } + reg |= arg << ZYNQ_PINCONF_IOTYPE_SHIFT; + break; default: dev_warn(pctldev->dev, "unsupported configuration parameter '%u'\n",