From patchwork Wed Jul 6 15:39:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Hecht X-Patchwork-Id: 9216551 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 0CC66607D9 for ; Wed, 6 Jul 2016 15:40:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F29AB26CF9 for ; Wed, 6 Jul 2016 15:40:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E6BD726D14; Wed, 6 Jul 2016 15:40:55 +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=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 9A3E626CF9 for ; Wed, 6 Jul 2016 15:40:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755292AbcGFPkx (ORCPT ); Wed, 6 Jul 2016 11:40:53 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:33137 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754648AbcGFPkv (ORCPT ); Wed, 6 Jul 2016 11:40:51 -0400 Received: by mail-wm0-f66.google.com with SMTP id r201so36499655wme.0; Wed, 06 Jul 2016 08:39:57 -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=53ZOE5xYk/md2yj7zTbcm53+FoPukmSkr9GUxPLaDcA=; b=zdSko30GmncEOXwDHS9BSO4b9w9oEPYO7amYbYkTpdq79QU/+I42nuYdlxEx6VTmuH tcs+tkdvkkPyyWJjpZIMX3+01bjPnIRfKKTxswKd8clPc9FjZ0I/yZIAVROqL3Crbb/m 17m0RH/0F7lJKhQkoZtNoStJHvwRsSvCRQ2GebZZPdzayU+nzQVruuGGtB65R7bhCLtF fE0P3b7Njfd/3n3yHwM6XdNdeIixhPa6QFeLsmJYbg5QL1d3VE6pGJn3BfNOL0PVO+6R 8R0AqfunopbwUw4bsJfP6afdv3ihzkAB8iWEI9YaR3PWh4q5NeQtWfcy/jlk0hDyOKBG upEg== 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=53ZOE5xYk/md2yj7zTbcm53+FoPukmSkr9GUxPLaDcA=; b=ZdcpRz+6xGCdGORt/ePbEReEzZBZeDZVFbQviT9fwI6CauiugM12a07f2X+UId2pqh QngodgtO0vr/ObgNfCTXIcDN5wwLoPYQHm9svDgi8wPFAO/uMJvfqh++x5bHNNYbr+ek P7YheAEYha4UJ9C142Taeo8WefhEcEQWZQ0BiQjhyFzaLGHugaJLo/NRt30PFcvwmuXL mqIVcg9jmwj6YqeurFbtMpBJj+PjZt223moI9MgQJIo7wFD36AQX++SYHPxc/B4zr5a9 NQYL3rbznw1+OUvwY2UnNbg5QV5ztkyCmEFqveo/VN6URma3EYp2HrRcb2Q2+3zxQqak 8pqw== X-Gm-Message-State: ALyK8tIDfQFff8YhiKXySTfxMVw7LXAYX7hwg1zDrY44Ul+bDlpKJFUTO3kB8DVlIN5Pow== X-Received: by 10.28.136.195 with SMTP id k186mr21241658wmd.13.1467819596817; Wed, 06 Jul 2016 08:39:56 -0700 (PDT) Received: from groucho.site (ip9234f10a.dynamic.kabel-deutschland.de. [146.52.241.10]) by smtp.gmail.com with ESMTPSA id v70sm1842627wmf.18.2016.07.06.08.39.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Jul 2016 08:39:55 -0700 (PDT) From: Ulrich Hecht To: hans.verkuil@cisco.com Cc: niklas.soderlund@ragnatech.se, linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org, magnus.damm@gmail.com, laurent.pinchart@ideasonboard.com, william.towle@codethink.co.uk, Ulrich Hecht Subject: [PATCH v5 1/4] media: adv7604: automatic "default-input" selection Date: Wed, 6 Jul 2016 17:39:33 +0200 Message-Id: <1467819576-17743-2-git-send-email-ulrich.hecht+renesas@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1467819576-17743-1-git-send-email-ulrich.hecht+renesas@gmail.com> References: <1467819576-17743-1-git-send-email-ulrich.hecht+renesas@gmail.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 Fall back to input 0 if "default-input" property is not present. Additionally, documentation in commit bf9c82278c34 ("[media] media: adv7604: ability to read default input port from DT") 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 --- 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 3f1ab49..2e8f036 100644 --- a/drivers/media/i2c/adv7604.c +++ b/drivers/media/i2c/adv7604.c @@ -2830,10 +2830,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)