From patchwork Tue Jul 14 22:25:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joachim Eastwood X-Patchwork-Id: 495281 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6766F1402C2 for ; Wed, 15 Jul 2015 08:25:45 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=CcjFFUD4; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752050AbbGNWZo (ORCPT ); Tue, 14 Jul 2015 18:25:44 -0400 Received: from mail-la0-f67.google.com ([209.85.215.67]:33588 "EHLO mail-la0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751563AbbGNWZn (ORCPT ); Tue, 14 Jul 2015 18:25:43 -0400 Received: by lahh5 with SMTP id h5so1017852lah.0 for ; Tue, 14 Jul 2015 15:25:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yQOzkBkc5J6TENue/LTUGN7TUTI/KKhjVHvvSptmiZU=; b=CcjFFUD4o1eT4itAlk+dvHuJqr80zUSYMBR3L70nGxNJNOKAXBgeWiHMtniszyRS9E p5b5/34W2UJhgPo3j87L8pm/j3tKr1HOWedpx6O0BY7iW68zHhmvZmqcjlLMJ0CgnAP3 kBCku77S3BE5jql6L6xZlZ5tUx/V5CUNpzxpg6nLwISw1JJiXHeHhRrupK/rp4H9MsIX XWVtys4SLRkLzvaiknzQnHgnCGN04vCEK26K4kgI0AknUkJO9I2/4348CCrzqKXrHvUJ si3wtBfbfjJQh351sy5lWb31fk///QlPE5BOcG7ASv6hXX5LJcHDsqrOXzn+vEmLpn4d dJkg== X-Received: by 10.152.205.67 with SMTP id le3mr889334lac.50.1436912742422; Tue, 14 Jul 2015 15:25:42 -0700 (PDT) Received: from localhost.localdomain ([89.11.213.141]) by smtp.gmail.com with ESMTPSA id ks11sm589017lac.0.2015.07.14.15.25.41 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 14 Jul 2015 15:25:42 -0700 (PDT) From: Joachim Eastwood To: linus.walleij@linaro.org Cc: Joachim Eastwood , linux-gpio@vger.kernel.org Subject: [PATCH 2/2] pinctrl: lpc18xx: add support for usb1 pinconf Date: Wed, 15 Jul 2015 00:25:27 +0200 Message-Id: <1436912727-11559-3-git-send-email-manabian@gmail.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1436912727-11559-1-git-send-email-manabian@gmail.com> References: <1436912727-11559-1-git-send-email-manabian@gmail.com> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org The dedicated USB1 pins can be configured with pull-down and for low power mode (suspend). Add support for this in the pinctrl driver. Signed-off-by: Joachim Eastwood --- drivers/pinctrl/pinctrl-lpc18xx.c | 54 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 50 insertions(+), 4 deletions(-) diff --git a/drivers/pinctrl/pinctrl-lpc18xx.c b/drivers/pinctrl/pinctrl-lpc18xx.c index 347c763a6a78..f0bebbe0682b 100644 --- a/drivers/pinctrl/pinctrl-lpc18xx.c +++ b/drivers/pinctrl/pinctrl-lpc18xx.c @@ -37,6 +37,9 @@ #define LPC18XX_SCU_PIN_EHD_MASK 0x300 #define LPC18XX_SCU_PIN_EHD_POS 8 +#define LPC18XX_SCU_USB1_EPD BIT(2) +#define LPC18XX_SCU_USB1_EPWR BIT(4) + #define LPC18XX_SCU_I2C0_EFP BIT(0) #define LPC18XX_SCU_I2C0_EHD BIT(2) #define LPC18XX_SCU_I2C0_EZI BIT(3) @@ -617,8 +620,31 @@ static const struct pinctrl_pin_desc lpc18xx_pins[] = { static int lpc18xx_pconf_get_usb1(enum pin_config_param param, int *arg, u32 reg) { - /* TODO */ - return -ENOTSUPP; + switch (param) { + case PIN_CONFIG_LOW_POWER_MODE: + if (reg & LPC18XX_SCU_USB1_EPWR) + *arg = 0; + else + *arg = 1; + break; + + case PIN_CONFIG_BIAS_DISABLE: + if (reg & LPC18XX_SCU_USB1_EPD) + return -EINVAL; + break; + + case PIN_CONFIG_BIAS_PULL_DOWN: + if (reg & LPC18XX_SCU_USB1_EPD) + *arg = 1; + else + return -EINVAL; + break; + + default: + return -ENOTSUPP; + } + + return 0; } static int lpc18xx_pconf_get_i2c0(enum pin_config_param param, int *arg, u32 reg, @@ -782,8 +808,28 @@ static int lpc18xx_pconf_set_usb1(struct pinctrl_dev *pctldev, enum pin_config_param param, u16 param_val, u32 *reg) { - /* TODO */ - return -ENOTSUPP; + switch (param) { + case PIN_CONFIG_LOW_POWER_MODE: + if (param_val) + *reg &= ~LPC18XX_SCU_USB1_EPWR; + else + *reg |= LPC18XX_SCU_USB1_EPWR; + break; + + case PIN_CONFIG_BIAS_DISABLE: + *reg &= ~LPC18XX_SCU_USB1_EPD; + break; + + case PIN_CONFIG_BIAS_PULL_DOWN: + *reg |= LPC18XX_SCU_USB1_EPD; + break; + + default: + dev_err(pctldev->dev, "Property not supported\n"); + return -ENOTSUPP; + } + + return 0; } static int lpc18xx_pconf_set_i2c0(struct pinctrl_dev *pctldev,