From patchwork Wed Jul 20 00:03:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Longerbeam X-Patchwork-Id: 9238547 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 51FA3607DA for ; Wed, 20 Jul 2016 00:05:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 43CB42624D for ; Wed, 20 Jul 2016 00:05:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3890226E81; Wed, 20 Jul 2016 00:05:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C939A2793A for ; Wed, 20 Jul 2016 00:05:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752984AbcGTAFq (ORCPT ); Tue, 19 Jul 2016 20:05:46 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:33275 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752072AbcGTAED (ORCPT ); Tue, 19 Jul 2016 20:04:03 -0400 Received: by mail-pf0-f195.google.com with SMTP id i6so2254558pfe.0; Tue, 19 Jul 2016 17:04:03 -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=fDGAGIoEELNukxWgL8CaCSQTeFfAd96ZHvhFWIxusCQ=; b=S390Ga0jxXCKWWWjmwjwsyOsnVGE38NGsCW3krJuB0k4NBiu7mE/TEqcHu4bQUNgTu uTeYLu+RPh2uSxQOaSA9hu9kwCIwiCDszjdNHbNJmqvYD6tl9E4TM6yq3u6S3oRa9QSV bGwbBXqZPUNxZPOnNpKx+FTn9Bp3+Ts6F22MQndFpsOisMXW6YEUKBLe7ImGN4+QK0B3 wyEku1KD1mOvT+Zo2124hdyObdfZpORkvcyP3pm08lN6uccL+/Qs3ivVQ6LZpscJjWzy 3+r2VRYHGvzsdJuTpOmw+zD897YMEi8f1oMiV2kvbv8pFldI0Yc44QxL7ifbyKz1kkwD M2fg== 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=fDGAGIoEELNukxWgL8CaCSQTeFfAd96ZHvhFWIxusCQ=; b=MqLyYzm9yQhK1Z4ONM/WiAtMzPisGGhW+EioUitFbNCffnFCP64/DWLpbhcu0LJ+t5 5pGXFRAXx1QAlGshzE/BDm9GfHmUhfXoOXKcy/NsczdRWHo77qtPoi81oAWwdz4E69b1 e61P/uVTPUquzrDJA00Y4thYyDem9p7O+1EI4LMyYs+BEudr3TrU9Kf5CRfuTx42TgpC 8Omp6RRwYseWzhoPX5N/rKFRrdF+TgH5IoXDOQo6rDsR1W/aCJ3dJdzxdqcegzTbAjmd rVmrL7Z4oCoBcO/AGKIujZvDJBNgiEJ8oC5V5ZVocCSyidnP1WDX++sWLGuY44oE1beO Zdig== X-Gm-Message-State: ALyK8tL3hOIjT7GKAKmm7cg2okEMngRlwDa8i+lJ2qhzCoRTwULUYSym6FpY42jSteTuew== X-Received: by 10.98.12.200 with SMTP id 69mr59827523pfm.15.1468973042799; Tue, 19 Jul 2016 17:04:02 -0700 (PDT) Received: from mothership.sklembedded.com (c-73-241-2-21.hsd1.ca.comcast.net. [73.241.2.21]) by smtp.googlemail.com with ESMTPSA id ty6sm7107742pac.18.2016.07.19.17.04.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 Jul 2016 17:04:02 -0700 (PDT) From: Steve Longerbeam X-Google-Original-From: Steve Longerbeam To: lars@metafoo.de Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Steve Longerbeam Subject: [PATCH v2 05/10] media: adv7180: add power pin control Date: Tue, 19 Jul 2016 17:03:32 -0700 Message-Id: <1468973017-17647-6-git-send-email-steve_longerbeam@mentor.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1468973017-17647-1-git-send-email-steve_longerbeam@mentor.com> References: <1467846004-12731-1-git-send-email-steve_longerbeam@mentor.com> <1468973017-17647-1-git-send-email-steve_longerbeam@mentor.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Some targets control the ADV7180 power pin via a gpio, so add optional support for "powerdown" pin control. Signed-off-by: Steve Longerbeam Tested-by: Tim Harvey Acked-by: Tim Harvey Cc: Lars-Peter Clausen Acked-by: Lars-Peter Clausen --- v2: - placed call to gpiod_get inline in adv7180_probe(). - rename gpio pin to "powerdown". - document optional powerdown-gpios property in Documentation/devicetree/bindings/media/i2c/adv7180.txt. - include error number in error message on gpiod_get failure. --- .../devicetree/bindings/media/i2c/adv7180.txt | 5 ++++ drivers/media/i2c/Kconfig | 2 +- drivers/media/i2c/adv7180.c | 27 ++++++++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/media/i2c/adv7180.txt b/Documentation/devicetree/bindings/media/i2c/adv7180.txt index 0d50115..4da486f 100644 --- a/Documentation/devicetree/bindings/media/i2c/adv7180.txt +++ b/Documentation/devicetree/bindings/media/i2c/adv7180.txt @@ -15,6 +15,11 @@ Required Properties : "adi,adv7282" "adi,adv7282-m" +Optional Properties : +- powerdown-gpios: reference to the GPIO connected to the powerdown pin, + if any. + + Example: i2c0@1c22000 { diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig index ce9006e..6769898 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -187,7 +187,7 @@ comment "Video decoders" config VIDEO_ADV7180 tristate "Analog Devices ADV7180 decoder" - depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API + depends on GPIOLIB && VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API ---help--- Support for the Analog Devices ADV7180 video decoder. diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c index 667931e9..8612d21 100644 --- a/drivers/media/i2c/adv7180.c +++ b/drivers/media/i2c/adv7180.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -215,6 +216,7 @@ struct adv7180_state { struct media_pad pad; struct mutex mutex; /* mutual excl. when accessing chip */ int irq; + struct gpio_desc *pwdn_gpio; v4l2_std_id curr_norm; bool newavmode; bool powered; @@ -466,6 +468,19 @@ static int adv7180_g_std(struct v4l2_subdev *sd, v4l2_std_id *norm) return 0; } +static void adv7180_set_power_pin(struct adv7180_state *state, bool on) +{ + if (!state->pwdn_gpio) + return; + + if (on) { + gpiod_set_value_cansleep(state->pwdn_gpio, 0); + usleep_range(5000, 10000); + } else { + gpiod_set_value_cansleep(state->pwdn_gpio, 1); + } +} + static int adv7180_set_power(struct adv7180_state *state, bool on) { u8 val; @@ -1221,6 +1236,8 @@ static int init_device(struct adv7180_state *state) mutex_lock(&state->mutex); + adv7180_set_power_pin(state, true); + adv7180_write(state, ADV7180_REG_PWR_MAN, ADV7180_PWR_MAN_RES); usleep_range(5000, 10000); @@ -1320,6 +1337,14 @@ static int adv7180_probe(struct i2c_client *client, adv7180_of_parse(state); + state->pwdn_gpio = devm_gpiod_get_optional(&client->dev, "powerdown", + GPIOD_OUT_HIGH); + if (IS_ERR(state->pwdn_gpio)) { + ret = PTR_ERR(state->pwdn_gpio); + v4l_err(client, "request for power pin failed: %d\n", ret); + return ret; + } + if (state->chip_info->flags & ADV7180_FLAG_MIPI_CSI2) { state->csi_client = i2c_new_dummy(client->adapter, ADV7180_DEFAULT_CSI_I2C_ADDR); @@ -1411,6 +1436,8 @@ static int adv7180_remove(struct i2c_client *client) if (state->chip_info->flags & ADV7180_FLAG_MIPI_CSI2) i2c_unregister_device(state->csi_client); + adv7180_set_power_pin(state, false); + mutex_destroy(&state->mutex); return 0;