From patchwork Fri Sep 16 09:39:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Hecht X-Patchwork-Id: 9335333 X-Patchwork-Delegate: geert@linux-m68k.org 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 A66AB601C2 for ; Fri, 16 Sep 2016 09:39:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9639329EEE for ; Fri, 16 Sep 2016 09:39:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8ACB529F11; Fri, 16 Sep 2016 09:39: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.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham 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 641E729EEE for ; Fri, 16 Sep 2016 09:39:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758325AbcIPJjy (ORCPT ); Fri, 16 Sep 2016 05:39:54 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:33277 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755788AbcIPJjv (ORCPT ); Fri, 16 Sep 2016 05:39:51 -0400 Received: by mail-wm0-f65.google.com with SMTP id b187so2803461wme.0; Fri, 16 Sep 2016 02:39:50 -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=QCx8VxOwDSxPa39yAMzDhDjVftJgACmO8aqs1qQ6VEc=; b=qQ4FGfUd4onhsDmFN01IXAv3O/5LbztbOHPWMpj+4Eli8RsE8cfi2XbcszhrFL8L2S 0lKjFWVj3raruwa8b+Yg95uoHkqn4wDCNAq3FBZeTupuEvtyr5lLimHzyy/CrBmUCf9d /IXoHRdmpSpjq/+lhE9YC+PEvwDHfAWUofN5SvcGdj2NjOqV2eAe1trQ0nsfbo3kx1T+ KLlIiYwfGPN8PtNouuh7lS2Ng4451JK+W+Q4HKbktacAS6K3qwGQJIG5yVbh5wV8IDym gWe34jbSL/fOorfdXHwJlAKPYGiO7LCeZqMz51kGx2KVeiJmNEcUPCHEM9ZCikBusStu kOTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=QCx8VxOwDSxPa39yAMzDhDjVftJgACmO8aqs1qQ6VEc=; b=g3zva+7+DDpTD8TJdwQovTCVX4HH3gNI7OdJzGVQjOfKyjU2eXTATTY9SWt8jBqz4S +T/625itqCsBhtTJnVZP8clHMmq2M7hpOnoLVGMhJX470HOB5clFLDqVLOKOZxDQzkGs Vgn9rRKKOMUnrSIg1Ius+0O3vjPQdALfnveBI0alC44LzBuwHQbPWcxalXwC+ZoI7KBE 0SycFPph9XF+xxNb4yYnnepwr0NluqU+cdn0OmjUQemWellXx890c6JUUi6m3FdZu45I RDDz3FPkuqdj9PF/9ymEWjmHSRri7OrDJe0rVE7j+dw8ZGoqlGd8KsuoIH7qf28rKClf oIsQ== X-Gm-Message-State: AE9vXwMGiop9t5rjXLhiYMOuvUOA4zGy+iui71ct+cFTvlEgh1m/uqHd0Ooi3+zsmzZ7IQ== X-Received: by 10.194.87.34 with SMTP id u2mr13063961wjz.118.1474018789905; Fri, 16 Sep 2016 02:39:49 -0700 (PDT) Received: from groucho.site (ip9234f10a.dynamic.kabel-deutschland.de. [146.52.241.10]) by smtp.gmail.com with ESMTPSA id c5sm7525312wjw.29.2016.09.16.02.39.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 16 Sep 2016 02:39:49 -0700 (PDT) From: Ulrich Hecht To: hans.verkuil@cisco.com, niklas.soderlund@ragnatech.se Cc: linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org, magnus.damm@gmail.com, ulrich.hecht+renesas@gmail.com, laurent.pinchart@ideasonboard.com, william.towle@codethink.co.uk, devicetree@vger.kernel.org Subject: [PATCH 2/2] media: adv7604: automatic "default-input" selection Date: Fri, 16 Sep 2016 11:39:42 +0200 Message-Id: <20160916093942.17213-3-ulrich.hecht+renesas@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160916093942.17213-1-ulrich.hecht+renesas@gmail.com> References: <20160916093942.17213-1-ulrich.hecht+renesas@gmail.com> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Fall back to input 0 if "default-input" property is not present. Documentation states that the "default-input" property should reside directly in the node for adv7612. Hence, also adjust the parsing to make the implementation consistent with this. Based on patch by William Towle . Signed-off-by: Ulrich Hecht Signed-off-by: Hans Verkuil --- drivers/media/i2c/adv7604.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c index 4003831..055c9df 100644 --- a/drivers/media/i2c/adv7604.c +++ b/drivers/media/i2c/adv7604.c @@ -3077,10 +3077,13 @@ static int adv76xx_parse_dt(struct adv76xx_state *state) if (!of_property_read_u32(endpoint, "default-input", &v)) state->pdata.default_input = v; else - state->pdata.default_input = -1; + state->pdata.default_input = 0; of_node_put(endpoint); + if (!of_property_read_u32(np, "default-input", &v)) + state->pdata.default_input = v; + flags = bus_cfg.bus.parallel.flags; if (flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH)